diff --git a/Source/Libs/dateutil/parser/_parser.py b/Source/Libs/dateutil/parser/_parser.py index 37d1663..409adf6 100644 --- a/Source/Libs/dateutil/parser/_parser.py +++ b/Source/Libs/dateutil/parser/_parser.py @@ -39,8 +39,8 @@ import warnings from calendar import monthrange from io import StringIO -import six -from six import integer_types, text_type +from ... import six +from ...six import integer_types, text_type from decimal import Decimal diff --git a/Source/Libs/dateutil/parser/isoparser.py b/Source/Libs/dateutil/parser/isoparser.py index 5d7bee3..f46e6b3 100644 --- a/Source/Libs/dateutil/parser/isoparser.py +++ b/Source/Libs/dateutil/parser/isoparser.py @@ -9,12 +9,12 @@ ISO-8601 specification. """ from datetime import datetime, timedelta, time, date import calendar -from dateutil import tz +from ...dateutil import tz from functools import wraps import re -import six +from ... import six __all__ = ["isoparse", "isoparser"] diff --git a/Source/Libs/dateutil/relativedelta.py b/Source/Libs/dateutil/relativedelta.py index a9e85f7..6ed36cc 100644 --- a/Source/Libs/dateutil/relativedelta.py +++ b/Source/Libs/dateutil/relativedelta.py @@ -5,7 +5,7 @@ import calendar import operator from math import copysign -from six import integer_types +from ..six import integer_types from warnings import warn from ._common import weekday diff --git a/Source/Libs/dateutil/tz/_common.py b/Source/Libs/dateutil/tz/_common.py index e6ac118..76397a9 100644 --- a/Source/Libs/dateutil/tz/_common.py +++ b/Source/Libs/dateutil/tz/_common.py @@ -1,4 +1,4 @@ -from six import PY2 +from ...six import PY2 from functools import wraps diff --git a/Source/Libs/dateutil/tz/_factories.py b/Source/Libs/dateutil/tz/_factories.py index f8a6589..b6f0a7e 100644 --- a/Source/Libs/dateutil/tz/_factories.py +++ b/Source/Libs/dateutil/tz/_factories.py @@ -2,7 +2,7 @@ from datetime import timedelta import weakref from collections import OrderedDict -from six.moves import _thread +from ...six.moves import _thread class _TzSingleton(type): diff --git a/Source/Libs/dateutil/tz/tz.py b/Source/Libs/dateutil/tz/tz.py index c67f56d..ce9a694 100644 --- a/Source/Libs/dateutil/tz/tz.py +++ b/Source/Libs/dateutil/tz/tz.py @@ -16,9 +16,9 @@ import bisect import weakref from collections import OrderedDict -import six -from six import string_types -from six.moves import _thread +from ... import six +from ...six import string_types +from ...six.moves import _thread from ._common import tzname_in_python2, _tzinfo from ._common import tzrangebase, enfold from ._common import _validate_fromutc_inputs diff --git a/Source/Libs/feedgen/entry.py b/Source/Libs/feedgen/entry.py index 7b83669..87fdf6c 100644 --- a/Source/Libs/feedgen/entry.py +++ b/Source/Libs/feedgen/entry.py @@ -10,8 +10,8 @@ from datetime import datetime -import dateutil.parser -import dateutil.tz +from ..dateutil import parser as dateutil_parser +from ..dateutil import tz as dateutil_tz import warnings from lxml.etree import CDATA # nosec - adding CDATA entry is safe @@ -67,7 +67,7 @@ class FeedEntry(object): # required self.__atom_id = None self.__atom_title = None - self.__atom_updated = datetime.now(dateutil.tz.tzutc()) + self.__atom_updated = datetime.now(dateutil_tz.tzutc()) # recommended self.__atom_author = None @@ -314,7 +314,7 @@ class FeedEntry(object): ''' if updated is not None: if isinstance(updated, string_types): - updated = dateutil.parser.parse(updated) + updated = dateutil_parser.parse(updated) if not isinstance(updated, datetime): raise ValueError('Invalid datetime format') if updated.tzinfo is None: @@ -586,7 +586,7 @@ class FeedEntry(object): ''' if published is not None: if isinstance(published, string_types): - published = dateutil.parser.parse(published) + published = dateutil_parser.parse(published) if not isinstance(published, datetime): raise ValueError('Invalid datetime format') if published.tzinfo is None: diff --git a/Source/Libs/feedgen/feed.py b/Source/Libs/feedgen/feed.py index 16b6744..59dc3a3 100644 --- a/Source/Libs/feedgen/feed.py +++ b/Source/Libs/feedgen/feed.py @@ -12,8 +12,8 @@ import sys from datetime import datetime -import dateutil.parser -import dateutil.tz +from ..dateutil import parser as dateutil_parser +from ..dateutil import tz as dateutil_tz from lxml import etree # nosec - not using this for parsing from . import version as version @@ -36,7 +36,7 @@ class FeedGenerator(object): # required self.__atom_id = None self.__atom_title = None - self.__atom_updated = datetime.now(dateutil.tz.tzutc()) + self.__atom_updated = datetime.now(dateutil_tz.tzutc()) # recommended self.__atom_author = None # {name*, uri, email} @@ -70,7 +70,7 @@ class FeedGenerator(object): self.__rss_generator = 'python-feedgen' self.__rss_image = None self.__rss_language = None - self.__rss_lastBuildDate = datetime.now(dateutil.tz.tzutc()) + self.__rss_lastBuildDate = datetime.now(dateutil_tz.tzutc()) self.__rss_managingEditor = None self.__rss_pubDate = None self.__rss_rating = None @@ -462,7 +462,7 @@ class FeedGenerator(object): ''' if updated is not None: if isinstance(updated, string_types): - updated = dateutil.parser.parse(updated) + updated = dateutil_parser.parse(updated) if not isinstance(updated, datetime): raise ValueError('Invalid datetime format') if updated.tzinfo is None: @@ -887,7 +887,7 @@ class FeedGenerator(object): ''' if pubDate is not None: if isinstance(pubDate, string_types): - pubDate = dateutil.parser.parse(pubDate) + pubDate = dateutil_parser.parse(pubDate) if not isinstance(pubDate, datetime): raise ValueError('Invalid datetime format') if pubDate.tzinfo is None: