-

cool-RR · cool-RR · commit 897464aee658 · 2014-10-21T23:33:19.000+03:00
diff --git a/source_py2/python_toolbox/third_party/enum/__init__.py b/source_py2/python_toolbox/third_party/enum/__init__.py
@@ -4,6 +4,8 @@
 
 __all__ = ['Enum', 'IntEnum', 'unique']
 
+version = 1, 0, 3
+
 pyver = float('%s.%s' % _sys.version_info[:2])
 
 try:
@@ -163,7 +165,10 @@ def __new__(metacls, cls, bases, classdict):
         __order__ = classdict.get('__order__')
         if __order__ is None:
             if pyver < 3.0:
-                __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])]
+                try:
+                    __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])]
+                except TypeError:
+                    __order__ = [name for name in sorted(members.keys())]
             else:
                 __order__ = classdict._member_names
         else:
@@ -643,7 +648,7 @@ def __dir__(self):
             for m in cls.__dict__
             if m[0] != '_'
             ]
-    return (['__class__', '__doc__', '__module__', 'name', 'value'] + added_behavior)
+    return (['__class__', '__doc__', '__module__', ] + added_behavior)
 temp_enum_dict['__dir__'] = __dir__
 del __dir__
 
diff --git a/source_py2/python_toolbox/third_party/enum/enum.py b/source_py2/python_toolbox/third_party/enum/enum.py
@@ -4,6 +4,8 @@
 
 __all__ = ['Enum', 'IntEnum', 'unique']
 
+version = 1, 0, 3
+
 pyver = float('%s.%s' % _sys.version_info[:2])
 
 try:
@@ -163,7 +165,10 @@ def __new__(metacls, cls, bases, classdict):
         __order__ = classdict.get('__order__')
         if __order__ is None:
             if pyver < 3.0:
-                __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])]
+                try:
+                    __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])]
+                except TypeError:
+                    __order__ = [name for name in sorted(members.keys())]
             else:
                 __order__ = classdict._member_names
         else:
@@ -643,7 +648,7 @@ def __dir__(self):
             for m in cls.__dict__
             if m[0] != '_'
             ]
-    return (['__class__', '__doc__', '__module__', 'name', 'value'] + added_behavior)
+    return (['__class__', '__doc__', '__module__', ] + added_behavior)
 temp_enum_dict['__dir__'] = __dir__
 del __dir__
 
