Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions important/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
def split(key_value):
if key_value[0] in ('sourcecode',):
return key_value
else:
return key_value[0], key_value[1].split()
return key_value[0], key_value[1].split()

CONTEXT_SETTINGS['default_map'] = \
dict(map(split, CONFIG.items('important')))
Expand Down
13 changes: 6 additions & 7 deletions important/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,13 @@ def is_top_level_file(filepath):
provides |= set(folders)
# Handle modules that are installed as .py files in site-packages
top_level_files = filter(is_top_level_file, result['files'])
provides |= set([os.path.splitext(filename)[0]
for filename in top_level_files])
provides |= {os.path.splitext(filename)[0]
for filename in top_level_files}

if provides:
return provides
else:
module_name = requirement_name.split('.')[0]
if module_name not in ALL_MODULES:
LOGGER.warning("Cannot find install location of '%s'; please \
module_name = requirement_name.split('.')[0]
if module_name not in ALL_MODULES:
LOGGER.warning("Cannot find install location of '%s'; please \
install this package for more accurate name resolution", requirement_name)
return provides if provides else set([requirement_name])
return provides if provides else set([requirement_name])
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

try:
from setuptools import setup
except:
except ImportError:
from distutils.core import setup

with open('README.rst') as fh:
Expand Down
4 changes: 2 additions & 2 deletions tests/important/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

try:
from importlib import reload # Python 3.4+
except:
except ImportError:
try:
from imp import reload # Python 3.3
except:
except ImportError:
pass # Python 2.7 provides reload built in


Expand Down
2 changes: 1 addition & 1 deletion tests/important/test_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

try:
from unittest.mock import Mock
except:
except ImportError:
from mock import Mock


Expand Down