Separate py36+ syntax: better syntax, less errors

Signed-off-by: Alexey Stepanov <penguinolog@gmail.com>

Author: penguinolog

.travis.yml

@@ -8,12 +8,6 @@ install:
 - pip install --upgrade pytest-cov coveralls
 
 _python:
-- &python34
-  name: "Python 3.4"
-  python: 3.4
-- &python35
-  name: "Python 3.5"
-  python: 3.5
 - &python36
   name: "Python 3.6"
   python: 3.6
@@ -22,9 +16,6 @@ _python:
   python: 3.7
   dist: xenial
   sudo: true
-- &pypy3
-  name: "PyPy3"
-  python: pypy3.5
 
 _helpers:
 - &install_cython pip install --upgrade Cython
@@ -83,7 +74,7 @@ jobs:
     install:
     - *upgrade_python_toolset
     - *install_deps
-    - pip install --upgrade "mypy >= 0.620"
+    - pip install --upgrade "mypy >= 0.630"
     script:
     - mypy --strict advanced_descriptors
 
@@ -109,21 +100,11 @@ jobs:
     script:
     - black --check advanced_descriptors
 
-  - stage: test
-    <<: *python34
-  - stage: test
-    <<: *python35
   - stage: test
     <<: *python36
   - stage: test
     <<: *python37
-  - stage: test
-    <<: *pypy3
 
-  - <<: *test_cythonized
-    <<: *python34
-  - <<: *test_cythonized
-    <<: *python35
   - <<: *test_cythonized
     <<: *python36
   - <<: *test_cythonized
@@ -133,16 +114,16 @@ jobs:
     # This prevents job from appearing in test plan unless commit is tagged:
     if: tag IS present
     # Run on pypy to build not cythonized wheel
-    <<: *pypy3
+    <<: *python37
     name: Build universal and cythonized bdist_wheel. Deploy bdist and sdist.
     services:
     - docker
     install:
     - *upgrade_python_toolset
+    - *install_deps
     script:
     - ./tools/run_docker.sh "Advanced_Descriptors"
     before_deploy:
-    - pip install -r build_requirements.txt
     - *build_package
     deploy:
     - provider: pypi

advanced_descriptors/advanced_property.py

@@ -15,10 +15,10 @@
 
 """Property with class-wide getter."""
 
-import typing
-
 __all__ = ("AdvancedProperty",)
 
+import typing
+
 
 class AdvancedProperty(property):
     """Property with class-wide getter.
@@ -134,7 +134,7 @@ def __init__(
         """
         super(AdvancedProperty, self).__init__(fget=fget, fset=fset, fdel=fdel)
 
-        self.__fcget = fcget
+        self.__fcget: typing.Optional[typing.Callable[[typing.Any], typing.Any]] = fcget
 
     def __get__(self, instance: typing.Any, owner: typing.Any = None) -> typing.Any:
         """Get descriptor.

advanced_descriptors/log_on_access.py

@@ -15,14 +15,15 @@
 
 """Property with logging on successful get/set/delete or failure."""
 
+__all__ = ("LogOnAccess",)
+
 import logging
 import sys
 import traceback
 import typing
 
-__all__ = ("LogOnAccess",)
 
-_logger = logging.getLogger(__name__)  # type: logging.Logger
+_logger: logging.Logger = logging.getLogger(__name__)
 
 
 class LogOnAccess(property):
@@ -47,7 +48,7 @@ def __init__(
         log_success: bool = True,
         log_failure: bool = True,
         log_traceback: bool = True,
-        override_name: typing.Optional[str] = None
+        override_name: typing.Optional[str] = None,
     ) -> None:
         """Advanced property main entry point.
 
