Make compatible with Python 2 namespace package

Author: eirenik0

eyes_core/applitools/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore

eyes_core/applitools/core/logger.py

@@ -10,8 +10,6 @@
 import functools
 import typing as tp
 
-from applitools.core.utils.compat import ABC
-
 
 _DEFAULT_EYES_LOGGER_NAME = 'eyes'
 _DEFAULT_EYES_FORMATTER = logging.Formatter('%(asctime)s [%(levelname)s] %(name)s: %(message)s')
@@ -22,7 +20,7 @@
 __all__ = ('StdoutLogger', 'FileLogger', 'NullLogger')
 
 
-class _Logger(ABC):
+class _Logger(object):
     """
     Simple logger. Supports only info and debug.
     """

eyes_core/applitools/core/positioning/position_provider.py

@@ -3,7 +3,7 @@
 
 import attr
 
-from applitools.core import Point
+from applitools.core.geometry import Point
 from applitools.core.utils.compat import ABC
 
 if tp.TYPE_CHECKING:
@@ -63,7 +63,8 @@ class InvalidPositionProvider(PositionProvider):
     def get_current_position(self):
         raise NotImplementedError("This class does not implement methods!")
 
-    def set_position(self, location: Point):
+    def set_position(self, location):
+        # type: (Point) -> None
         raise NotImplementedError("This class does not implement methods!")
 
     def get_entire_size(self):

eyes_core/applitools/core/positioning/region_provider.py

@@ -2,11 +2,11 @@
 
 import attr
 
-from applitools.core import Region
+from applitools.core.geometry import Region
 from applitools.core.utils import ABC
 
 if tp.TYPE_CHECKING:
-    from applitools.core import EyesScreenshot
+    from applitools.core.capture import EyesScreenshot
 
 __all__ = ('RegionProvider', 'NullRegionProvider', 'NULL_REGION_INSTANCE')
 

eyes_core/applitools/core/utils/general_utils.py

@@ -1,16 +1,14 @@
 """
 General purpose utilities.
 """
-from __future__ import absolute_import
-
 import itertools
 import json
 import time
 import types
 import typing as tp
 from datetime import timedelta, tzinfo
 
-from applitools.core import logger
+from .. import logger
 from .compat import urlparse
 
 if tp.TYPE_CHECKING:

eyes_core/setup.py

@@ -1,14 +1,8 @@
-import os
 import re
 import codecs
 from os import path
 
-from setuptools import setup
-
-try:
-    from setuptools import find_namespace_packages
-except ImportError:
-    raise ImportError("Please update your version of setuptools: pip install -U setuptools")
+from setuptools import setup, find_packages
 
 here = path.abspath(path.dirname(__file__))
 
@@ -32,7 +26,7 @@ def get_version(package_name):
 setup(
     name='eyes_core',
     version=get_version('core'),
-    packages=find_namespace_packages(include=['applitools.*'], exclude=('tests',)),
+    packages=find_packages(include=['applitools.*'], exclude=('tests',)),
     url='http://www.applitools.com',
     license='Apache License, Version 2.0',
     author='Applitools Team',

eyes_images/applitools/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore

eyes_images/applitools/images/target.py

@@ -3,7 +3,6 @@
 import typing as tp
 
 from PIL import Image
-from multimethod import multidispatch
 
 from applitools.core import RegionProvider
 from applitools.core.utils import image_utils
@@ -126,28 +125,14 @@ def timeout(self, timeout):
 
     def image(self, image_or_path):
         # type: (tp.Union[Image.Image, tp.Text]) -> Target
-        self._image = _image_dispatch(image_or_path)
+        if isinstance(image_or_path, Image.Image):
+            self._image = image_or_path
+        elif isinstance(image_or_path, str) or isinstance(image_or_path, tp.Text):
+            self._image = image_utils.image_from_file(image_or_path)
         return self
 
     def region(self, image_or_path, rect):
         # type: (tp.Union[Image.Image, tp.Text], Region) -> Target
         target = self.image(image_or_path)
         target._target_region = rect
         return target
-
-
-@multidispatch
-def _image_dispatch(image):
-    raise TypeError('Not supported type.')
-
-
-@_image_dispatch.register(Image.Image)  # type: ignore
-def __image_dispatch(image):
-    return image
-
-
-@_image_dispatch.register(tp.Text)  # type: ignore
-@_image_dispatch.register(str)
-def __image_dispatch(image_path):
-    image = image_utils.image_from_file(image_path)
-    return image

eyes_images/setup.py

@@ -1,14 +1,8 @@
-import os
 import re
 import codecs
 from os import path
 
-from setuptools import setup
-
-try:
-    from setuptools import find_namespace_packages
-except ImportError:
-    raise ImportError("Please update your version of setuptools: pip install -U setuptools")
+from setuptools import setup, find_packages
 
 here = path.abspath(path.dirname(__file__))
 
@@ -32,7 +26,7 @@ def get_version(package_name):
 setup(
     name='eyes_images',
     version=get_version('images'),
-    packages=find_namespace_packages(include=['applitools.*'], exclude=('tests',)),
+    packages=find_packages(include=['applitools.*'], exclude=('tests',)),
     url='http://www.applitools.com',
     license='Apache License, Version 2.0',
     author='Applitools Team',
@@ -55,7 +49,6 @@ def get_version(package_name):
     install_requires=[
         'eyes-core=={}'.format(get_version('images')),
         'Pillow>=5.0.0',
-        'multimethod>=0.7.1',
         'typing>=3.5.2; python_version<="3.4"',
     ],
     package_data={

eyes_selenium/applitools/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore