Skip to content

Commit

Permalink
Apply darker suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
pquentin committed Mar 1, 2024
1 parent 5009000 commit 0cbe118
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 72 deletions.
6 changes: 4 additions & 2 deletions docs/conf.py
Expand Up @@ -13,8 +13,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys
import os
import sys

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down Expand Up @@ -188,9 +188,11 @@

# -- Options for autodoc -------------------------------------------------

autodoc_mock_imports = ['ctypes.wintypes']
autodoc_mock_imports = ["ctypes.wintypes"]

# Need to mock this out specifically to avoid errors


import ctypes
def pointer_mock(*args, **kwargs):
try:
Expand Down
2 changes: 1 addition & 1 deletion src/dateutil/parser/_parser.py
Expand Up @@ -872,7 +872,7 @@ def _parse_numeric_token(self, tokens, idx, info, ymd, res, fuzzy):
try:
value = self._to_decimal(value_repr)
except Exception as e:
raise ValueError('Unknown numeric token') from e
raise ValueError("Unknown numeric token") from e

len_li = len(value_repr)

Expand Down
2 changes: 1 addition & 1 deletion src/dateutil/rrule.py
Expand Up @@ -5,6 +5,7 @@
`iCalendar RFC <https://tools.ietf.org/html/rfc5545>`_,
including support for caching of results.
"""
import _thread
import calendar
import datetime
import heapq
Expand All @@ -14,7 +15,6 @@
from functools import wraps
# For warning about deprecation of until and count
from warnings import warn
import _thread

from ._common import weekday as weekdaybase

Expand Down
2 changes: 1 addition & 1 deletion src/dateutil/tz/_common.py
Expand Up @@ -5,7 +5,7 @@

ZERO = timedelta(0)

__all__ = ['enfold']
__all__ = ["enfold"]


# The following is adapted from Alexander Belopolsky's tz library
Expand Down
4 changes: 2 additions & 2 deletions src/dateutil/tz/_factories.py
@@ -1,7 +1,7 @@
from datetime import timedelta
import _thread
import weakref
from collections import OrderedDict
import _thread
from datetime import timedelta


class _TzSingleton(type):
Expand Down
17 changes: 7 additions & 10 deletions src/dateutil/tz/tz.py
Expand Up @@ -7,22 +7,19 @@
from relative deltas), local machine timezone, fixed offset timezone, and UTC
timezone.
"""
import _thread
import bisect
import datetime
import os
import struct
import time
import sys
import os
import bisect
import time
import weakref
from collections import OrderedDict
import _thread

from ._common import _tzinfo
from ._common import tzrangebase, enfold
from ._common import _validate_fromutc_inputs
from ._common import _tzinfo, _validate_fromutc_inputs, enfold, tzrangebase
from ._factories import _TzOffsetFactory, _TzSingleton, _TzStrFactory

from ._factories import _TzSingleton, _TzOffsetFactory
from ._factories import _TzStrFactory
try:
from .win import tzwin, tzwinlocal
except ImportError:
Expand Down Expand Up @@ -1636,7 +1633,7 @@ def nocache(name=None):
if tzwin is not None:
try:
tz = tzwin(name)
except (WindowsError):
except WindowsError:
tz = None

if not tz:
Expand Down
5 changes: 3 additions & 2 deletions src/dateutil/tz/win.py
Expand Up @@ -280,8 +280,9 @@ def __init__(self):
self._dst_abbr = keydict["DaylightName"]

try:
tzkeyname = str('{kn}\\{sn}').format(kn=TZKEYNAME,
sn=self._std_abbr)
tzkeyname = "'{kn}\\{sn}'".format(
kn=TZKEYNAME, sn=self._std_abbr
)
with winreg.OpenKey(handle, tzkeyname) as tzkey:
_keydict = valuestodict(tzkey)
self._display = _keydict["Display"]
Expand Down
64 changes: 31 additions & 33 deletions tests/test_imports.py
@@ -1,5 +1,6 @@
import sys
import unittest

import pytest

MODULE_TYPE = type(sys)
Expand Down Expand Up @@ -45,7 +46,9 @@ def clean_import():
def test_lazy_import(clean_import, module):
"""Test that dateutil.[submodule] works for py version > 3.7"""

import dateutil, importlib
import importlib

import dateutil

if sys.version_info < (3, 7):
pytest.xfail("Lazy loading does not work for Python < 3.7")
Expand Down Expand Up @@ -93,12 +96,8 @@ def test_import_parser_from():


def test_import_parser_all():
# All interface
from dateutil.parser import parse
from dateutil.parser import parserinfo

# Other public classes
from dateutil.parser import parser
# Interfaces and public classes
from dateutil.parser import parse, parser, parserinfo

for var in (parse, parserinfo, parser):
assert var is not None
Expand All @@ -114,7 +113,8 @@ def test_import_relative_delta_from():

def test_import_relative_delta_all():
from dateutil.relativedelta import relativedelta
from dateutil.relativedelta import MO, TU, WE, TH, FR, SA, SU

from dateutil.relativedelta import MO, TU, WE, TH, FR, SA, SU # isort:skip

for var in (relativedelta, MO, TU, WE, TH, FR, SA, SU):
assert var is not None
Expand All @@ -134,12 +134,11 @@ def test_import_rrule_from():


def test_import_rrule_all():
from dateutil.rrule import rrule
from dateutil.rrule import rruleset
from dateutil.rrule import rrulestr
from dateutil.rrule import YEARLY, MONTHLY, WEEKLY, DAILY
from dateutil.rrule import HOURLY, MINUTELY, SECONDLY
from dateutil.rrule import MO, TU, WE, TH, FR, SA, SU
from dateutil.rrule import rrule, rruleset, rrulestr

