Merge pull request #32 from miki725/windows

Fix for importanize on Windows

.travis.yml

@@ -16,3 +16,5 @@ script:
 
 after_success:
   coveralls
+
+sudo: false

HISTORY.rst

@@ -3,6 +3,14 @@
 History
 -------
 
+0.4.1 (2015-07-28)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed a bug where ``importanize`` did not correctly detect stdlibs on Windows
+  (see `#29 <https://github.com/miki725/importanize/issues/29/>`_)
+* Removed ``future`` dependency since ``six>=1.9`` includes all the used features
+* Fixed tests to be executable on Windows
+
 0.4 (2015-04-13)
 ~~~~~~~~~~~~~~~~
 

Makefile

@@ -55,7 +55,7 @@ test-coverage:
 test-all:
 	tox
 
-check: clean-build clean-pyc clean-test lint test-coverage
+check: lint clean-build clean-pyc clean-test test-coverage
 
 release: clean
 	python setup.py sdist upload

README.rst

@@ -63,13 +63,13 @@ Config file is simply a ``json`` file like this::
             "path/to/file",
             "path/to/files/ignore_*.py"
         ],
-        "formatter": 'grouped',
+        "formatter": "grouped",
         "groups": [
             {
-                "type": "stdlib",
+                "type": "stdlib"
             },
             {
-                "type": "remainder",
+                "type": "remainder"
             },
             {
                 "type": "packages",
@@ -78,24 +78,24 @@ Config file is simply a ``json`` file like this::
                 ]
             },
             {
-                "type": "local",
+                "type": "local"
             }
-        ],
+        ]
     }
 
 Default config looks something like::
 
     {   "groups": [
             {
-                "type": "stdlib",
+                "type": "stdlib"
             },
             {
-                "type": "remainder",
+                "type": "remainder"
             },
             {
-                "type": "local",
+                "type": "local"
             }
-        ],
+        ]
     }
 
 Currently the only required key is ``"groups"`` which must be an array

importanize/__init__.py

@@ -4,4 +4,7 @@
 
 __author__ = 'Miroslav Shubernetskiy'
 __email__ = '[email protected]'
-__version__ = '0.4'
+__version__ = '0.4.1'
+__description__ = (
+    'Utility for organizing Python imports using PEP8 or custom rules'
+)

importanize/groups.py

@@ -5,13 +5,13 @@
 from collections import OrderedDict, defaultdict
 from functools import reduce
 
-from future.utils import python_2_unicode_compatible
+import six
 
 from .formatters import DEFAULT_FORMATTER
 from .utils import is_std_lib
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class BaseImportGroup(object):
     def __init__(self, config=None, **kwargs):
         self.config = config or {}
@@ -125,7 +125,7 @@ def should_add_statement(self, statement):
 ))
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class ImportGroups(object):
     def __init__(self, **kwargs):
         self.groups = []

importanize/main.py

@@ -11,7 +11,7 @@
 
 import six
 
-from . import __version__, formatters
+from . import __description__, __version__, formatters
 from .formatters import DEFAULT_FORMATTER
 from .groups import ImportGroups
 from .parser import (
@@ -79,8 +79,7 @@ def find_config():
 default_config, found_default = find_config()
 
 parser = argparse.ArgumentParser(
-    description='Utility for organizing Python imports '
-                'using PEP8 or custom rules',
+    description=__description__,
 )
 parser.add_argument(
     'path',
@@ -231,8 +230,15 @@ def main():
     log.debug('Running importanize with {}'.format(args))
 
     if args.version:
-        msg = 'importanize version: {}'
-        print(msg.format(__version__))
+        msg = (
+            'importanize\n'
+            '===========\n'
+            '{}\n\n'
+            'version: {}\n'
+            'python: {}\n'
+            'source: https://github.com/miki725/importanize'
+        )
+        print(msg.format(__description__, __version__, sys.executable))
         sys.exit(0)
 
     if args.config is None:

importanize/statements.py

@@ -3,7 +3,7 @@
 import operator
 import re
 
-from future.utils import python_2_unicode_compatible
+import six
 
 from .formatters import DEFAULT_FORMATTER
 from .mixin import ComparatorMixin
@@ -13,7 +13,7 @@
 DOTS = re.compile(r'^(\.+)(.*)')
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class ImportLeaf(ComparatorMixin):
     """
     Data-structure about each import statement leaf-module.
@@ -82,7 +82,7 @@ def _type(obj):
         return self.name > other.name
 
 
-@python_2_unicode_compatible
+@six.python_2_unicode_compatible
 class ImportStatement(ComparatorMixin):
     """
     Data-structure to store information about

importanize/utils.py

@@ -19,7 +19,8 @@ def ignore_site_packages_paths():
     sys.path = list(set(filter(
         None,
         filter(lambda i: all(('site-packages' not in i,
-                              'python' in i or 'pypy' in i)), sys.path)
+                              'python' in i or 'pypy' in i)),
+               map(operator.methodcaller('lower'), sys.path))
     )))
     yield
     sys.path = paths

