测试gitnore

venv/Lib/site-packages/django/utils/timezone.py

@@ -3,53 +3,39 @@ Timezone-related classes and functions.
 """
 
 import functools
-import sys
-import warnings
-
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-
 from contextlib import ContextDecorator
 from datetime import datetime, timedelta, timezone, tzinfo
 
+import pytz
 from asgiref.local import Local
 
 from django.conf import settings
-from django.utils.deprecation import RemovedInDjango50Warning
 
 __all__ = [
-    "utc",
-    "get_fixed_timezone",
-    "get_default_timezone",
-    "get_default_timezone_name",
-    "get_current_timezone",
-    "get_current_timezone_name",
-    "activate",
-    "deactivate",
-    "override",
-    "localtime",
-    "now",
-    "is_aware",
-    "is_naive",
-    "make_aware",
-    "make_naive",
+    'utc', 'get_fixed_timezone',
+    'get_default_timezone', 'get_default_timezone_name',
+    'get_current_timezone', 'get_current_timezone_name',
+    'activate', 'deactivate', 'override',
+    'localtime', 'now',
+    'is_aware', 'is_naive', 'make_aware', 'make_naive',
 ]
 
-# RemovedInDjango50Warning: sentinel for deprecation of is_dst parameters.
-NOT_PASSED = object()
 
+# UTC time zone as a tzinfo instance.
+utc = pytz.utc
 
-utc = timezone.utc
+_PYTZ_BASE_CLASSES = (pytz.tzinfo.BaseTzInfo, pytz._FixedOffset)
+# In releases prior to 2018.4, pytz.UTC was not a subclass of BaseTzInfo
+if not isinstance(pytz.UTC, pytz._FixedOffset):
+    _PYTZ_BASE_CLASSES = _PYTZ_BASE_CLASSES + (type(pytz.UTC),)
 
 
 def get_fixed_timezone(offset):
     """Return a tzinfo instance with a fixed offset from UTC."""
     if isinstance(offset, timedelta):
         offset = offset.total_seconds() // 60
-    sign = "-" if offset < 0 else "+"
-    hhmm = "%02d%02d" % divmod(abs(offset), 60)
+    sign = '-' if offset < 0 else '+'
+    hhmm = '%02d%02d' % divmod(abs(offset), 60)
     name = sign + hhmm
     return timezone(timedelta(minutes=offset), name)
 
@@ -63,11 +49,7 @@ def get_default_timezone():
 
     This is the time zone defined by settings.TIME_ZONE.
     """
-    if settings.USE_DEPRECATED_PYTZ:
-        import pytz
-
-        return pytz.timezone(settings.TIME_ZONE)
-    return zoneinfo.ZoneInfo(settings.TIME_ZONE)
+    return pytz.timezone(settings.TIME_ZONE)
 
 
 # This function exists for consistency with get_current_timezone_name
@@ -90,12 +72,8 @@ def get_current_timezone_name():
 
 
 def _get_timezone_name(timezone):
-    """
-    Return the offset for fixed offset timezones, or the name of timezone if
-    not set.
-    """
-    return timezone.tzname(None) or str(timezone)
-
+    """Return the name of ``timezone``."""
+    return str(timezone)
 
 # Timezone selection functions.
 
@@ -113,12 +91,7 @@ def activate(timezone):
     if isinstance(timezone, tzinfo):
         _active.value = timezone
     elif isinstance(timezone, str):
-        if settings.USE_DEPRECATED_PYTZ:
-            import pytz
-
-            _active.value = pytz.timezone(timezone)
-        else:
-            _active.value = zoneinfo.ZoneInfo(timezone)
+        _active.value = pytz.timezone(timezone)
     else:
         raise ValueError("Invalid timezone: %r" % timezone)
 
@@ -145,12 +118,11 @@ class override(ContextDecorator):
     time zone name, or ``None``. If it is ``None``, Django enables the default
     time zone.
     """
-
     def __init__(self, timezone):
         self.timezone = timezone
 
     def __enter__(self):
-        self.old_timezone = getattr(_active, "value", None)
+        self.old_timezone = getattr(_active, 'value', None)
         if self.timezone is None:
             deactivate()
         else:
@@ -165,7 +137,6 @@ class override(ContextDecorator):
 
 # Templates
 
-
 def template_localtime(value, use_tz=None):
     """
     Check if value is a datetime and converts it to local time if necessary.