@@ -88,7 +89,7 @@ def __init__(
         ...     def __init__(self, val = 'ok'):
         ...         self.val = val
         ...     def __repr__(self):
-        ...         return '{cls}(val={self.val})'.format(cls=self.__class__.__name__, self=self)
+        ...         return f'{self.__class__.__name__}(val={self.val})'
         ...     @LogOnAccess
         ...     def ok(self):
         ...         return self.val
@@ -165,17 +166,17 @@ def __init__(
         super(LogOnAccess, self).__init__(fget=fget, fset=fset, fdel=fdel, doc=doc)
 
         if logger is None or isinstance(logger, logging.Logger):
-            self.__logger = logger
+            self.__logger: typing.Optional[logging.Logger] = logger
         else:
             self.__logger = logging.getLogger(logger)
 
-        self.__log_object_repr = log_object_repr
-        self.__log_level = log_level
-        self.__exc_level = exc_level
-        self.__log_success = log_success
-        self.__log_failure = log_failure
-        self.__log_traceback = log_traceback
-        self.__override_name = override_name
+        self.__log_object_repr: bool = log_object_repr
+        self.__log_level: int = log_level
+        self.__exc_level: int = exc_level
+        self.__log_success: bool = log_success
+        self.__log_failure: bool = log_failure
+        self.__log_traceback: bool = log_traceback
+        self.__override_name: typing.Optional[str] = override_name
 
     @property
     def __traceback(self) -> str:
@@ -186,18 +187,16 @@ def __traceback(self) -> str:
         stack = traceback.extract_stack()
         tb = traceback.extract_tb(exc_info[2])
         full_tb = stack[:1] + tb  # cut decorator and build full traceback
-        exc_line = traceback.format_exception_only(*exc_info[:2])
+        exc_line: typing.List[str] = traceback.format_exception_only(*exc_info[:2])
         # Make standard traceback string
         tb_text = "\nTraceback (most recent call last):\n" + "".join(traceback.format_list(full_tb)) + "".join(exc_line)
         return tb_text
 
     def __get_obj_source(self, instance: typing.Any, owner: typing.Optional[type] = None) -> str:
         """Get object repr block."""
         if self.log_object_repr:
-            return "{instance!r}".format(instance=instance)
-        return "<{name}() at 0x{id:X}>".format(
-            name=owner.__name__ if owner is not None else instance.__class__.__name__, id=id(instance)
-        )
+            return f"{instance!r}"
+        return f"<{owner.__name__ if owner is not None else instance.__class__.__name__}() at 0x{id(instance):X}>"
 
     def _get_logger_for_instance(self, instance: typing.Any) -> logging.Logger:
         """Get logger for log calls.
@@ -229,26 +228,17 @@ def __get__(self, instance: typing.Any, owner: typing.Optional[type] = None) ->
         if instance is None or self.fget is None:
             raise AttributeError()
 
-        source = self.__get_obj_source(instance, owner)
-        logger = self._get_logger_for_instance(instance)
+        source: str = self.__get_obj_source(instance, owner)
+        logger: logging.Logger = self._get_logger_for_instance(instance)
 
         try:
             result = super(LogOnAccess, self).__get__(instance, owner)
             if self.log_success:
-                logger.log(
-                    self.log_level,
-                    "{source}.{name} -> {result!r}".format(source=source, name=self.__name__, result=result),
-                )
+                logger.log(self.log_level, "%s.%s -> %r", source, self.__name__, result)
             return result
         except Exception:
             if self.log_failure:
-                logger.log(
-                    self.exc_level,
-                    "Failed: {source}.{name}{traceback}".format(
-                        source=source, name=self.__name__, traceback=self.__traceback
-                    ),
-                    exc_info=False,
-                )
+                logger.log(self.exc_level, "Failed: %s.%s%s", source, self.__name__, self.__traceback, exc_info=False)
             raise
 
     def __set__(self, instance: typing.Any, value: typing.Any) -> None:
@@ -263,22 +253,22 @@ def __set__(self, instance: typing.Any, value: typing.Any) -> None:
         if self.fset is None:
             raise AttributeError()
 
-        source = self.__get_obj_source(instance)
-        logger = self._get_logger_for_instance(instance)
+        source: str = self.__get_obj_source(instance)
+        logger: logging.Logger = self._get_logger_for_instance(instance)
 
         try:
             super(LogOnAccess, self).__set__(instance, value)
             if self.log_success:
-                logger.log(
-                    self.log_level, "{source}.{name} = {value!r}".format(source=source, name=self.__name__, value=value)
-                )
+                logger.log(self.log_level, "%s.%s = %r", source, self.__name__, value)
         except Exception:
             if self.log_failure:
                 logger.log(
                     self.exc_level,
-                    "Failed: {source}.{name} = {value!r}{traceback}".format(
-                        source=source, name=self.__name__, value=value, traceback=self.__traceback
-                    ),
+                    "Failed: %s.%s = %r%s",
+                    source,
+                    self.__name__,
+                    value,
+                    self.__traceback,
                     exc_info=False,
                 )
             raise
@@ -294,21 +284,17 @@ def __delete__(self, instance: typing.Any) -> None:
         if self.fdel is None:
             raise AttributeError()
 
-        source = self.__get_obj_source(instance)
-        logger = self._get_logger_for_instance(instance)
+        source: str = self.__get_obj_source(instance)
+        logger: logging.Logger = self._get_logger_for_instance(instance)
 
         try:
             super(LogOnAccess, self).__delete__(instance)
             if self.log_success:
-                logger.log(self.log_level, "del {source}.{name}".format(source=source, name=self.__name__))
+                logger.log(self.log_level, "del %s.%s", source, self.__name__)
         except Exception:
             if self.log_failure:
                 logger.log(
-                    self.exc_level,
-                    "{source}: Failed: del {name}{traceback}".format(
-                        source=source, name=self.__name__, traceback=self.__traceback
-                    ),
-                    exc_info=False,
+                    self.exc_level, "%s: Failed: del %s%s", source, self.__name__, self.__traceback, exc_info=False
                 )
             raise
 

advanced_descriptors/separate_class_method.py

@@ -15,11 +15,11 @@
 
 """Separate class and instance methods with the same name."""
 
+__all__ = ("SeparateClassMethod",)
+
 import functools
 import typing
 
-__all__ = ("SeparateClassMethod",)
-
 
 class SeparateClassMethod:
     """Separate class method and instance methods with the same name.
@@ -92,7 +92,9 @@ class SeparateClassMethod:
     __slots__ = ("__instance_method", "__class_method", "__owner", "__name")
 
     def __init__(
-        self, imeth: typing.Optional[typing.Callable] = None, cmeth: typing.Optional[typing.Callable] = None
+        self,
+        imeth: typing.Optional[typing.Callable[..., typing.Any]] = None,
+        cmeth: typing.Optional[typing.Callable[..., typing.Any]] = None,
     ) -> None:
         """Separate class method and instance methods.
 
@@ -101,17 +103,17 @@ def __init__(
         :param cmeth: Class method
         :type cmeth: typing.Optional[typing.Callable]
         """
-        self.__instance_method = imeth
-        self.__class_method = cmeth
-        self.__owner = None
-        self.__name = ""
+        self.__instance_method: typing.Optional[typing.Callable[..., typing.Any]] = imeth
+        self.__class_method: typing.Optional[typing.Callable[..., typing.Any]] = cmeth
+        self.__owner: typing.Optional[typing.Any] = None
+        self.__name: str = ""
 
     def __set_name__(self, owner: typing.Any, name: str) -> None:
         """Set __name__ and __objclass__ property."""
         self.__owner = owner
         self.__name = name
 
-    def __get__(self, instance: typing.Optional[typing.Any], owner: typing.Any) -> typing.Callable:
+    def __get__(self, instance: typing.Optional[typing.Any], owner: typing.Any) -> typing.Callable[..., typing.Any]:
         """Get descriptor.
 
         :return: class method or instance method depends on call behavior
@@ -146,7 +148,7 @@ def __name__(self) -> str:  # pragma: no cover
         """Read-only name."""
         return self.__name
 
-    def instance_method(self, imeth: typing.Optional[typing.Callable]) -> "SeparateClassMethod":
+    def instance_method(self, imeth: typing.Optional[typing.Callable[..., typing.Any]]) -> "SeparateClassMethod":
         """Descriptor to change instance method.
 
         :param imeth: New instance method.
@@ -157,7 +159,7 @@ def instance_method(self, imeth: typing.Optional[typing.Callable]) -> "SeparateC
         self.__instance_method = imeth
         return self
 
-    def class_method(self, cmeth: typing.Optional[typing.Callable]) -> "SeparateClassMethod":
+    def class_method(self, cmeth: typing.Optional[typing.Callable[..., typing.Any]]) -> "SeparateClassMethod":
         """Descriptor to change class method.
 
         :param cmeth: New class method.
@@ -169,15 +171,15 @@ def class_method(self, cmeth: typing.Optional[typing.Callable]) -> "SeparateClas
         return self
 
     @property
-    def imeth(self) -> typing.Optional[typing.Callable]:
+    def imeth(self) -> typing.Optional[typing.Callable[..., typing.Any]]:
         """Instance method instance.
 
         :rtype: typing.Optional[typing.Callable]
         """
         return self.__instance_method
 
     @property
-    def cmeth(self) -> typing.Optional[typing.Callable]:
+    def cmeth(self) -> typing.Optional[typing.Callable[..., typing.Any]]:
         """Class method instance.
 
         :rtype: typing.Optional[typing.Callable]