Drop support of Python<3.7

pelix/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix root package

pelix/http/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix HTTP package.
@@ -27,12 +27,9 @@
     limitations under the License.
 """
 
-# Standard typing module should be optional
-try:
-    # pylint: disable=W0611
-    from typing import Any, ByteString, Dict, Iterable, IO, Tuple
-except ImportError:
-    pass
+# pylint: disable=W0611
+from typing import Any, ByteString, Dict, Iterable, IO, Tuple
+
 
 # Pelix utility methods
 from pelix.utilities import to_bytes

pelix/internals/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix framework internals beans package

pelix/ipopo/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 iPOPO package

pelix/ipopo/handlers/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 iPOPO featured handlers package

pelix/misc/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix miscellaneous modules

pelix/remote/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix remote services package

pelix/remote/beans.py

@@ -33,7 +33,6 @@
 
 
 # Pelix
-from pelix.utilities import is_string
 import pelix.constants
 import pelix.framework
 import pelix.ldapfilter
@@ -95,7 +94,7 @@ def __init__(
             self.__properties = {}
 
         # Normalize the list of configurations
-        if is_string(configurations):
+        if isinstance(configurations, str):
             self.__configurations = (configurations,)
         else:
             self.__configurations = tuple(configurations)
@@ -273,7 +272,7 @@ def __init__(
         self.__properties = properties.copy() if properties else {}
 
         # Normalize list of configurations
-        if is_string(configurations):
+        if isinstance(configurations, str):
             tuple_conf = (configurations,)  # type: Tuple[str, ...]
         else:
             tuple_conf = tuple(configurations)

pelix/remote/discovery/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix remote services discovery package

pelix/remote/discovery/redis.py

@@ -28,9 +28,6 @@
     limitations under the License.
 """
 
-# Ensure that the redis package is imported and not this module
-from __future__ import absolute_import
-
 # Standard library
 import logging
 import math

pelix/remote/transport/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix remote services transports package

pelix/rsa/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 """
 RemoteServiceAdmin constants and utility functions

pelix/rsa/providers/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 """
 Constants needed for all discovery and distribution providers

pelix/rsa/providers/discovery/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 """
 

pelix/rsa/providers/distribution/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 """
 
@@ -41,10 +41,7 @@
 )
 
 # Typing
-try:
-    from typing import Any, Dict, List, Tuple, Optional, Callable
-except ImportError:
-    pass
+from typing import Any, Dict, List, Tuple, Optional, Callable
 
 from pelix.rsa import ImportRegistration
 

pelix/rsa/topologymanagers/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 """
 
@@ -27,11 +27,8 @@
 """
 
 import logging
+from typing import Any, Dict
 
-try:
-    from typing import Any, Dict
-except ImportError:
-    pass
 
 from pelix.framework import ServiceEvent, ServiceReference, BundleContext
 from pelix.internals.hooks import EventListenerHook

pelix/services/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix OSGi-like services packages

pelix/shell/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix shell package

pelix/shell/completion/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix shell completion package

pelix/shell/completion/core.py

@@ -27,7 +27,6 @@
 """
 
 # Standard library
-from __future__ import absolute_import
 import logging
 import readline
 # pylint: disable=W0611

pelix/shell/completion/ipopo.py

@@ -26,7 +26,6 @@
     limitations under the License.
 """
 
-from __future__ import absolute_import
 import readline
 # pylint: disable=W0611
 from typing import List

pelix/shell/completion/pelix.py

@@ -26,7 +26,6 @@
     limitations under the License.
 """
 
-from __future__ import absolute_import
 import readline
 # pylint: disable=W0611
 from typing import List

pelix/shell/remote.py

@@ -28,7 +28,6 @@
     limitations under the License.
 """
 
-from __future__ import print_function
 
 # Standard library
 from select import select

samples/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Package containing samples for the iPOPO documentation

samples/handler/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 iPOPO handler sample package: contains the definition of the logger handler

tests/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for Pelix

tests/framework/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for the Pelix framework

tests/framework/vault/pkg_fail/__init__.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_fail/invalid.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 
 raise ImportError("Invalid bundle")

tests/framework/vault/pkg_fail/pkg2/__init__.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_fail/pkg2/invalid.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 
 raise ImportError("Invalid bundle")

tests/framework/vault/pkg_fail/pkg2/valid1.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_fail/pkg2/valid2.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_fail/valid1.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_fail/valid2.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_invalid/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 
 raise ImportError("Invalid package")

tests/framework/vault/pkg_ok/__init__.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/framework/vault/pkg_ok/__main__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --
 
 raise ImportError("I shouldn't be imported")

tests/framework/vault/pkg_ok/pkg2/__init__.py

@@ -1,2 +1,2 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -- Content-Encoding: UTF-8 --

tests/http/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for the Pelix HTTP Service

tests/http/test_basic.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix basic HTTP service test module.

tests/http/test_basic_ssl.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Pelix basic HTTP service test module.

tests/ipopo/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for iPOPO

tests/ipopo/test_validate_component.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Tests the component life cycle callbacks decorators

tests/misc/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for the Pelix miscellaneous modules

tests/misc/test_jabsorb.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Tests the Jabsorb conversion module

tests/remote/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for the Pelix Remote Services

tests/services/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for the Pelix featured services

tests/shell/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -- Content-Encoding: UTF-8 --
 """
 Test package for the Pelix Shell Service