mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Auto merge of #27007 - saschanaz:py3-flake, r=jdm
Upgrade flake8/pyflakes for Py3 compatibility <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo
GitHub
commit
3f999ce785
33 changed files with 377 additions and 357 deletions
|
|
@ -155,7 +155,6 @@ def wptserve_path(is_firefox, topdir, *paths):
|
|||
|
||||
def _activate_virtualenv(topdir, is_firefox):
|
||||
virtualenv_path = os.path.join(topdir, "python", "_virtualenv%d.%d" % (sys.version_info[0], sys.version_info[1]))
|
||||
check_exec_path = lambda path: path.startswith(virtualenv_path)
|
||||
python = sys.executable # If there was no python, mach wouldn't have run at all!
|
||||
if not python:
|
||||
sys.exit('Failed to find python executable for starting virtualenv.')
|
||||
|
|
@ -177,7 +176,8 @@ def _activate_virtualenv(topdir, is_firefox):
|
|||
|
||||
exec(compile(open(activate_path).read(), activate_path, 'exec'), dict(__file__=activate_path))
|
||||
|
||||
python = _get_exec_path(PYTHON_NAMES, is_valid_path=check_exec_path)
|
||||
python = _get_exec_path(PYTHON_NAMES,
|
||||
is_valid_path=lambda path: path.startswith(virtualenv_path))
|
||||
if not python:
|
||||
sys.exit("Python executable in virtualenv failed to activate.")
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ setuptools == 39.0
|
|||
toml == 0.9.2
|
||||
|
||||
# For Python linting
|
||||
flake8 == 2.4.1
|
||||
flake8 == 3.8.3
|
||||
pep8 == 1.5.7
|
||||
pyflakes == 0.8.1
|
||||
pyflakes == 2.2.0
|
||||
|
||||
# For buildbot checking
|
||||
voluptuous == 0.10.5
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class MachCommands(CommandBase):
|
|||
|
||||
with open(path.join(preload_path, preload_filename), 'w') as fd:
|
||||
json.dump(entries, fd, indent=4)
|
||||
except ValueError as e:
|
||||
except ValueError:
|
||||
print("Unable to parse chromium HSTS preload list, has the format changed?")
|
||||
sys.exit(1)
|
||||
|
||||
|
|
@ -262,8 +262,8 @@ class MachCommands(CommandBase):
|
|||
print("Unable to download the public suffix list; are you connected to the internet?")
|
||||
sys.exit(1)
|
||||
|
||||
lines = [l.strip() for l in content.decode("utf8").split("\n")]
|
||||
suffixes = [l for l in lines if not l.startswith("//") and not l == ""]
|
||||
lines = [line.strip() for line in content.decode("utf8").split("\n")]
|
||||
suffixes = [line for line in lines if not line.startswith("//") and not line == ""]
|
||||
|
||||
with open(dst_filename, "wb") as fo:
|
||||
for suffix in suffixes:
|
||||
|
|
@ -475,7 +475,7 @@ class MachCommands(CommandBase):
|
|||
if os.path.exists(crate_path):
|
||||
try:
|
||||
delete(crate_path)
|
||||
except:
|
||||
except Exception:
|
||||
print(traceback.format_exc())
|
||||
print("Delete %s failed!" % crate_path)
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ def notify_linux(title, text):
|
|||
notify_obj = bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications")
|
||||
method = notify_obj.get_dbus_method("Notify", "org.freedesktop.Notifications")
|
||||
method(title, 0, "", text, "", [], {"transient": True}, -1)
|
||||
except:
|
||||
except ImportError:
|
||||
raise Exception("Optional Python module 'dbus' is not installed.")
|
||||
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ def notify_win(title, text):
|
|||
from servo.win32_toast import WindowsToast
|
||||
w = WindowsToast()
|
||||
w.balloon_tip(title, text)
|
||||
except:
|
||||
except WindowsError:
|
||||
from ctypes import Structure, windll, POINTER, sizeof
|
||||
from ctypes.wintypes import DWORD, HANDLE, WINFUNCTYPE, BOOL, UINT
|
||||
|
||||
|
|
@ -920,7 +920,7 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
|
|||
for gst_lib in gst_dlls:
|
||||
try:
|
||||
shutil.copy(path.join(gst_root, "bin", gst_lib), servo_exe_dir)
|
||||
except:
|
||||
except Exception:
|
||||
missing += [str(gst_lib)]
|
||||
|
||||
for gst_lib in missing:
|
||||
|
|
@ -976,7 +976,7 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
|
|||
for gst_lib in gst_dlls:
|
||||
try:
|
||||
shutil.copy(path.join(gst_plugin_path, gst_lib), servo_exe_dir)
|
||||
except:
|
||||
except Exception:
|
||||
missing += [str(gst_lib)]
|
||||
|
||||
for gst_lib in missing:
|
||||
|
|
|
|||
|
|
@ -487,7 +487,7 @@ class CommandBase(object):
|
|||
print("Could not fetch the available nightly versions from the repository : {}".format(
|
||||
e.reason))
|
||||
sys.exit(1)
|
||||
except AttributeError as e:
|
||||
except AttributeError:
|
||||
print("Could not fetch a nightly version for date {} and platform {}".format(
|
||||
nightly_date, os_prefix))
|
||||
sys.exit(1)
|
||||
|
|
@ -517,8 +517,8 @@ class CommandBase(object):
|
|||
else:
|
||||
print("The nightly {} does not exist yet, downloading it.".format(
|
||||
destination_file))
|
||||
download_file(destination_file, NIGHTLY_REPOSITORY_URL +
|
||||
file_to_download, destination_file)
|
||||
download_file(destination_file, NIGHTLY_REPOSITORY_URL
|
||||
+ file_to_download, destination_file)
|
||||
|
||||
# Extract the downloaded nightly version
|
||||
if os.path.isdir(destination_folder):
|
||||
|
|
@ -537,7 +537,7 @@ class CommandBase(object):
|
|||
try:
|
||||
if check_gstreamer_lib():
|
||||
return False
|
||||
except:
|
||||
except Exception:
|
||||
# Some systems don't have pkg-config; we can't probe in this case
|
||||
# and must hope for the best
|
||||
return False
|
||||
|
|
@ -552,7 +552,7 @@ class CommandBase(object):
|
|||
raise Exception("Your system's gstreamer libraries are out of date \
|
||||
(we need at least 1.16). Please run ./mach bootstrap-gstreamer")
|
||||
else:
|
||||
raise Exception("Your system's gstreamer libraries are out of date \
|
||||
raise Exception("Your system's gstreamer libraries are out of date \
|
||||
(we need at least 1.16). If you're unable to \
|
||||
install them, let us know by filing a bug!")
|
||||
return False
|
||||
|
|
@ -858,9 +858,9 @@ install them, let us know by filing a bug!")
|
|||
def pick_media_stack(self, media_stack, target):
|
||||
if not(media_stack):
|
||||
if (
|
||||
not(target) or
|
||||
("armv7" in target and "android" in target) or
|
||||
("x86_64" in target)
|
||||
not(target)
|
||||
or ("armv7" in target and "android" in target)
|
||||
or ("x86_64" in target)
|
||||
):
|
||||
media_stack = "gstreamer"
|
||||
else:
|
||||
|
|
@ -1032,7 +1032,7 @@ install them, let us know by filing a bug!")
|
|||
print()
|
||||
sys.exit(1)
|
||||
raise
|
||||
version = tuple(map(int, re.match(b"rustup (\d+)\.(\d+)\.(\d+)", version_line).groups()))
|
||||
version = tuple(map(int, re.match(br"rustup (\d+)\.(\d+)\.(\d+)", version_line).groups()))
|
||||
version_needed = (1, 21, 0)
|
||||
if version < version_needed:
|
||||
print("rustup is at version %s.%s.%s, Servo requires %s.%s.%s or more recent." % (version + version_needed))
|
||||
|
|
@ -1069,8 +1069,8 @@ install them, let us know by filing a bug!")
|
|||
|
||||
def find_highest_msvc_version_ext():
|
||||
def vswhere(args):
|
||||
program_files = (os.environ.get('PROGRAMFILES(X86)') or
|
||||
os.environ.get('PROGRAMFILES'))
|
||||
program_files = (os.environ.get('PROGRAMFILES(X86)')
|
||||
or os.environ.get('PROGRAMFILES'))
|
||||
if not program_files:
|
||||
return []
|
||||
vswhere = os.path.join(program_files, 'Microsoft Visual Studio',
|
||||
|
|
@ -1107,8 +1107,8 @@ def find_highest_msvc_version():
|
|||
|
||||
versions = sorted(find_highest_msvc_version_ext(), key=lambda tup: float(tup[1]))
|
||||
if not versions:
|
||||
print("Can't find MSBuild.exe installation under %s. Please set the VSINSTALLDIR and VisualStudioVersion" +
|
||||
" environment variables" % base_vs_path)
|
||||
print("Can't find MSBuild.exe installation under %s. Please set the VSINSTALLDIR and VisualStudioVersion"
|
||||
+ " environment variables" % base_vs_path)
|
||||
sys.exit(1)
|
||||
return versions[0]
|
||||
|
||||
|
|
|
|||
|
|
@ -93,8 +93,8 @@ class MachCommands(CommandBase):
|
|||
help='Updates the selected package')
|
||||
@CommandArgument(
|
||||
'--all-packages', '-a', action='store_true',
|
||||
help='Updates all packages. NOTE! This is very likely to break your ' +
|
||||
'working copy, making it impossible to build servo. Only do ' +
|
||||
help='Updates all packages. NOTE! This is very likely to break your '
|
||||
'working copy, making it impossible to build servo. Only do '
|
||||
'this if you really know what you are doing.')
|
||||
@CommandArgument(
|
||||
'--dry-run', '-d', action='store_true',
|
||||
|
|
|
|||
|
|
@ -138,8 +138,8 @@ class DuplicateLine(Strategy):
|
|||
plus_equals_statement = r".+?\s\+\=\s.*"
|
||||
minus_equals_statement = r".+?\s\-\=\s.*"
|
||||
self._replace_strategy = {
|
||||
'regex': (append_statement + '|' + remove_statement + '|' + push_statement +
|
||||
'|' + pop_statement + '|' + plus_equals_statement + '|' + minus_equals_statement),
|
||||
'regex': (append_statement + '|' + remove_statement + '|' + push_statement
|
||||
+ '|' + pop_statement + '|' + plus_equals_statement + '|' + minus_equals_statement),
|
||||
'replaceString': r"\g<0>\n\g<0>",
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@ from mach.decorators import (
|
|||
Command,
|
||||
)
|
||||
from mach.registrar import Registrar
|
||||
# Note: mako cannot be imported at the top level because it breaks mach bootstrap
|
||||
sys.path.append(path.join(path.dirname(__file__), "..", "..",
|
||||
"components", "style", "properties", "Mako-1.1.2-py2.py3-none-any.whl"))
|
||||
|
||||
from servo.command_base import (
|
||||
archive_deterministically,
|
||||
|
|
@ -44,6 +41,9 @@ from servo.command_base import (
|
|||
)
|
||||
from servo.util import delete
|
||||
|
||||
# Note: mako cannot be imported at the top level because it breaks mach bootstrap
|
||||
sys.path.append(path.join(path.dirname(__file__), "..", "..",
|
||||
"components", "style", "properties", "Mako-1.1.2-py2.py3-none-any.whl"))
|
||||
|
||||
PACKAGES = {
|
||||
'android': [
|
||||
|
|
@ -96,18 +96,18 @@ else:
|
|||
|
||||
def get_taskcluster_secret(name):
|
||||
url = (
|
||||
os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") +
|
||||
"/api/secrets/v1/secret/project/servo/" +
|
||||
name
|
||||
os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster")
|
||||
+ "/api/secrets/v1/secret/project/servo/"
|
||||
+ name
|
||||
)
|
||||
return json.load(urllib.request.urlopen(url))["secret"]
|
||||
|
||||
|
||||
def otool(s):
|
||||
o = subprocess.Popen(['/usr/bin/otool', '-L', s], stdout=subprocess.PIPE)
|
||||
for l in o.stdout:
|
||||
if l[0] == '\t':
|
||||
yield l.split(' ', 1)[0][1:]
|
||||
for line in o.stdout:
|
||||
if line[0] == '\t':
|
||||
yield line.split(' ', 1)[0][1:]
|
||||
|
||||
|
||||
def listfiles(directory):
|
||||
|
|
@ -781,7 +781,7 @@ def setup_uwp_signing(ms_app_store, publisher):
|
|||
print("Packaging on TC. Using secret certificate")
|
||||
pfx = get_taskcluster_secret("windows-codesign-cert/latest")["pfx"]
|
||||
open("servo.pfx", "wb").write(base64.b64decode(pfx["base64"]))
|
||||
run_powershell_cmd('Import-PfxCertificate -FilePath .\servo.pfx -CertStoreLocation Cert:\CurrentUser\My')
|
||||
run_powershell_cmd('Import-PfxCertificate -FilePath .\\servo.pfx -CertStoreLocation Cert:\\CurrentUser\\My')
|
||||
os.remove("servo.pfx")
|
||||
|
||||
# Powershell command that lists all certificates for publisher
|
||||
|
|
@ -796,7 +796,7 @@ def setup_uwp_signing(ms_app_store, publisher):
|
|||
# PowerShell command that creates and install signing certificate for publisher
|
||||
cmd = '(New-SelfSignedCertificate -Type Custom -Subject ' + publisher + \
|
||||
' -FriendlyName "Allizom Signing Certificate (temporary)"' + \
|
||||
' -KeyUsage DigitalSignature -CertStoreLocation "Cert:\CurrentUser\My"' + \
|
||||
' -KeyUsage DigitalSignature -CertStoreLocation "Cert:\\CurrentUser\\My"' + \
|
||||
' -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")).Thumbprint'
|
||||
thumbprint = run_powershell_cmd(cmd)
|
||||
elif len(certs) > 1:
|
||||
|
|
|
|||
|
|
@ -161,8 +161,8 @@ class PostBuildCommands(CommandBase):
|
|||
command = rustCommand
|
||||
|
||||
# Prepend the debugger args.
|
||||
args = ([command] + self.debuggerInfo.args +
|
||||
args + params)
|
||||
args = ([command] + self.debuggerInfo.args
|
||||
+ args + params)
|
||||
else:
|
||||
args = args + params
|
||||
|
||||
|
|
@ -208,8 +208,8 @@ class PostBuildCommands(CommandBase):
|
|||
env = self.build_env()
|
||||
env["RUST_BACKTRACE"] = "1"
|
||||
|
||||
servo_cmd = [bin or self.get_nightly_binary_path(nightly) or
|
||||
self.get_binary_path(release, dev)] + params
|
||||
servo_cmd = [bin or self.get_nightly_binary_path(nightly)
|
||||
or self.get_binary_path(release, dev)] + params
|
||||
rr_cmd = ['rr', '--fatal-errors', 'record']
|
||||
try:
|
||||
check_call(rr_cmd + servo_cmd)
|
||||
|
|
|
|||
|
|
@ -117,8 +117,8 @@ class MachCommands(CommandBase):
|
|||
help="Optionally select test based on "
|
||||
"test file directory")
|
||||
@CommandArgument('--render-mode', '-rm', default=DEFAULT_RENDER_MODE,
|
||||
help="The render mode to be used on all tests. " +
|
||||
HELP_RENDER_MODE)
|
||||
help="The render mode to be used on all tests. "
|
||||
+ HELP_RENDER_MODE)
|
||||
@CommandArgument('--release', default=False, action="store_true",
|
||||
help="Run with a release build of servo")
|
||||
@CommandArgument('--tidy-all', default=False, action="store_true",
|
||||
|
|
|
|||
|
|
@ -33,10 +33,11 @@ wpt = os.path.join(topdir, "tests", "wpt")
|
|||
def wpt_path(*args):
|
||||
return os.path.join(wpt, *args)
|
||||
|
||||
|
||||
CONFIG_FILE_PATH = os.path.join(".", "servo-tidy.toml")
|
||||
WPT_MANIFEST_PATH = wpt_path("include.ini")
|
||||
# regex source https://stackoverflow.com/questions/6883049/
|
||||
URL_REGEX = re.compile(b'https?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+')
|
||||
URL_REGEX = re.compile(br'https?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+')
|
||||
|
||||
# Import wptmanifest only when we do have wpt in tree, i.e. we're not
|
||||
# inside a Firefox checkout.
|
||||
|
|
@ -105,8 +106,8 @@ WEBIDL_STANDARDS = [
|
|||
b"//github.com/immersive-web/webxr-hands-input/",
|
||||
b"//gpuweb.github.io",
|
||||
# Not a URL
|
||||
b"// This interface is entirely internal to Servo, and should not be" +
|
||||
b" accessible to\n// web pages."
|
||||
b"// This interface is entirely internal to Servo, and should not be"
|
||||
+ b" accessible to\n// web pages."
|
||||
]
|
||||
|
||||
|
||||
|
|
@ -228,14 +229,14 @@ def check_license(file_name, lines):
|
|||
max_blank_lines = 2 if lines[0].startswith(b"#!") else 1
|
||||
license_block = []
|
||||
|
||||
for l in lines:
|
||||
l = l.rstrip(b'\n')
|
||||
if not l.strip():
|
||||
for line in lines:
|
||||
line = line.rstrip(b'\n')
|
||||
if not line.strip():
|
||||
blank_lines += 1
|
||||
if blank_lines >= max_blank_lines:
|
||||
break
|
||||
continue
|
||||
line = uncomment(l)
|
||||
line = uncomment(line)
|
||||
if line is not None:
|
||||
license_block.append(line)
|
||||
|
||||
|
|
@ -250,7 +251,7 @@ def check_modeline(file_name, lines):
|
|||
for idx, line in enumerate(lines[:5]):
|
||||
if re.search(b'^.*[ \t](vi:|vim:|ex:)[ \t]', line):
|
||||
yield (idx + 1, "vi modeline present")
|
||||
elif re.search(b'-\*-.*-\*-', line, re.IGNORECASE):
|
||||
elif re.search(br'-\*-.*-\*-', line, re.IGNORECASE):
|
||||
yield (idx + 1, "emacs file variables present")
|
||||
|
||||
|
||||
|
|
@ -271,10 +272,10 @@ def contains_url(line):
|
|||
|
||||
def is_unsplittable(file_name, line):
|
||||
return (
|
||||
contains_url(line) or
|
||||
file_name.endswith(".rs") and
|
||||
line.startswith(b"use ") and
|
||||
b"{" not in line
|
||||
contains_url(line)
|
||||
or file_name.endswith(".rs")
|
||||
and line.startswith(b"use ")
|
||||
and b"{" not in line
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -327,6 +328,7 @@ def check_flake8(file_name, contents):
|
|||
|
||||
ignore = {
|
||||
"W291", # trailing whitespace; the standard tidy process will enforce no trailing whitespace
|
||||
"W503", # linebreak before binary operator; replaced by W504 - linebreak after binary operator
|
||||
"E501", # 80 character line length; the standard tidy process will enforce line length
|
||||
}
|
||||
|
||||
|
|
@ -478,7 +480,7 @@ def check_shell(file_name, lines):
|
|||
if " [ " in stripped or stripped.startswith("[ "):
|
||||
yield (idx + 1, "script should use `[[` instead of `[` for conditional testing")
|
||||
|
||||
for dollar in re.finditer('\$', stripped):
|
||||
for dollar in re.finditer(r'\$', stripped):
|
||||
next_idx = dollar.end()
|
||||
if next_idx < len(stripped):
|
||||
next_char = stripped[next_idx]
|
||||
|
|
@ -598,14 +600,15 @@ def check_rust(file_name, lines):
|
|||
multi_line_string = True
|
||||
|
||||
# get rid of comments
|
||||
line = re.sub('//.*?$|/\*.*?$|^\*.*?$', '//', line)
|
||||
line = re.sub(r'//.*?$|/\*.*?$|^\*.*?$', '//', line)
|
||||
|
||||
# get rid of attributes that do not contain =
|
||||
line = re.sub('^#[A-Za-z0-9\(\)\[\]_]*?$', '#[]', line)
|
||||
line = re.sub(r'^#[A-Za-z0-9\(\)\[\]_]*?$', '#[]', line)
|
||||
|
||||
# flag this line if it matches one of the following regular expressions
|
||||
# tuple format: (pattern, format_message, filter_function(match, line))
|
||||
no_filter = lambda match, line: True
|
||||
def no_filter(match, line):
|
||||
return True
|
||||
regex_rules = [
|
||||
# There should not be any extra pointer dereferencing
|
||||
(r": &Vec<", "use &[T] instead of &Vec<T>", no_filter),
|
||||
|
|
@ -849,16 +852,16 @@ def check_spec(file_name, lines):
|
|||
if SPEC_BASE_PATH not in file_name:
|
||||
return
|
||||
file_name = os.path.relpath(os.path.splitext(file_name)[0], SPEC_BASE_PATH)
|
||||
patt = re.compile("^\s*\/\/.+")
|
||||
patt = re.compile(r"^\s*\/\/.+")
|
||||
|
||||
# Pattern representing a line with a macro
|
||||
macro_patt = re.compile("^\s*\S+!(.*)$")
|
||||
macro_patt = re.compile(r"^\s*\S+!(.*)$")
|
||||
|
||||
# Pattern representing a line with comment containing a spec link
|
||||
link_patt = re.compile("^\s*///? (<https://.+>|https://.+)$")
|
||||
link_patt = re.compile(r"^\s*///? (<https://.+>|https://.+)$")
|
||||
|
||||
# Pattern representing a line with comment or attribute
|
||||
comment_patt = re.compile("^\s*(///?.+|#\[.+\])$")
|
||||
comment_patt = re.compile(r"^\s*(///?.+|#\[.+\])$")
|
||||
|
||||
brace_count = 0
|
||||
in_impl = False
|
||||
|
|
@ -924,7 +927,7 @@ def check_config_file(config_file, print_text=True, no_wpt=False):
|
|||
continue
|
||||
|
||||
# Check for invalid tables
|
||||
if re.match("\[(.*?)\]", line.strip()):
|
||||
if re.match(r"\[(.*?)\]", line.strip()):
|
||||
table_name = re.findall(r"\[(.*?)\]", line)[0].strip()
|
||||
if table_name not in ("configs", "blocked-packages", "ignore", "check_ext"):
|
||||
yield config_file, idx + 1, "invalid config table [%s]" % table_name
|
||||
|
|
@ -954,10 +957,10 @@ def check_config_file(config_file, print_text=True, no_wpt=False):
|
|||
key = line.split("=")[0].strip()
|
||||
|
||||
# Check for invalid keys inside [configs] and [ignore] table
|
||||
if (current_table == "configs" and key not in config or
|
||||
current_table == "ignore" and key not in config["ignore"] or
|
||||
if (current_table == "configs" and key not in config
|
||||
or current_table == "ignore" and key not in config["ignore"]
|
||||
# Any key outside of tables
|
||||
current_table == ""):
|
||||
or current_table == ""):
|
||||
yield config_file, idx + 1, "invalid config key '%s'" % key
|
||||
|
||||
# Parse config file
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ from setuptools import setup, find_packages
|
|||
VERSION = '0.3.0'
|
||||
|
||||
install_requires = [
|
||||
"flake8==2.4.1",
|
||||
"flake8==3.8.3",
|
||||
"toml==0.9.2",
|
||||
"colorama==0.3.7",
|
||||
"voluptuous==0.11.5",
|
||||
|
|
@ -26,13 +26,13 @@ here = os.path.dirname(os.path.abspath(__file__))
|
|||
try:
|
||||
with open(os.path.join(here, 'README.rst')) as doc:
|
||||
readme = doc.read()
|
||||
except:
|
||||
except Exception:
|
||||
readme = ''
|
||||
|
||||
try:
|
||||
with open(os.path.join(here, 'HISTORY.rst')) as doc:
|
||||
history = doc.read()
|
||||
except:
|
||||
except Exception:
|
||||
history = ''
|
||||
|
||||
long_description = readme + '\n\n' + history
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue