0.5.4: use six in requirements, req typing in python <3.7

Author: penguinolog

advanced_descriptors/__init__.py

@@ -21,7 +21,7 @@
     'AdvancedProperty',
 )
 
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 __author__ = "Alexey Stepanov"
 __author_email__ = 'penguinolog@gmail.com'
 __url__ = 'https://github.com/penguinolog/advanced-descriptors'

advanced_descriptors/separate_class_method.py

@@ -15,7 +15,7 @@
 
 """Separate class and instance methods with the same name."""
 
-import functools
+import six
 
 try:  # pragma: no cover
     import typing
@@ -28,61 +28,6 @@
     'SeparateClassMethod',
 )
 
-_WRAPPER_ASSIGNMENTS = (
-    '__module__',
-    '__name__',
-    '__qualname__',
-    '__doc__',
-    '__annotations__'
-)
-_WRAPPER_UPDATES = ('__dict__',)
-
-
-def _update_wrapper(wrapper,
-                    wrapped,
-                    assigned=_WRAPPER_ASSIGNMENTS,
-                    updated=_WRAPPER_UPDATES):
-    """Update a wrapper function to look like the wrapped function.
-
-    wrapper is the function to be updated
-    wrapped is the original function
-    assigned is a tuple naming the attributes assigned directly
-    from the wrapped function to the wrapper function (defaults to
-    functools.WRAPPER_ASSIGNMENTS)
-    updated is a tuple naming the attributes of the wrapper that
-    are updated with the corresponding attribute from the wrapped
-    function (defaults to functools.WRAPPER_UPDATES)
-    """
-    for attr in assigned:
-        try:
-            value = getattr(wrapped, attr)
-        except AttributeError:
-            pass
-        else:
-            setattr(wrapper, attr, value)
-    for attr in updated:
-        getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
-    # Issue #17482: set __wrapped__ last so we don't inadvertently copy it
-    # from the wrapped function when updating __dict__
-    wrapper.__wrapped__ = wrapped
-    # Return the wrapper so this can be used as a decorator via partial()
-    return wrapper
-
-
-def _wraps(wrapped,
-           assigned=_WRAPPER_ASSIGNMENTS,
-           updated=_WRAPPER_UPDATES):
-    """Decorator factory to apply update_wrapper() to a wrapper function.
-
-    Returns a decorator that invokes update_wrapper() with the decorated
-    function as the wrapper argument and the arguments to wraps() as the
-    remaining arguments. Default arguments are as for update_wrapper().
-    This is a convenience function to simplify applying partial() to
-    update_wrapper().
-    """
-    return functools.partial(
-        _update_wrapper, wrapped=wrapped, assigned=assigned, updated=updated)
-
 
 class SeparateClassMethod(object):
     """Separate class method and instance methods with the same name.
@@ -182,14 +127,14 @@ def __get__(self, instance, owner):  # type: (...) -> TargetFunctionType
             if self.__class_method is None:
                 raise AttributeError()
 
-            @_wraps(self.__class_method)
+            @six.wraps(self.__class_method)
             def class_method(*args, **kwargs):
                 """Bound class method."""
                 return self.__class_method(owner, *args, **kwargs)
 
             return class_method
 
-        @_wraps(self.__class_method)
+        @six.wraps(self.__instance_method)
         def instance_method(*args, **kwargs):
             """Bound instance method."""
             return self.__instance_method(instance, *args, **kwargs)

requirements.txt

@@ -0,0 +1 @@
+six

setup.py

@@ -238,7 +238,7 @@ def get_simple_vars_from_src(src):
     keywords=keywords,
     install_requires=required,
     extras_require={
-        ':python_version >= "2.7"': [
+        ':python_version < "3.7"': [
             'typing>=3.6',
         ],
     },