Skip to content

Commit 98005a6

Browse files
committed
Python 2.6: fix BaseException deprecation message, print as string. Use e instead of e.message
1 parent 089cf45 commit 98005a6

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

tmuxp/cli.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def load_workspace(config_file, args):
273273

274274
builder.session.attach_session()
275275
except exc.TmuxSessionExists as e:
276-
if prompt_yes_no(e.message + ' Attach?'):
276+
if prompt_yes_no('%s Attach?' % e):
277277
if 'TMUX' in os.environ:
278278
builder.session.switch_client()
279279

@@ -654,7 +654,7 @@ def command_attach_session(args):
654654
if not session:
655655
raise exc.TmuxpException('Session not found.')
656656
except exc.TmuxpException as e:
657-
print(e.message)
657+
print(e)
658658
return
659659

660660
if 'TMUX' in os.environ:
@@ -682,7 +682,7 @@ def command_kill_session(args):
682682
if not session:
683683
raise exc.TmuxpException('Session not found.')
684684
except exc.TmuxpException as e:
685-
print(e.getMessage())
685+
print(e)
686686
return
687687

688688
try:

tmuxp/util.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ def __init__(self, *args, **kwargs):
6565
stdout = self.process.stdout.read()
6666
stderr = self.process.stderr.read()
6767
except Exception as e:
68-
logger.error('Exception for %s: \n%s' % (
69-
subprocess.list2cmdline(cmd),
70-
e.message)
68+
logger.error(
69+
'Exception for %s: \n%s' % (
70+
subprocess.list2cmdline(cmd),
71+
e
72+
)
7173
)
7274
self.stdout = stdout.decode().split('\n')
7375
self.stdout = list(filter(None, self.stdout)) # filter empty values

0 commit comments

Comments
 (0)