Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed test failures with Oracle when pytz isn't installed.

Thanks Shai Berger for the report.
  • Loading branch information...
commit 181f2ec603dd01d3c38ff1a57849d5ed1642a4ff 1 parent 761bbbb
@aaugustin aaugustin authored
Showing with 6 additions and 0 deletions.
  1. +6 −0 django/db/backends/oracle/base.py
View
6 django/db/backends/oracle/base.py
@@ -44,6 +44,11 @@ def _setup_environment(environ):
from django.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured("Error loading cx_Oracle module: %s" % e)
+try:
+ import pytz
+except ImportError:
+ pytz = None
+
from django.db import utils
from django.db.backends import *
from django.db.backends.oracle.client import DatabaseClient
@@ -77,6 +82,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
supports_subqueries_in_group_by = False
supports_transactions = True
supports_timezones = False
+ has_zoneinfo_database = pytz is not None
supports_bitwise_or = False
can_defer_constraint_checks = True
ignores_nulls_in_unique_constraints = False
Please sign in to comment.
Something went wrong with that request. Please try again.