Move libraries import

context.py

@@ -13,11 +13,13 @@ import xbmcaddon
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.emby')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
+__libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'librarie')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')
 __cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8')
 
 sys.path.insert(0, __cache__)
 sys.path.insert(0, __pcache__)
+sys.path.insert(0, __libraries__)
 sys.path.append(__base__)
 
 #################################################################################################

context_play.py

@@ -13,11 +13,13 @@ import xbmcaddon
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.emby')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
+__libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')
 __cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8')
 
 sys.path.insert(0, __cache__)
 sys.path.insert(0, __pcache__)
+sys.path.insert(0, __libraries__)
 sys.path.append(__base__)
 
 #################################################################################################

default.py

@@ -13,11 +13,13 @@ import xbmcaddon
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.emby')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
+__libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')
 __cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8')
 
 sys.path.insert(0, __cache__)
 sys.path.insert(0, __pcache__)
+sys.path.insert(0, __libraries__)
 sys.path.append(__base__)
 
 #################################################################################################

libraries/dateutil/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 try:
-    from ._version import version as __version__
+    from _version import version as __version__
 except ImportError:
     __version__ = 'unknown'
 

libraries/dateutil/parser/__init__.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-from ._parser import parse, parser, parserinfo
+from _parser import parse, parser, parserinfo
-from ._parser import DEFAULTPARSER, DEFAULTTZPARSER
+from _parser import DEFAULTPARSER, DEFAULTTZPARSER
-from ._parser import UnknownTimezoneWarning
+from _parser import UnknownTimezoneWarning
 
-from ._parser import __doc__
+from _parser import __doc__
 
-from .isoparser import isoparser, isoparse
+from isoparser import isoparser, isoparse
 
 __all__ = ['parse', 'parser', 'parserinfo',
            'isoparse', 'isoparser',

libraries/dateutil/parser/_parser.py

@@ -39,15 +39,15 @@ import warnings
 from calendar import monthrange
 from io import StringIO
 
-from .. import six
+import six
-from ..six import binary_type, integer_types, text_type
+from six import binary_type, integer_types, text_type
 
 from decimal import Decimal
 
 from warnings import warn
 
-from .. import relativedelta
+from dateutil import relativedelta
-from .. import tz
+from dateutil import tz
 
 __all__ = ["parse", "parserinfo"]
 

libraries/dateutil/parser/isoparser.py

@@ -9,12 +9,12 @@ ISO-8601 specification.
 """
 from datetime import datetime, timedelta, time, date
 import calendar
-from .. import tz
+from dateutil import tz
 
 from functools import wraps
 
 import re
-from .. import six
+import six
 
 __all__ = ["isoparse", "isoparser"]
 

libraries/dateutil/tz/_common.py

@@ -1,4 +1,4 @@
-from ..six import PY3
+from six import PY3
 
 from functools import wraps
 

libraries/dateutil/tz/tz.py

@@ -14,17 +14,17 @@ import sys
 import os
 import bisect
 
-from .. import six
+import six
-from ..six import string_types
+from six import string_types
-from ..six.moves import _thread
+from six.moves import _thread
-from ._common import tzname_in_python2, _tzinfo
+from _common import tzname_in_python2, _tzinfo
-from ._common import tzrangebase, enfold
+from _common import tzrangebase, enfold
-from ._common import _validate_fromutc_inputs
+from _common import _validate_fromutc_inputs
 
-from ._factories import _TzSingleton, _TzOffsetFactory
+from _factories import _TzSingleton, _TzOffsetFactory
-from ._factories import _TzStrFactory
+from _factories import _TzStrFactory
 try:
-    from .win import tzwin, tzwinlocal
+    from win import tzwin, tzwinlocal
 except ImportError:
     tzwin = tzwinlocal = None