-

cool-RR · cool-RR · commit 654526ffeb90 · 2013-09-14T22:01:49.000+03:00
diff --git a/source_py3/python_toolbox/misc_tools/__init__.py b/source_py3/python_toolbox/misc_tools/__init__.py
@@ -6,7 +6,7 @@
 from .misc_tools import (
     is_subclass, get_mro_depth_of_method, frange, getted_vars,
     _ascii_variable_pattern, is_legal_ascii_variable_name,
-    is_magic_variable_name, get_actual_type, is_number, identity_function,
+    is_magic_variable_name, is_number, identity_function,
     do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,
     general_sum, general_product, is_legal_email_address, is_type
 )
diff --git a/source_py3/python_toolbox/misc_tools/misc_tools.py b/source_py3/python_toolbox/misc_tools/misc_tools.py
@@ -117,25 +117,6 @@ 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 is used instead of `type(thing)` for compaibility with old-style
-    classes.
-    '''
-    
-    return getattr(thing, '__class__', None) or type(thing)
-    # Using `.__class__` instead of `type` because of goddamned old-style
-    # classes. When you do `type` on an instance of an old-style class, you
-    # just get the useless `InstanceType`. But wait, there's more! We can't
-    # just take `thing.__class__` because the old-style classes themselves,
-    # i.e. the classes and not the instances, do not have a `.__class__`
-    # attribute at all! Therefore we are using `type` as a fallback.
-    #
-    # I don't like old-style classes, that's what I'm saying.
-    
-    
 def is_number(x):
     '''Return whether `x` is a number.'''
     try:
diff --git a/source_py3/python_toolbox/monkeypatching_tools.py b/source_py3/python_toolbox/monkeypatching_tools.py
@@ -38,7 +38,7 @@ def my_method(a):
     
     monkeypatchee_is_a_class = misc_tools.is_type(monkeypatchee)
     class_of_monkeypatchee = monkeypatchee if monkeypatchee_is_a_class else \
-                                      misc_tools.get_actual_type(monkeypatchee)
+                                                            type(monkeypatchee)
     
     def decorator(function):
         # Note that unlike most decorators, this decorator retuns the function
diff --git a/source_py3/python_toolbox/pickle_tools.py b/source_py3/python_toolbox/pickle_tools.py
@@ -26,7 +26,7 @@ def is_atomically_pickleable(thing):
     
     However, the `threading.Lock()` itself is not atomically pickleable.
     '''
-    my_type = misc_tools.get_actual_type(thing)
+    my_type = type(thing)
     return _is_type_atomically_pickleable(my_type, thing)
 
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`from .misc_tools import (`
`7`	`7`	`is_subclass, get_mro_depth_of_method, frange, getted_vars,`
`8`	`8`	`_ascii_variable_pattern, is_legal_ascii_variable_name,`
`9`		`- is_magic_variable_name, get_actual_type, is_number, identity_function,`
	`9`	`+ is_magic_variable_name, is_number, identity_function,`
`10`	`10`	`do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,`
`11`	`11`	`general_sum, general_product, is_legal_email_address, is_type`
`12`	`12`	`)`