Skip to content

Commit f3968b6

Browse files
authored
Merge pull request #175 from python-cmd2/extra_newlines
Removed some extra newlines from error messages in load commands
2 parents 394b20d + 4cda83d commit f3968b6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cmd2.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@ def do__relative_load(self, file_path):
16081608
"""
16091609
# If arg is None or arg is an empty string this is an error
16101610
if not file_path:
1611-
self.perror('_relative_load command requires a file path:\n', traceback_war=False)
1611+
self.perror('_relative_load command requires a file path:', traceback_war=False)
16121612
return
16131613

16141614
file_path = file_path.strip()
@@ -1627,24 +1627,24 @@ def do_load(self, file_path):
16271627
"""
16281628
# If arg is None or arg is an empty string this is an error
16291629
if not file_path:
1630-
self.perror('load command requires a file path:\n', traceback_war=False)
1630+
self.perror('load command requires a file path:', traceback_war=False)
16311631
return
16321632

16331633
expanded_path = os.path.abspath(os.path.expanduser(file_path.strip()))
16341634

16351635
# Make sure expanded_path points to a file
16361636
if not os.path.isfile(expanded_path):
1637-
self.perror('{} does not exist or is not a file\n'.format(expanded_path), traceback_war=False)
1637+
self.perror('{} does not exist or is not a file'.format(expanded_path), traceback_war=False)
16381638
return
16391639

16401640
# Make sure the file is not empty
16411641
if os.path.getsize(expanded_path) == 0:
1642-
self.perror('{} is empty\n'.format(expanded_path), traceback_war=False)
1642+
self.perror('{} is empty'.format(expanded_path), traceback_war=False)
16431643
return
16441644

16451645
# Make sure the file is ASCII or UTF-8 encoded text
16461646
if not self.is_text_file(expanded_path):
1647-
self.perror('{} is not an ASCII or UTF-8 encoded text file\n'.format(expanded_path), traceback_war=False)
1647+
self.perror('{} is not an ASCII or UTF-8 encoded text file'.format(expanded_path), traceback_war=False)
16481648
return
16491649

16501650
try:

0 commit comments

Comments
 (0)