diff options
| -rw-r--r-- | docs/sphinx/ext/ecm.py | 2 | ||||
| -rwxr-xr-x | find-modules/rules_engine.py | 3 | ||||
| -rwxr-xr-x | find-modules/run-sip.py | 3 | ||||
| -rw-r--r-- | find-modules/sip_generator.py | 6 | ||||
| -rwxr-xr-x | modules/check-outbound-license.py | 6 | ||||
| -rw-r--r-- | tests/GenerateSipBindings/rules_SipTest.py | 3 | ||||
| -rwxr-xr-x | toolchain/generate-fastlane-metadata.py | 14 |
7 files changed, 18 insertions, 19 deletions
diff --git a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py index 2bab34a7..8667b367 100644 --- a/docs/sphinx/ext/ecm.py +++ b/docs/sphinx/ext/ecm.py @@ -76,7 +76,7 @@ class ECMModule(Directive): settings.record_dependencies.add(path) f = io.FileInput(source_path=path, encoding=encoding, error_handler=e_handler) - except UnicodeEncodeError as error: + except UnicodeEncodeError: raise self.severe('Problems with "%s" directive path:\n' 'Cannot encode input file path "%s" ' '(wrong locale?).' % diff --git a/find-modules/rules_engine.py b/find-modules/rules_engine.py index 60611eeb..b9e9dedd 100755 --- a/find-modules/rules_engine.py +++ b/find-modules/rules_engine.py @@ -18,7 +18,6 @@ import os import re import sys import textwrap -import traceback from copy import deepcopy from clang.cindex import CursorKind @@ -51,7 +50,7 @@ class Rule(object): # Derive a useful name for diagnostic purposes. # caller = os.path.basename(inspect.stack()[3][1]) - self.name = "{}:{}[{}],{}".format(caller, type(db).__name__, rule_number, fn.__name__) + self.name = "{}:{}[{}],{}".format(caller, type(db).__name__, rule_number, fn.__name__) self.rule_number = rule_number self.fn = fn self.usage = 0 diff --git a/find-modules/run-sip.py b/find-modules/run-sip.py index fc8a5e2b..e745a607 100755 --- a/find-modules/run-sip.py +++ b/find-modules/run-sip.py @@ -1,6 +1,7 @@ #!/usr/bin/env python -import os, sys +import os +import sys import fnmatch import subprocess diff --git a/find-modules/sip_generator.py b/find-modules/sip_generator.py index 2dd2ef11..b8418649 100644 --- a/find-modules/sip_generator.py +++ b/find-modules/sip_generator.py @@ -12,12 +12,10 @@ import argparse import gettext import inspect import logging -import os -import re import sys import traceback from clang import cindex -from clang.cindex import AccessSpecifier, AvailabilityKind, CursorKind, SourceRange, StorageClass, TokenKind, TypeKind, TranslationUnit +from clang.cindex import AccessSpecifier, AvailabilityKind, CursorKind, SourceRange, TokenKind, TypeKind, TranslationUnit import rules_engine @@ -784,7 +782,7 @@ def main(argv=None): body, includes = g.create_sip(args.source, args.include_filename) with open(args.output, "w") as outputFile: outputFile.write(body) - except Exception as e: + except Exception: tbk = traceback.format_exc() print(tbk) return -1 diff --git a/modules/check-outbound-license.py b/modules/check-outbound-license.py index b8c1ef23..2657e628 100755 --- a/modules/check-outbound-license.py +++ b/modules/check-outbound-license.py @@ -125,15 +125,15 @@ if __name__ == '__main__': spdxDictionary[fileName] = licenses fileName = "" licenses = [] - f.close(); + f.close() # read file with list of test files f = open(args.input, "r") testfiles = f.readlines() f.close() - if check_outbound_license(args.license, testfiles, spdxDictionary) == True: - sys.exit(0); + if check_outbound_license(args.license, testfiles, spdxDictionary) is True: + sys.exit(0) # in any other case, return error code sys.exit(1) diff --git a/tests/GenerateSipBindings/rules_SipTest.py b/tests/GenerateSipBindings/rules_SipTest.py index c570a039..a75a5826 100644 --- a/tests/GenerateSipBindings/rules_SipTest.py +++ b/tests/GenerateSipBindings/rules_SipTest.py @@ -1,5 +1,6 @@ -import os, sys +import os +import sys import rules_engine sys.path.append(os.path.dirname(os.path.dirname(rules_engine.__file__))) diff --git a/toolchain/generate-fastlane-metadata.py b/toolchain/generate-fastlane-metadata.py index fab6c23c..a345282a 100755 --- a/toolchain/generate-fastlane-metadata.py +++ b/toolchain/generate-fastlane-metadata.py @@ -258,11 +258,11 @@ def processAppstreamData(applicationName, appstreamData, desktopData): # Generate metadata for the given appstream and desktop files def processAppstreamFile(appstreamFileName, desktopFileName): - appstreamFile = open(appstreamFileName, "rb"); + appstreamFile = open(appstreamFileName, "rb") desktopData = None if desktopFileName and os.path.exists(desktopFileName): - desktopFile = open(desktopFileName, "rb"); - desktopData = desktopFile.read(); + desktopFile = open(desktopFileName, "rb") + desktopData = desktopFile.read() applicationName = os.path.basename(appstreamFileName)[:-12] processAppstreamData(applicationName, appstreamFile.read(), desktopData) @@ -290,16 +290,16 @@ def scanSourceDir(): appdataFiles = glob.iglob(arguments.source + "/**/" + appname + ".appdata.xml", recursive=True) appdataFile = None for f in appdataFiles: - appdataFile = f; - break; + appdataFile = f + break if not appdataFile: continue desktopFiles = glob.iglob(arguments.source + "/**/" + appname + ".desktop", recursive=True) desktopFile = None for f in desktopFiles: - desktopFile = f; - break; + desktopFile = f + break processAppstreamFile(appdataFile, desktopFile) |