-

cool-RR · cool-RR · commit cfc2ce70ab2c · 2013-09-18T22:28:50.000+03:00
diff --git a/source_py2/python_toolbox/context_management/context_manager.py b/source_py2/python_toolbox/context_management/context_manager.py
@@ -7,7 +7,6 @@
 See its documentation for more information.
 '''
 
-
 import sys
 import types
 import abc
@@ -34,8 +33,7 @@ class ContextManager(DecoratingContextManager):
                 
     For more details, see documentation of the containing module,
     `python_toolbox.context_manager`.
-    '''
-    
+    ''' 
     
     __metaclass__ = ContextManagerType
     
@@ -78,7 +76,7 @@ def __enter_using_manage_context(self):
         
         
         try:
-            generator_return_value = new_generator.next()
+            generator_return_value = next(new_generator)
             return self if (generator_return_value is SelfHook) else \
                    generator_return_value
         
@@ -99,7 +97,7 @@ def __exit_using_manage_context(self, exc_type, exc_value, exc_traceback):
         
         if exc_type is None:
             try:
-                generator.next()
+                next(generator)
             except StopIteration:
                 return
             else:
@@ -114,7 +112,7 @@ def __exit_using_manage_context(self, exc_type, exc_value, exc_traceback):
                 exc_value = exc_type()
             try:
                 generator.throw(exc_type, exc_value, exc_traceback)
-            except StopIteration, stop_iteration:
+            except StopIteration as stop_iteration:
                 # Suppress the exception *unless* it's the same exception that
                 # was passed to throw().  This prevents a StopIteration
                 # raised inside the "with" statement from being suppressed
diff --git a/source_py2/python_toolbox/context_management/context_manager_type.py b/source_py2/python_toolbox/context_management/context_manager_type.py
@@ -37,7 +37,6 @@ def MyContextManager():
     '''
     
     __metaclass__ = ContextManagerTypeType
-
     
     def __new__(mcls, name, bases, namespace):
         '''
diff --git a/source_py2/python_toolbox/context_management/context_manager_type_type.py b/source_py2/python_toolbox/context_management/context_manager_type_type.py
@@ -9,7 +9,12 @@
 
 
 class ContextManagerTypeType(type):
-    '''Metaclass for `ContextManagerType`. Shouldn't be used directly.'''
+    '''
+    Metaclass for `ContextManagerType`. Shouldn't be used directly.
+    
+    Did I just create a metaclass for a metaclass. OH YES I DID. It's like a
+    double rainbow, except I'm the only one who can see it.
+    '''
     
     def __call__(cls, *args):
         '''
diff --git a/source_py3/python_toolbox/address_tools/object_to_string.py b/source_py3/python_toolbox/address_tools/object_to_string.py
@@ -202,8 +202,8 @@ def my_filter(key, value):
                 my_filter
             )
                 
-            namespace_dict_keys = list(namespace_dict.keys())
-            namespace_dict_values = list(namespace_dict.values())
+            namespace_dict_keys = namespace_dict.keys()
+            namespace_dict_values = namespace_dict.values()
             
             
         # Split to address parts:
diff --git a/source_py3/python_toolbox/caching/cached_property.py b/source_py3/python_toolbox/caching/cached_property.py
@@ -9,7 +9,6 @@
 
 from python_toolbox import decorator_tools
 from python_toolbox import misc_tools
-import collections
 
 
 class CachedProperty(misc_tools.OwnNameDiscoveringDescriptor):
@@ -47,7 +46,7 @@ def __init__(self, getter_or_value, doc=None, name=None,
         class; this will save a bit of processing later.
         '''
         misc_tools.OwnNameDiscoveringDescriptor.__init__(self, name=name)
-        if isinstance(getter_or_value, collections.Callable) and not force_value_not_getter:
+        if callable(getter_or_value) and not force_value_not_getter:
             self.getter = getter_or_value
         else:
             self.getter = lambda thing: getter_or_value
diff --git a/source_py3/python_toolbox/context_management/base_classes/decorating_context_manager.py b/source_py3/python_toolbox/context_management/base_classes/decorating_context_manager.py
@@ -8,7 +8,6 @@
 '''
 
 
-
 from python_toolbox import decorator_tools
 
 
diff --git a/source_py3/python_toolbox/context_management/context_manager.py b/source_py3/python_toolbox/context_management/context_manager.py
@@ -8,7 +8,6 @@
 '''
 
 
-
 import sys
 import types
 import abc
diff --git a/source_py3/python_toolbox/context_management/context_manager_type_type.py b/source_py3/python_toolbox/context_management/context_manager_type_type.py
@@ -6,7 +6,6 @@
 
 See its documentation for more information.
 '''
-import collections
 
 
 class ContextManagerTypeType(type):
@@ -46,7 +45,7 @@ def MyContextManager():
         if len(args) == 1:
             from .context_manager import ContextManager
             (function,) = args
-            assert isinstance(function, collections.Callable)
+            assert callable(function)
             name = function.__name__
             bases = (ContextManager,)
             namespace_dict = {

Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,8 @@ def my_filter(key, value):`
`202`	`202`	`my_filter`
`203`	`203`	`)`
`204`	`204`
`205`		`- namespace_dict_keys = list(namespace_dict.keys())`
`206`		`- namespace_dict_values = list(namespace_dict.values())`
	`205`	`+ namespace_dict_keys = namespace_dict.keys()`
	`206`	`+ namespace_dict_values = namespace_dict.values()`
`207`	`207`
`208`	`208`
`209`	`209`	`# Split to address parts:`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`'''`
`9`	`9`
`10`	`10`
`11`		`-`
`12`	`11`	`from python_toolbox import decorator_tools`
`13`	`12`
`14`	`13`