mirror of https://gitlab.com/octtspacc/staticoso
Fix dependencies
This commit is contained in:
parent
ec73b69eed
commit
26e24036b5
|
@ -39,8 +39,8 @@ import warnings
|
||||||
from calendar import monthrange
|
from calendar import monthrange
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
|
|
||||||
import six
|
from ... import six
|
||||||
from six import integer_types, text_type
|
from ...six import integer_types, text_type
|
||||||
|
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
|
||||||
|
|
|
@ -9,12 +9,12 @@ ISO-8601 specification.
|
||||||
"""
|
"""
|
||||||
from datetime import datetime, timedelta, time, date
|
from datetime import datetime, timedelta, time, date
|
||||||
import calendar
|
import calendar
|
||||||
from dateutil import tz
|
from ...dateutil import tz
|
||||||
|
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import six
|
from ... import six
|
||||||
|
|
||||||
__all__ = ["isoparse", "isoparser"]
|
__all__ = ["isoparse", "isoparser"]
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import calendar
|
||||||
import operator
|
import operator
|
||||||
from math import copysign
|
from math import copysign
|
||||||
|
|
||||||
from six import integer_types
|
from ..six import integer_types
|
||||||
from warnings import warn
|
from warnings import warn
|
||||||
|
|
||||||
from ._common import weekday
|
from ._common import weekday
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from six import PY2
|
from ...six import PY2
|
||||||
|
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ from datetime import timedelta
|
||||||
import weakref
|
import weakref
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from six.moves import _thread
|
from ...six.moves import _thread
|
||||||
|
|
||||||
|
|
||||||
class _TzSingleton(type):
|
class _TzSingleton(type):
|
||||||
|
|
|
@ -16,9 +16,9 @@ import bisect
|
||||||
import weakref
|
import weakref
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
import six
|
from ... 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
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
import dateutil.parser
|
from ..dateutil import parser as dateutil_parser
|
||||||
import dateutil.tz
|
from ..dateutil import tz as dateutil_tz
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
from lxml.etree import CDATA # nosec - adding CDATA entry is safe
|
from lxml.etree import CDATA # nosec - adding CDATA entry is safe
|
||||||
|
@ -67,7 +67,7 @@ class FeedEntry(object):
|
||||||
# required
|
# required
|
||||||
self.__atom_id = None
|
self.__atom_id = None
|
||||||
self.__atom_title = None
|
self.__atom_title = None
|
||||||
self.__atom_updated = datetime.now(dateutil.tz.tzutc())
|
self.__atom_updated = datetime.now(dateutil_tz.tzutc())
|
||||||
|
|
||||||
# recommended
|
# recommended
|
||||||
self.__atom_author = None
|
self.__atom_author = None
|
||||||
|
@ -314,7 +314,7 @@ class FeedEntry(object):
|
||||||
'''
|
'''
|
||||||
if updated is not None:
|
if updated is not None:
|
||||||
if isinstance(updated, string_types):
|
if isinstance(updated, string_types):
|
||||||
updated = dateutil.parser.parse(updated)
|
updated = dateutil_parser.parse(updated)
|
||||||
if not isinstance(updated, datetime):
|
if not isinstance(updated, datetime):
|
||||||
raise ValueError('Invalid datetime format')
|
raise ValueError('Invalid datetime format')
|
||||||
if updated.tzinfo is None:
|
if updated.tzinfo is None:
|
||||||
|
@ -586,7 +586,7 @@ class FeedEntry(object):
|
||||||
'''
|
'''
|
||||||
if published is not None:
|
if published is not None:
|
||||||
if isinstance(published, string_types):
|
if isinstance(published, string_types):
|
||||||
published = dateutil.parser.parse(published)
|
published = dateutil_parser.parse(published)
|
||||||
if not isinstance(published, datetime):
|
if not isinstance(published, datetime):
|
||||||
raise ValueError('Invalid datetime format')
|
raise ValueError('Invalid datetime format')
|
||||||
if published.tzinfo is None:
|
if published.tzinfo is None:
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
import sys
|
import sys
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
import dateutil.parser
|
from ..dateutil import parser as dateutil_parser
|
||||||
import dateutil.tz
|
from ..dateutil import tz as dateutil_tz
|
||||||
from lxml import etree # nosec - not using this for parsing
|
from lxml import etree # nosec - not using this for parsing
|
||||||
|
|
||||||
from . import version as version
|
from . import version as version
|
||||||
|
@ -36,7 +36,7 @@ class FeedGenerator(object):
|
||||||
# required
|
# required
|
||||||
self.__atom_id = None
|
self.__atom_id = None
|
||||||
self.__atom_title = None
|
self.__atom_title = None
|
||||||
self.__atom_updated = datetime.now(dateutil.tz.tzutc())
|
self.__atom_updated = datetime.now(dateutil_tz.tzutc())
|
||||||
|
|
||||||
# recommended
|
# recommended
|
||||||
self.__atom_author = None # {name*, uri, email}
|
self.__atom_author = None # {name*, uri, email}
|
||||||
|
@ -70,7 +70,7 @@ class FeedGenerator(object):
|
||||||
self.__rss_generator = 'python-feedgen'
|
self.__rss_generator = 'python-feedgen'
|
||||||
self.__rss_image = None
|
self.__rss_image = None
|
||||||
self.__rss_language = 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_managingEditor = None
|
||||||
self.__rss_pubDate = None
|
self.__rss_pubDate = None
|
||||||
self.__rss_rating = None
|
self.__rss_rating = None
|
||||||
|
@ -462,7 +462,7 @@ class FeedGenerator(object):
|
||||||
'''
|
'''
|
||||||
if updated is not None:
|
if updated is not None:
|
||||||
if isinstance(updated, string_types):
|
if isinstance(updated, string_types):
|
||||||
updated = dateutil.parser.parse(updated)
|
updated = dateutil_parser.parse(updated)
|
||||||
if not isinstance(updated, datetime):
|
if not isinstance(updated, datetime):
|
||||||
raise ValueError('Invalid datetime format')
|
raise ValueError('Invalid datetime format')
|
||||||
if updated.tzinfo is None:
|
if updated.tzinfo is None:
|
||||||
|
@ -887,7 +887,7 @@ class FeedGenerator(object):
|
||||||
'''
|
'''
|
||||||
if pubDate is not None:
|
if pubDate is not None:
|
||||||
if isinstance(pubDate, string_types):
|
if isinstance(pubDate, string_types):
|
||||||
pubDate = dateutil.parser.parse(pubDate)
|
pubDate = dateutil_parser.parse(pubDate)
|
||||||
if not isinstance(pubDate, datetime):
|
if not isinstance(pubDate, datetime):
|
||||||
raise ValueError('Invalid datetime format')
|
raise ValueError('Invalid datetime format')
|
||||||
if pubDate.tzinfo is None:
|
if pubDate.tzinfo is None:
|
||||||
|
|
Loading…
Reference in New Issue