requirements.txt

@@ -1,2 +1 @@
-future
-six
+six>=1.9

setup.py

@@ -5,7 +5,7 @@
 
 from setuptools import find_packages, setup
 
-from importanize import __author__, __version__
+from importanize import __author__, __description__, __version__
 
 
 def read(fname):
@@ -31,7 +31,7 @@ def read(fname):
     name='importanize',
     version=__version__,
     author=__author__,
-    description='Utility for organizing Python imports using PEP8 or custom rules',
+    description=__description__,
     long_description='\n\n'.join([readme, history, authors, licence]),
     url='https://github.com/miki725/importanize',
     license='MIT',

tests/test_main.py

@@ -206,7 +206,7 @@ def test_run_folder(self,
             conf,
         )
         mock_run_importanize.assert_called_once_with(
-            'root/foo.py',
+            os.path.join('root', 'foo.py'),
             mock.sentinel.config,
             conf,
         )
@@ -238,7 +238,7 @@ def test_run_folder_exception(self,
             conf,
         )
         mock_run_importanize.assert_called_once_with(
-            'root/foo.py',
+            os.path.join('root', 'foo.py'),
             mock.sentinel.config,
             conf,
         )
@@ -247,12 +247,12 @@ def test_run_folder_exception(self,
     @mock.patch('os.path.exists')
     @mock.patch('os.getcwd')
     def test_find_config(self, mock_getcwd, mock_exists):
-        mock_getcwd.return_value = '/path/to/importanize'
+        mock_getcwd.return_value = os.path.join('path', 'to', 'importanize')
         mock_exists.side_effect = False, True
 
         config, found = find_config()
 
-        self.assertEqual(config, '/path/to/.importanizerc')
+        self.assertEqual(config, os.path.join('path', 'to', '.importanizerc'))
         self.assertTrue(bool(found))
 
     @mock.patch(TESTING_MODULE + '.run')
@@ -265,7 +265,7 @@ def test_main_without_config(self,
         args = mock.MagicMock(
             verbose=1,
             version=False,
-            path=['/path/../'],
+            path=[os.path.join('path', '..')],
             config=None,
         )
         mock_parse_args.return_value = args
@@ -275,7 +275,7 @@ def test_main_without_config(self,
         mock_parse_args.assert_called_once_with()
         mock_get_logger.assert_called_once_with('')
         mock_get_logger().setLevel.assert_called_once_with(logging.INFO)
-        mock_run.assert_called_once_with('/', PEP8_CONFIG, args)
+        mock_run.assert_called_once_with(os.getcwd(), PEP8_CONFIG, args)
 
     @mock.patch(TESTING_MODULE + '.read')
     @mock.patch(TESTING_MODULE + '.run')
@@ -291,7 +291,7 @@ def test_main_with_config(self,
         args = mock.MagicMock(
             verbose=1,
             version=False,
-            path=['/path/../'],
+            path=[os.path.join('path', '..')],
             config=mock.sentinel.config,
         )
         mock_parse_args.return_value = args
@@ -303,7 +303,9 @@ def test_main_with_config(self,
         mock_get_logger().setLevel.assert_called_once_with(logging.INFO)
         mock_read.assert_called_once_with(mock.sentinel.config)
         mock_loads.assert_called_once_with(mock_read.return_value)
-        mock_run.assert_called_once_with('/', mock_loads.return_value, args)
+        mock_run.assert_called_once_with(
+            os.getcwd(), mock_loads.return_value, args
+        )
 
     @mock.patch(TESTING_MODULE + '.print', create=True)
     @mock.patch('sys.exit')

tests/test_utils.py

@@ -36,7 +36,6 @@ def test_is_std_lib(self):
             'collections',
             'copy',
             'csv',
-            'curses',
             'datetime',
             'decimal',
             'fileinput',