Michael Manfre avatar Michael Manfre committed 0f8ddcf

Remove partial backport of timezone to support Django v1.3

Comments (0)

Files changed (2)

sqlserver_ado/operations.py

 from django.conf import settings
 from django.db.backends import BaseDatabaseOperations
 
-try:
-    from django.utils import timezone
-except ImportError:
-    # timezone added in Django 1.4, use provided partial backport
-    import timezone
+from django.utils import timezone
 
 class DatabaseOperations(BaseDatabaseOperations):
     compiler_module = "sqlserver_ado.compiler"

sqlserver_ado/timezone.py

-"""
-TZ helper functions backported from Django 1.4. This module should only 
-get loaded if django.utils.timezone doesn't exist.
-"""
-from datetime import timedelta, tzinfo
-
-try:
-    import pytz
-except ImportError:
-    pytz = None
-
-
-__all__ = [
-    'utc', 'is_aware'
-]
-
-# UTC and local time zones
-
-ZERO = timedelta(0)
-
-class UTC(tzinfo):
-    """
-    UTC implementation taken from Python's docs.
-
-    Used only when pytz isn't available.
-    """
-
-    def __repr__(self):
-        return "<UTC>"
-
-    def utcoffset(self, dt):
-        return ZERO
-
-    def tzname(self, dt):
-        return "UTC"
-
-    def dst(self, dt):
-        return ZERO
-
-utc = pytz.utc if pytz else UTC()
-"""UTC time zone as a tzinfo instance."""
-
-
-def is_aware(value):
-    """
-    Determines if a given datetime.datetime is aware.
-
-    The logic is described in Python's docs:
-    http://docs.python.org/library/datetime.html#datetime.tzinfo
-    """
-    return value.tzinfo is not None and value.tzinfo.utcoffset(value) is not None
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.