@@ -176,17 +147,16 @@ def template_localtime(value, use_tz=None):
     This function is designed for use by the template engine.
     """
     should_convert = (
-        isinstance(value, datetime)
-        and (settings.USE_TZ if use_tz is None else use_tz)
-        and not is_naive(value)
-        and getattr(value, "convert_to_local_time", True)
+        isinstance(value, datetime) and
+        (settings.USE_TZ if use_tz is None else use_tz) and
+        not is_naive(value) and
+        getattr(value, 'convert_to_local_time', True)
     )
     return localtime(value) if should_convert else value
 
 
 # Utilities
 
-
 def localtime(value=None, timezone=None):
     """
     Convert an aware datetime.datetime to local time.
@@ -224,13 +194,16 @@ def now():
     """
     Return an aware or naive datetime.datetime, depending on settings.USE_TZ.
     """
-    return datetime.now(tz=utc if settings.USE_TZ else None)
+    if settings.USE_TZ:
+        # timeit shows that datetime.now(tz=utc) is 24% slower
+        return datetime.utcnow().replace(tzinfo=utc)
+    else:
+        return datetime.now()
 
 
 # By design, these four functions don't perform any checks on their arguments.
 # The caller should ensure that they don't receive an invalid value like None.
 
-
 def is_aware(value):
     """
     Determine if a given datetime.datetime is aware.
@@ -257,17 +230,8 @@ def is_naive(value):
     return value.utcoffset() is None
 
 
-def make_aware(value, timezone=None, is_dst=NOT_PASSED):
+def make_aware(value, timezone=None, is_dst=None):
     """Make a naive datetime.datetime in a given time zone aware."""
-    if is_dst is NOT_PASSED:
-        is_dst = None
-    else:
-        warnings.warn(
-            "The is_dst argument to make_aware(), used by the Trunc() "
-            "database functions and QuerySet.datetimes(), is deprecated as it "
-            "has no effect with zoneinfo time zones.",
-            RemovedInDjango50Warning,
-        )
     if timezone is None:
         timezone = get_current_timezone()
     if _is_pytz_zone(timezone):
@@ -276,7 +240,8 @@ def make_aware(value, timezone=None, is_dst=NOT_PASSED):
     else:
         # Check that we won't overwrite the timezone of an aware datetime.
         if is_aware(value):
-            raise ValueError("make_aware expects a naive datetime, got %s" % value)
+            raise ValueError(
+                "make_aware expects a naive datetime, got %s" % value)
         # This may be wrong around DST changes!
         return value.replace(tzinfo=timezone)
 
@@ -291,46 +256,13 @@ def make_naive(value, timezone=None):
     return value.astimezone(timezone).replace(tzinfo=None)
 
 
-_PYTZ_IMPORTED = False
-
-
-def _pytz_imported():
-    """
-    Detects whether or not pytz has been imported without importing pytz.
-
-    Copied from pytz_deprecation_shim with thanks to Paul Ganssle.
-    """
-    global _PYTZ_IMPORTED
-
-    if not _PYTZ_IMPORTED and "pytz" in sys.modules:
-        _PYTZ_IMPORTED = True
-
-    return _PYTZ_IMPORTED
-
-
 def _is_pytz_zone(tz):
     """Checks if a zone is a pytz zone."""
-    # See if pytz was already imported rather than checking
-    # settings.USE_DEPRECATED_PYTZ to *allow* manually passing a pytz timezone,
-    # which some of the test cases (at least) rely on.
-    if not _pytz_imported():
-        return False
-
-    # If tz could be pytz, then pytz is needed here.
-    import pytz
-
-    _PYTZ_BASE_CLASSES = (pytz.tzinfo.BaseTzInfo, pytz._FixedOffset)
-    # In releases prior to 2018.4, pytz.UTC was not a subclass of BaseTzInfo
-    if not isinstance(pytz.UTC, pytz._FixedOffset):
-        _PYTZ_BASE_CLASSES = _PYTZ_BASE_CLASSES + (type(pytz.UTC),)
-
     return isinstance(tz, _PYTZ_BASE_CLASSES)
 
 
 def _datetime_ambiguous_or_imaginary(dt, tz):
     if _is_pytz_zone(tz):
-        import pytz
-
         try:
             tz.utcoffset(dt)
         except (pytz.AmbiguousTimeError, pytz.NonExistentTimeError):