typehints: fix *args, **kwargs. Do not lookup for pyi stubs. (#18)

Fix misprint.

Author: penguinolog

advanced_descriptors/__init__.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""Advanded descriptors for special cases."""
+"""Advanced descriptors for special cases."""
 
 from .separate_class_method import SeparateClassMethod
 from .advanced_property import AdvancedProperty
@@ -30,5 +30,5 @@
     'Dennis Dmitriev': 'dis-xcom@gmail.com',
 }
 __url__ = 'https://github.com/python-useful-helpers/advanced-descriptors'
-__description__ = "Advanded descriptors for special cases."
+__description__ = "Advanced descriptors for special cases."
 __license__ = "Apache License, Version 2.0"

advanced_descriptors/separate_class_method.py

@@ -99,15 +99,15 @@ class SeparateClassMethod(object):
 
     def __init__(
             self,
-            imeth=None,  # type: typing.Optional[typing.Callable[..., typing.Any]]
-            cmeth=None,  # type: typing.Optional[typing.Callable[..., typing.Any]]
+            imeth=None,  # type: typing.Optional[typing.Callable]
+            cmeth=None,  # type: typing.Optional[typing.Callable]
     ):  # type: (...) -> None
         """Separate class method and instance methods.
 
         :param imeth: Instance method
-        :type imeth: typing.Optional[typing.Callable[..., typing.Any]]
+        :type imeth: typing.Optional[typing.Callable]
         :param cmeth: Class method
-        :type cmeth: typing.Optional[typing.Callable[..., typing.Any]]
+        :type cmeth: typing.Optional[typing.Callable]
         """
         self.__instance_method = imeth
         self.__class_method = cmeth
@@ -116,10 +116,10 @@ def __get__(
         self,
         instance,  # type: typing.Optional[typing.Any]
         owner  # type: typing.Any
-    ):  # type: (...) -> typing.Callable[..., typing.Any]
+    ):  # type: (...) -> typing.Callable
         """Get descriptor.
 
-        :rtype: typing.Callable[..., typing.Any]
+        :rtype: typing.Callable
         :raises: AttributeError
         """
         if instance is None or self.__instance_method is None:
@@ -134,51 +134,51 @@ def class_method(*args, **kwargs):  # type: (typing.Tuple, typing.Dict) -> typin
             return class_method
 
         @six.wraps(self.__instance_method)
-        def instance_method(*args, **kwargs):  # type: (typing.Tuple, typing.Dict) -> typing.Any
+        def instance_method(*args, **kwargs):  # type: (typing.Any, typing.Any) -> typing.Any
             """Bound instance method."""
             return self.__instance_method(instance, *args, **kwargs)  # type: ignore
 
         return instance_method
 
     def instance_method(
             self,
-            imeth  # type: typing.Optional[typing.Callable[..., typing.Any]]
+            imeth  # type: typing.Optional[typing.Callable]
     ):  # type: (...) -> SeparateClassMethod
         """Descriptor to change instance method.
 
         :param imeth: New instance method.
-        :type imeth: typing.Optional[typing.Callable[..., typing.Any]]
+        :type imeth: typing.Optional[typing.Callable]
         :rtype: SeparateClassMethod
         """
         self.__instance_method = imeth
         return self
 
     def class_method(
             self,
-            cmeth  # type: typing.Optional[typing.Callable[..., typing.Any]]
+            cmeth  # type: typing.Optional[typing.Callable]
     ):  # type: (...) -> SeparateClassMethod
         """Descriptor to change class method.
 
         :type cmeth: New class method.
-        :type cmeth: typing.Optional[typing.Callable[..., typing.Any]]
+        :type cmeth: typing.Optional[typing.Callable]
         :rtype: SeparateClassMethod
         """
         self.__class_method = cmeth
         return self
 
     @property
-    def imeth(self):  # type: () -> typing.Optional[typing.Callable[..., typing.Any]]
+    def imeth(self):  # type: () -> typing.Optional[typing.Callable]
         """Instance method instance.
 
-        :rtype: typing.Optional[typing.Callable[..., typing.Any]]
+        :rtype: typing.Optional[typing.Callable]
         """
         return self.__instance_method
 
     @property
-    def cmeth(self):  # type: () -> typing.Optional[typing.Callable[..., typing.Any]]
+    def cmeth(self):  # type: () -> typing.Optional[typing.Callable]
         """Class method instance.
 
-        :rtype: typing.Optional[typing.Callable[..., typing.Any]]
+        :rtype: typing.Optional[typing.Callable]
         """
         return self.__class_method
 

doc/source/separate_classmethod.rst

@@ -14,32 +14,32 @@ API: SeparateClassMethod
     .. py:method:: __init__(imeth=None, cmeth=None, )
 
         :param imeth: Instance method
-        :type imeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
+        :type imeth: ``typing.Optional[typing.Callable]``
         :param cmeth: Class method
-        :type cmeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
+        :type cmeth: ``typing.Optional[typing.Callable]``
 
     .. py:method:: instance_method(imeth)
 
         Descriptor to change instance method.
 
         :param imeth: New instance method.
-        :type imeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
+        :type imeth: ``typing.Optional[typing.Callable]``
         :rtype: ``SeparateClassMethod``
 
     .. py:method:: class_method(cmeth)
 
         Descriptor to change class method.
 
         :type cmeth: New class method.
-        :type cmeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
+        :type cmeth: ``typing.Optional[typing.Callable]``
         :rtype: ``SeparateClassMethod``
 
     .. py:attribute:: imeth
 
-        ``typing.Optional[typing.Callable[..., typing.Any]]``
+        ``typing.Optional[typing.Callable]``
         Instance method instance.
 
     .. py:attribute:: cmeth
 
-        ``typing.Optional[typing.Callable[..., typing.Any]]``
+        ``typing.Optional[typing.Callable]``
         Class method instance.

setup.cfg

@@ -45,4 +45,5 @@ count = True
 test=pytest
 
 [tool:pytest]
-addopts = -vv --cov-config .coveragerc  --cov=advanced_descriptors
+addopts = -vvv -s -p no:django -p no:ipdb
+testpaths = test

setup.py

@@ -11,15 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""Advanded descriptors for special cases."""
+"""Advanced descriptors for special cases."""
 
 from __future__ import print_function
 
 import ast
 import collections
 from distutils.command import build_ext
 import distutils.errors
-import glob
 import os.path
 import shutil
 import sys
@@ -259,12 +258,7 @@ def get_simple_vars_from_src(src):
                    "!=36.2.0",
     install_requires=required,
     package_data={
-        'advanced_descriptors': [
-            os.path.basename(filename)
-            for filename in glob.glob(os.path.join('advanced_descriptors', '*.pyi'))
-        ] + [
-            'py.typed'
-        ],
+        'advanced_descriptors': ['py.typed'],
     },
 )
 if cythonize is not None:

tox.ini

@@ -25,7 +25,7 @@ deps =
     py{27,py}: mock
 
 commands =
-    py.test -vv --junitxml=unit_result.xml --html=report.html --cov-config .coveragerc --cov-report html --cov=advanced_descriptors {posargs:test}
+    py.test -vv --junitxml=unit_result.xml --html=report.html --self-contained-html --cov-config .coveragerc --cov-report html --cov=advanced_descriptors {posargs:test}
     coverage report --fail-under 89
 
 [testenv:py34-nocov]