-

cool-RR · cool-RR · commit 5337adc586ac · 2013-09-18T22:43:27.000+03:00
diff --git a/source_py2/python_toolbox/misc_tools/misc_tools.py b/source_py2/python_toolbox/misc_tools/misc_tools.py
@@ -34,8 +34,7 @@ def is_subclass(candidate, base_class):
     check whether `candidate` is a subclass of any of these base classes.
     
     This has the advantage that it doesn't throw an exception if `candidate` is
-    not a type. (Python issue 10569.)
-        
+    not a type. (Python issue 10569.)        
     '''
     # todo: disable ability to use nested iterables.
     if cute_iter_tools.is_iterable(base_class):
@@ -100,7 +99,7 @@ def getted_vars(thing, _getattr=getattr):
     # todo: can make "fallback" option, to use value from original `vars` if
     # get is unsuccessful.
     my_vars = vars(thing)
-    return dict((name, _getattr(thing, name)) for name in my_vars.iterkeys())
+    return {name: _getattr(thing, name) for name in my_vars.iterkeys()}
 
 
 
diff --git a/source_py3/python_toolbox/misc_tools/misc_tools.py b/source_py3/python_toolbox/misc_tools/misc_tools.py
@@ -3,16 +3,14 @@
 
 '''This module defines miscellaneous tools.'''
 
-
-
 import operator
 import os.path
 import re
 import math
 import types
+import functools
 
 from python_toolbox import cute_iter_tools
-from functools import reduce
 
 
 _email_pattern = re.compile(
@@ -100,7 +98,7 @@ def getted_vars(thing, _getattr=getattr):
     # todo: can make "fallback" option, to use value from original `vars` if
     # get is unsuccessful.
     my_vars = vars(thing)
-    return dict((name, _getattr(thing, name)) for name in my_vars.keys())
+    return {name: _getattr(thing, name) for name in my_vars.keys()}
 
 
 
@@ -117,6 +115,17 @@ def is_magic_variable_name(name):
            name[:2] == name[-2:] == '__'
 
 
+def get_actual_type(thing):
+    '''
+    Get the actual type (or class) of an object.
+    
+    This used to be needed instead of `type(thing)` in Python 2.x where we had
+    old-style classes. In Python 3.x we don't have them anymore, but keeping
+    this function for backward compatibility.
+    '''
+    return type(thing)
+    
+    
 def is_number(x):
     '''Return whether `x` is a number.'''
     try:
@@ -234,19 +243,19 @@ def general_sum(things, start=None):
     numbers.
     '''
     if start is None:
-        return reduce(operator.add, things)
+        return functools.reduce(operator.add, things)
     else:
-        return reduce(operator.add, things, start)
+        return functools.reduce(operator.add, things, start)
     
     
 def general_product(things, start=None):
     '''
     Multiply a bunch of objects by each other, not necessarily numbers.
     '''    
     if start is None:
-        return reduce(operator.mul, things)
+        return functools.reduce(operator.mul, things)
     else:
-        return reduce(operator.mul, things, start)
+        return functools.reduce(operator.mul, things, start)
 
     
 def is_legal_email_address(email_address_candidate):
