diff options
| author | Timothy Crosley <timothy.crosley@gmail.com> | 2016-03-27 19:40:17 -0700 |
|---|---|---|
| committer | Timothy Crosley <timothy.crosley@gmail.com> | 2016-03-27 19:40:17 -0700 |
| commit | 9ac04933d7cd1daa67183ba2687ba2ed5c89a455 (patch) | |
| tree | 2f7a3f49d12ea542668c1b35c79cc5eb35933cb9 | |
| parent | 8756fbc0768f2f51f807ce3a3a12d5ee5a35fa05 (diff) | |
| download | isort-9ac04933d7cd1daa67183ba2687ba2ed5c89a455.tar.gz | |
Some modernization
| -rw-r--r-- | isort/isort.py | 16 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/isort/isort.py b/isort/isort.py index 772c8162..de2ed4a0 100644 --- a/isort/isort.py +++ b/isort/isort.py @@ -206,7 +206,7 @@ class SortImports(object): lines = lines[1:] return "\n".join(lines) - def place_module(self, moduleName): + def place_module(self, module_name): """Tries to determine if a module is a python std import, third party import, or project code: if it can't determine - it assumes it is project code @@ -218,14 +218,14 @@ class SortImports(object): if not forced_separate.endswith('*'): pathGlob = '%s*' % forced_separate - if fnmatch(moduleName, pathGlob) or fnmatch(moduleName, '.' + pathGlob): + if fnmatch(module_name, pathGlob) or fnmatch(module_name, '.' + pathGlob): return forced_separate - if moduleName.startswith("."): + if module_name.startswith("."): return self.sections.LOCALFOLDER # Try to find most specific placement instruction match (if any) - parts = moduleName.split('.') + parts = module_name.split('.') module_names_to_check = ['.'.join(parts[:first_k]) for first_k in range(len(parts), 0, -1)] for module_name_to_check in module_names_to_check: for placement in reversed(self.sections): @@ -237,12 +237,12 @@ class SortImports(object): paths = PYTHONPATH virtual_env = self.config.get('virtual_env') or os.environ.get('VIRTUAL_ENV') if virtual_env: - paths += [p for p in glob("{0}/lib/python*/site-packages".format(virtual_env)) - if p not in paths] + paths += [path for path in glob("{0}/lib/python*/site-packages".format(virtual_env)) + if path not in paths] for prefix in paths: - module_path = "/".join((prefix, moduleName.replace(".", "/"))) - package_path = "/".join((prefix, moduleName.split(".")[0])) + module_path = "/".join((prefix, module_name.replace(".", "/"))) + package_path = "/".join((prefix, module_name.split(".")[0])) if (os.path.exists(module_path + ".py") or os.path.exists(module_path + ".so") or (os.path.exists(package_path) and os.path.isdir(package_path))): if "site-packages" in prefix or "dist-packages" in prefix: @@ -10,7 +10,7 @@ envlist = [testenv] commands = - py.test {posargs} + py.test test_isort.py {posargs} deps = pytest |