python/python-python-dateutil
SHA256
14
0
Fork 0
forked from pool/python-python-dateutil
Code Pull Requests Activity

Fix patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-dateutil?expand=0&rev=34
This commit is contained in:
Matej Cepl
2024-12-17 23:54:05 +00:00
committed by Git OBS Bridge
parent bd776a405a
commit b5b61e1617
1 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
remove-six.patch
View File

@@ -10,20 +10,20 @@
src/dateutil/parser/_parser.py | 15 ++++------ src/dateutil/parser/_parser.py | 15 ++++------
src/dateutil/parser/isoparser.py | 5 +-- src/dateutil/parser/isoparser.py | 5 +--
src/dateutil/relativedelta.py | 3 -- src/dateutil/relativedelta.py | 3 --
src/dateutil/rrule.py | 42 +++++++++++++----------------- src/dateutil/rrule.py | 43 +++++++++++++-----------------
src/dateutil/tz/_common.py | 15 ---------- src/dateutil/tz/_common.py | 15 ----------
src/dateutil/tz/_factories.py | 3 -- src/dateutil/tz/_factories.py | 4 --
src/dateutil/tz/tz.py | 18 ++++-------- src/dateutil/tz/tz.py | 19 ++++---------
src/dateutil/tz/win.py | 8 ++--- src/dateutil/tz/win.py | 8 ++---
src/python_dateutil.egg-info/requires.txt | 1 src/python_dateutil.egg-info/requires.txt | 1
tests/property/test_tz_prop.py | 6 ---- tests/property/test_tz_prop.py | 6 ----
tests/test_imports.py | 9 +----- tests/test_imports.py | 9 +-----
tests/test_isoparser.py | 17 ++---------- tests/test_isoparser.py | 17 ++---------
tests/test_parser.py | 14 ++-------- tests/test_parser.py | 14 ++-------
tests/test_rrule.py | 40 ---------------------------- tests/test_rrule.py | 40 ---------------------------
tests/test_tz.py | 6 ---- tests/test_tz.py | 6 ----
updatezinfo.py | 4 +- updatezinfo.py | 4 +-
24 files changed, 53 insertions(+), 166 deletions(-) 24 files changed, 56 insertions(+), 166 deletions(-)
--- a/.github/workflows/validate.yml --- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml
@@ -218,7 +218,12 @@
self.weekday = weekday self.weekday = weekday
--- a/src/dateutil/rrule.py --- a/src/dateutil/rrule.py
+++ b/src/dateutil/rrule.py +++ b/src/dateutil/rrule.py
@@ -15,10 +15,6 @@ from functools import wraps @@ -11,14 +11,11 @@ import heapq
import itertools
import re
import sys
+import _thread
from functools import wraps
# For warning about deprecation of until and count # For warning about deprecation of until and count
from warnings import warn from warnings import warn
@@ -229,7 +234,7 @@
from ._common import weekday as weekdaybase from ._common import weekday as weekdaybase
try: try:
@@ -134,7 +130,7 @@ class rrulebase(object): @@ -134,7 +131,7 @@ class rrulebase(object):
break break
try: try:
for j in range(10): for j in range(10):
@@ -238,7 +243,7 @@
except StopIteration: except StopIteration:
self._cache_gen = gen = None self._cache_gen = gen = None
self._cache_complete = True self._cache_complete = True
@@ -161,7 +157,7 @@ class rrulebase(object): @@ -161,7 +158,7 @@ class rrulebase(object):
gen = iter(self) gen = iter(self)
try: try:
for i in range(item+1): for i in range(item+1):
@@ -247,7 +252,7 @@
except StopIteration: except StopIteration:
raise IndexError raise IndexError
return res return res
@@ -479,14 +475,14 @@ class rrule(rrulebase): @@ -479,14 +476,14 @@ class rrule(rrulebase):
if wkst is None: if wkst is None:
self._wkst = calendar.firstweekday() self._wkst = calendar.firstweekday()
@@ -264,7 +269,7 @@
if bysetpos == 0 or not (-366 <= bysetpos <= 366): if bysetpos == 0 or not (-366 <= bysetpos <= 366):
raise ValueError("bysetpos must be between 1 and 366, " raise ValueError("bysetpos must be between 1 and 366, "
"or between -366 and -1") "or between -366 and -1")
@@ -520,7 +516,7 @@ class rrule(rrulebase): @@ -520,7 +517,7 @@ class rrule(rrulebase):
if bymonth is None: if bymonth is None:
self._bymonth = None self._bymonth = None
else: else:
@@ -273,7 +278,7 @@
bymonth = (bymonth,) bymonth = (bymonth,)
self._bymonth = tuple(sorted(set(bymonth))) self._bymonth = tuple(sorted(set(bymonth)))
@@ -532,7 +528,7 @@ class rrule(rrulebase): @@ -532,7 +529,7 @@ class rrule(rrulebase):
if byyearday is None: if byyearday is None:
self._byyearday = None self._byyearday = None
else: else:
@@ -282,7 +287,7 @@
byyearday = (byyearday,) byyearday = (byyearday,)
self._byyearday = tuple(sorted(set(byyearday))) self._byyearday = tuple(sorted(set(byyearday)))
@@ -542,7 +538,7 @@ class rrule(rrulebase): @@ -542,7 +539,7 @@ class rrule(rrulebase):
if byeaster is not None: if byeaster is not None:
if not easter: if not easter:
from dateutil import easter from dateutil import easter
@@ -291,7 +296,7 @@
self._byeaster = (byeaster,) self._byeaster = (byeaster,)
else: else:
self._byeaster = tuple(sorted(byeaster)) self._byeaster = tuple(sorted(byeaster))
@@ -556,7 +552,7 @@ class rrule(rrulebase): @@ -556,7 +553,7 @@ class rrule(rrulebase):
self._bymonthday = () self._bymonthday = ()
self._bynmonthday = () self._bynmonthday = ()
else: else:
@@ -300,7 +305,7 @@
bymonthday = (bymonthday,) bymonthday = (bymonthday,)
bymonthday = set(bymonthday) # Ensure it's unique bymonthday = set(bymonthday) # Ensure it's unique
@@ -573,7 +569,7 @@ class rrule(rrulebase): @@ -573,7 +570,7 @@ class rrule(rrulebase):
if byweekno is None: if byweekno is None:
self._byweekno = None self._byweekno = None
else: else:
@@ -309,7 +314,7 @@
byweekno = (byweekno,) byweekno = (byweekno,)
self._byweekno = tuple(sorted(set(byweekno))) self._byweekno = tuple(sorted(set(byweekno)))
@@ -588,13 +584,13 @@ class rrule(rrulebase): @@ -588,13 +585,13 @@ class rrule(rrulebase):
# If it's one of the valid non-sequence types, convert to a # If it's one of the valid non-sequence types, convert to a
# single-element sequence before the iterator that builds the # single-element sequence before the iterator that builds the
# byweekday set. # byweekday set.
@@ -325,7 +330,7 @@
self._byweekday.add(wday) self._byweekday.add(wday)
elif not wday.n or freq > MONTHLY: elif not wday.n or freq > MONTHLY:
self._byweekday.add(wday.weekday) self._byweekday.add(wday.weekday)
@@ -629,7 +625,7 @@ class rrule(rrulebase): @@ -629,7 +626,7 @@ class rrule(rrulebase):
else: else:
self._byhour = None self._byhour = None
else: else:
@@ -334,7 +339,7 @@
byhour = (byhour,) byhour = (byhour,)
if freq == HOURLY: if freq == HOURLY:
@@ -649,7 +645,7 @@ class rrule(rrulebase): @@ -649,7 +646,7 @@ class rrule(rrulebase):
else: else:
self._byminute = None self._byminute = None
else: else:
@@ -343,7 +348,7 @@
byminute = (byminute,) byminute = (byminute,)
if freq == MINUTELY: if freq == MINUTELY:
@@ -669,7 +665,7 @@ class rrule(rrulebase): @@ -669,7 +666,7 @@ class rrule(rrulebase):
else: else:
self._bysecond = None self._bysecond = None
else: else:
@@ -352,7 +357,7 @@
bysecond = (bysecond,) bysecond = (bysecond,)
self._bysecond = set(bysecond) self._bysecond = set(bysecond)
@@ -1062,7 +1058,7 @@ class rrule(rrulebase): @@ -1062,7 +1059,7 @@ class rrule(rrulebase):
cset = set() cset = set()
# Support a single byxxx value. # Support a single byxxx value.
@@ -361,7 +366,7 @@
byxxx = (byxxx, ) byxxx = (byxxx, )
for num in byxxx: for num in byxxx:
@@ -1315,7 +1311,7 @@ class rruleset(rrulebase): @@ -1315,7 +1312,7 @@ class rruleset(rrulebase):
class _genitem(object): class _genitem(object):
def __init__(self, genlist, gen): def __init__(self, genlist, gen):
try: try:
@@ -370,7 +375,7 @@
genlist.append(self) genlist.append(self)
except StopIteration: except StopIteration:
pass pass
@@ -1324,7 +1320,7 @@ class rruleset(rrulebase): @@ -1324,7 +1321,7 @@ class rruleset(rrulebase):
def __next__(self): def __next__(self):
try: try:
@@ -379,7 +384,7 @@
except StopIteration: except StopIteration:
if self.genlist[0] is self: if self.genlist[0] is self:
heapq.heappop(self.genlist) heapq.heappop(self.genlist)
@@ -1400,14 +1396,14 @@ class rruleset(rrulebase): @@ -1400,14 +1397,14 @@ class rruleset(rrulebase):
if not lastdt or lastdt != ritem.dt: if not lastdt or lastdt != ritem.dt:
while exlist and exlist[0] < ritem: while exlist and exlist[0] < ritem:
exitem = exlist[0] exitem = exlist[0]
@@ -426,7 +431,9 @@
# The following is adapted from Alexander Belopolsky's tz library # The following is adapted from Alexander Belopolsky's tz library
--- a/src/dateutil/tz/_factories.py --- a/src/dateutil/tz/_factories.py
+++ b/src/dateutil/tz/_factories.py +++ b/src/dateutil/tz/_factories.py
@@ -2,9 +2,6 @@ from datetime import timedelta @@ -1,10 +1,8 @@
from datetime import timedelta
+import _thread
import weakref import weakref
from collections import OrderedDict from collections import OrderedDict
@@ -438,7 +445,11 @@
cls.__instance = None cls.__instance = None
--- a/src/dateutil/tz/tz.py --- a/src/dateutil/tz/tz.py
+++ b/src/dateutil/tz/tz.py +++ b/src/dateutil/tz/tz.py
@@ -16,9 +16,6 @@ import bisect @@ -13,12 +13,10 @@ import time
import sys
import os
import bisect
+import _thread
import weakref import weakref
from collections import OrderedDict from collections import OrderedDict
@@ -448,7 +459,7 @@
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
@@ -38,8 +35,7 @@ EPOCH = datetime.datetime(1970, 1, 1, 0, @@ -38,8 +36,7 @@ EPOCH = datetime.datetime(1970, 1, 1, 0,
EPOCHORDINAL = EPOCH.toordinal() EPOCHORDINAL = EPOCH.toordinal()
@@ -458,7 +469,7 @@
""" """
This is a tzinfo object that represents the UTC time zone. This is a tzinfo object that represents the UTC time zone.
@@ -129,8 +125,7 @@ class tzutc(datetime.tzinfo): @@ -129,8 +126,7 @@ class tzutc(datetime.tzinfo):
UTC = tzutc() UTC = tzutc()
@@ -468,7 +479,7 @@
""" """
A simple class for representing a fixed offset from UTC. A simple class for representing a fixed offset from UTC.
@@ -459,7 +454,7 @@ class tzfile(_tzinfo): @@ -459,7 +455,7 @@ class tzfile(_tzinfo):
super(tzfile, self).__init__() super(tzfile, self).__init__()
file_opened_here = False file_opened_here = False
@@ -477,7 +488,7 @@
self._filename = fileobj self._filename = fileobj
fileobj = open(fileobj, 'rb') fileobj = open(fileobj, 'rb')
file_opened_here = True file_opened_here = True
@@ -1033,8 +1028,7 @@ class tzrange(tzrangebase): @@ -1033,8 +1029,7 @@ class tzrange(tzrangebase):
return self._dst_base_offset_ return self._dst_base_offset_
@@ -487,7 +498,7 @@
""" """
``tzstr`` objects are time zone objects specified by a time-zone string as ``tzstr`` objects are time zone objects specified by a time-zone string as
it would be passed to a ``TZ`` variable on POSIX-style systems (see it would be passed to a ``TZ`` variable on POSIX-style systems (see
@@ -1265,7 +1259,7 @@ class tzical(object): @@ -1265,7 +1260,7 @@ class tzical(object):
global rrule global rrule
from dateutil import rrule from dateutil import rrule
@@ -496,7 +507,7 @@
self._s = fileobj self._s = fileobj
# ical should be encoded in UTF-8 with CRLF # ical should be encoded in UTF-8 with CRLF
fileobj = open(fileobj, 'r') fileobj = open(fileobj, 'r')
@@ -1621,7 +1615,7 @@ def __get_gettz(): @@ -1621,7 +1616,7 @@ def __get_gettz():
except TypeError as e: except TypeError as e:
if isinstance(name, bytes): if isinstance(name, bytes):
new_msg = "gettz argument should be str, not bytes" new_msg = "gettz argument should be str, not bytes"