simplified ImportLeaf sorting

also fixed a bug in detecting mixed case leafs
miki725 · Sep 8, 2014 · 1a732a3 · 1a732a3
1 parent df51780
commit 1a732a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/importanize/statements.py b/importanize/statements.py
@@ -62,10 +62,8 @@ def _type(obj):
                 return 'upper'
             elif obj.name.islower():
                 return 'lower'
-            elif obj.name[:1].isupper():
-                return 'mixed'
             else:
-                return 'none'
+                return 'mixed'
 
         self_type = _type(self)
         other_type = _type(other)
@@ -74,7 +72,6 @@ def _type(obj):
             'upper',
             'mixed',
             'lower',
-            'none',
         )
 
         if self_type != other_type:

diff --git a/tests/test_statements.py b/tests/test_statements.py
@@ -73,6 +73,10 @@ def test_gt(self):
             ImportLeaf('aKlassName'),
             ImportLeaf('CONSTANT')
         )
+        self.assertGreater(
+            ImportLeaf('a_variable'),
+            ImportLeaf('aKlassName')
+        )
 
     def test_repr(self):
         self.assertEqual(