From ef8a05be38fc0e9a5d47b53d102ba0382114110e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 27 Sep 2013 10:21:27 +0800 Subject: [PATCH] :lipstick: Fix violations against pylint. --- script/bootstrap.py | 5 ++--- script/compile-coffee.py | 3 +-- script/cpplint.py | 2 +- script/create-dist.py | 14 ++++++-------- script/lib/github.py | 4 ++-- script/update-frameworks.py | 4 ++-- script/update.py | 3 +-- script/upload.py | 3 +-- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/script/bootstrap.py b/script/bootstrap.py index f6f9faf7fa47..6b10e9bc18c5 100755 --- a/script/bootstrap.py +++ b/script/bootstrap.py @@ -1,12 +1,11 @@ #!/usr/bin/env python import argparse -import errno import os import subprocess import sys -from lib.util import * +from lib.util import scoped_cwd SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) @@ -68,7 +67,7 @@ def update_apm(): def update_node_modules(): for dirname in ['.', 'browser/default_app', 'spec']: - update_node_modules_for_dir(dirname); + update_node_modules_for_dir(dirname) def update_node_modules_for_dir(dirname): diff --git a/script/compile-coffee.py b/script/compile-coffee.py index 92e4f107e192..5fbb95643fbd 100755 --- a/script/compile-coffee.py +++ b/script/compile-coffee.py @@ -4,8 +4,6 @@ import os import subprocess import sys -from lib.util import * - SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) @@ -22,5 +20,6 @@ def main(): else: subprocess.check_call(['node', coffee, '-c', '-o', output_dir, input_file]) + if __name__ == '__main__': sys.exit(main()) diff --git a/script/cpplint.py b/script/cpplint.py index f624a1185f07..0862f4f80c47 100755 --- a/script/cpplint.py +++ b/script/cpplint.py @@ -31,7 +31,7 @@ def main(): def list_files(directories, filters): matches = [] for directory in directories: - for root, dirs, filenames, in os.walk(directory): + for root, _, filenames, in os.walk(directory): for f in filters: for filename in fnmatch.filter(filenames, f): matches.append(os.path.join(root, filename)) diff --git a/script/create-dist.py b/script/create-dist.py index 7a71c01dffa3..a948def25548 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -1,14 +1,13 @@ #!/usr/bin/env python -import errno -import glob import os import shutil import subprocess import sys import tarfile -from lib.util import * +from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \ + safe_mkdir ATOM_SHELL_VRESION = get_atom_shell_version() @@ -79,7 +78,7 @@ def main(): def force_build(): build = os.path.join(SOURCE_ROOT, 'script', 'build.py') - subprocess.check_call([sys.executable, build, '-c', 'Release']); + subprocess.check_call([sys.executable, build, '-c', 'Release']) def copy_binaries(): @@ -99,7 +98,7 @@ def copy_headers(): # Copy standard node headers from node. repository. for include_path in HEADERS_DIRS: abs_path = os.path.join(NODE_DIR, include_path) - for dirpath, dirnames, filenames in os.walk(abs_path): + for dirpath, _, filenames in os.walk(abs_path): for filename in filenames: extension = os.path.splitext(filename)[1] if extension not in HEADERS_SUFFIX: @@ -111,7 +110,7 @@ def copy_headers(): # Copy V8 headers from chromium's repository. src = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', 'libchromiumcontent', 'src') - for dirpath, dirnames, filenames in os.walk(os.path.join(src, 'v8')): + for dirpath, _, filenames in os.walk(os.path.join(src, 'v8')): for filename in filenames: extension = os.path.splitext(filename)[1] if extension not in HEADERS_SUFFIX: @@ -122,8 +121,7 @@ def copy_headers(): def copy_license(): - license = os.path.join(SOURCE_ROOT, 'LICENSE') - shutil.copy2(license, DIST_DIR) + shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR) def create_version(): diff --git a/script/lib/github.py b/script/lib/github.py index ebb3e3f53aa3..c6ca91ae04be 100644 --- a/script/lib/github.py +++ b/script/lib/github.py @@ -17,7 +17,7 @@ class GitHub: def __getattr__(self, attr): return _Callable(self, '/%s' % attr) - def _http(self, method, path, **kw): + def send(self, method, path, **kw): if not 'headers' in kw: kw['headers'] = dict() headers = kw['headers'] @@ -47,7 +47,7 @@ class _Executable: self._path = path def __call__(self, **kw): - return self._gh._http(self._method, self._path, **kw) + return self._gh.send(self._method, self._path, **kw) class _Callable(object): diff --git a/script/update-frameworks.py b/script/update-frameworks.py index 2f4b23c5f0c3..3cb142c4b143 100755 --- a/script/update-frameworks.py +++ b/script/update-frameworks.py @@ -3,11 +3,11 @@ import sys import os -from lib.util import * +from lib.util import safe_mkdir, extract_zip, tempdir, download SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -FRAMEWORKS_URL='https://gh-contractor-zcbenz.s3.amazonaws.com/frameworks' +FRAMEWORKS_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/frameworks' def main(): diff --git a/script/update.py b/script/update.py index 44c01b334560..1b21b0f584b4 100755 --- a/script/update.py +++ b/script/update.py @@ -1,10 +1,9 @@ #!/usr/bin/env python +import os import subprocess import sys -from lib.util import * - SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) diff --git a/script/upload.py b/script/upload.py index 409fa05c6b42..8e8987983169 100755 --- a/script/upload.py +++ b/script/upload.py @@ -4,12 +4,11 @@ import argparse import errno import glob import os -import requests import subprocess import sys import tempfile -from lib.util import * +from lib.util import get_atom_shell_version, scoped_cwd, safe_mkdir from lib.github import GitHub