from dateutil.rrule import YEARLY, MONTHLY, WEEKLY, DAILY # isort:skip
from dateutil.rrule import HOURLY, MINUTELY, SECONDLY # isort:skip
from dateutil.rrule import MO, TU, WE, TH, FR, SA, SU # isort:skip

rr_all = (rrule, rruleset, rrulestr,
YEARLY, MONTHLY, WEEKLY, DAILY,
Expand All @@ -164,20 +163,22 @@ def test_import_tz_from():


def test_import_tz_all():
from dateutil.tz import tzutc
from dateutil.tz import tzoffset
from dateutil.tz import tzlocal
from dateutil.tz import tzfile
from dateutil.tz import tzrange
from dateutil.tz import tzstr
from dateutil.tz import tzical
from dateutil.tz import gettz
from dateutil.tz import tzwin
from dateutil.tz import tzwinlocal
from dateutil.tz import UTC
from dateutil.tz import datetime_ambiguous
from dateutil.tz import datetime_exists
from dateutil.tz import resolve_imaginary
from dateutil.tz import (
UTC,
datetime_ambiguous,
datetime_exists,
gettz,
resolve_imaginary,
tzfile,
tzical,
tzlocal,
tzoffset,
tzrange,
tzstr,
tzutc,
tzwin,
tzwinlocal,
)

tz_all = ["tzutc", "tzoffset", "tzlocal", "tzfile", "tzrange",
"tzstr", "tzical", "gettz", "datetime_ambiguous",
Expand All @@ -202,8 +203,7 @@ def test_import_tz_windows_from():

@pytest.mark.skipif(not HOST_IS_WINDOWS, reason="Requires Windows")
def test_import_tz_windows_star():
from dateutil.tzwin import tzwin
from dateutil.tzwin import tzwinlocal
from dateutil.tzwin import tzwin, tzwinlocal

tzwin_all = [tzwin, tzwinlocal]

Expand All @@ -221,9 +221,7 @@ def test_import_zone_info_from():


def test_import_zone_info_star():
from dateutil.zoneinfo import gettz
from dateutil.zoneinfo import gettz_db_metadata
from dateutil.zoneinfo import rebuild
from dateutil.zoneinfo import gettz, gettz_db_metadata, rebuild

zi_all = (gettz, gettz_db_metadata, rebuild)

Expand Down
52 changes: 35 additions & 17 deletions tests/test_parser.py
@@ -1,22 +1,25 @@
# -*- coding: utf-8 -*-

import itertools
from datetime import datetime, timedelta
import unittest
import sys
import unittest
from datetime import datetime, timedelta
from io import StringIO

import pytest

from dateutil import tz
from dateutil.parser import (
ParserError,
UnknownTimezoneWarning,
parse,
parserinfo,
)

from dateutil.tz import tzoffset
from dateutil.parser import parse, parserinfo
from dateutil.parser import ParserError
from dateutil.parser import UnknownTimezoneWarning

from ._common import TZEnvContext

from io import StringIO

import pytest

# Platform info
IS_WIN = sys.platform.startswith('win')

Expand Down Expand Up @@ -558,12 +561,27 @@ def testErrorType01(self):
parse('shouldfail')

def testCorrectErrorOnFuzzyWithTokens(self):
self.assertRaisesRegex(ParserError, 'Unknown string format',
parse, '04/04/32/423', fuzzy_with_tokens=True)
self.assertRaisesRegex(ParserError, 'Unknown string format',
parse, '04/04/04 +32423', fuzzy_with_tokens=True)
self.assertRaisesRegex(ParserError, 'Unknown string format',
parse, '04/04/0d4', fuzzy_with_tokens=True)
self.assertRaisesRegex(
ParserError,
"Unknown string format",
parse,
"04/04/32/423",
fuzzy_with_tokens=True,
)
self.assertRaisesRegex(
ParserError,
"Unknown string format",
parse,
"04/04/04 +32423",
fuzzy_with_tokens=True,
)
self.assertRaisesRegex(
ParserError,
"Unknown string format",
parse,
"04/04/0d4",
fuzzy_with_tokens=True,
)

def testIncreasingCTime(self):
# This test will check 200 different years, every month, every day,
Expand Down Expand Up @@ -602,7 +620,7 @@ def testMicrosecondPrecisionErrorReturns(self):

def testCustomParserInfo(self):
# Custom parser info wasn't working, as Michael Elsdörfer discovered.
from dateutil.parser import parserinfo, parser
from dateutil.parser import parser, parserinfo

class myparserinfo(parserinfo):
MONTHS = parserinfo.MONTHS[:]
Expand All @@ -615,7 +633,7 @@ def testCustomParserShortDaynames(self):
# Horacio Hoyos discovered that day names shorter than 3 characters,
# for example two letter German day name abbreviations, don't work:
# https://github.com/dateutil/dateutil/issues/343
from dateutil.parser import parserinfo, parser
from dateutil.parser import parser, parserinfo

class GermanParserInfo(parserinfo):
WEEKDAYS = [("Mo", "Montag"),
Expand Down
6 changes: 3 additions & 3 deletions updatezinfo.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python
import os
import hashlib
import json
import io
from urllib import request
import json
import os
from urllib import error as urllib_error
from urllib import request

try:
import dateutil
Expand Down

0 comments on commit 0cbe118

Please sign in to comment.