Skip to content

fprettify: some more style fixes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2016
Merged

fprettify: some more style fixes #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions fprettify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
if ((not re.search((r"(" + DEL_OPEN_STR +
r"|[\w\*/=\+\-:])\s*$"),
line[:pos], RE_FLAGS) and
not EMPTY_RE.search(line[:pos])) or
not EMPTY_RE.search(line[:pos])) or
re.search(SOL_STR + r"(\w+\s*:)?(ELSE)?\s*IF\s*$",
line[:pos], RE_FLAGS) or
re.search(SOL_STR + r"(\w+\s*:)?\s*DO\s+WHILE\s*$",
Expand Down Expand Up @@ -1010,7 +1010,7 @@ def main(argv=None):

if "--help" in argv:
sys.stderr.write(usageDesc + '\n')
return(0)
return 0
args = []
for arg in argv[1:]:
m = re.match(
Expand All @@ -1032,7 +1032,7 @@ def main(argv=None):
args = ['stdin']

for filename in args:
if not os.path.isfile(filename) and not filename == 'stdin':
if not os.path.isfile(filename) and filename != 'stdin':
sys.stderr.write("file " + filename + " does not exists!\n")
else:
stdout = defaultsDict['stdout'] or filename == 'stdin'
Expand Down Expand Up @@ -1065,9 +1065,8 @@ def main(argv=None):
sys.stderr.write('-' * 60 + "\n")
traceback.print_exc(file=sys.stderr)
sys.stderr.write('-' * 60 + "\n")
sys.stderr.write(
"Processing file '" + filename + "'\n")
return(failure > 0)
sys.stderr.write("Processing file '" + filename + "'\n")
return failure > 0


if __name__ == '__main__':
Expand Down