summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-05-21 17:34:08 +0200
committerClaude Paroz <claude@2xlibre.net>2013-05-21 17:34:19 +0200
commitd595b61acae91e6111ec26cb0a4a1b1a9f4eb0d5 (patch)
tree02784ea1c9454097956b16c5fee3ae98f6d724b3 /django
parent61a8de6f4f547518d217a5ff959cbd57bddf4bb0 (diff)
(Re-)moved some imports
Diffstat (limited to 'django')
-rw-r--r--django/contrib/contenttypes/models.py1
-rw-r--r--django/db/backends/oracle/creation.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
index ce220c8487..34d54441fe 100644
--- a/django/contrib/contenttypes/models.py
+++ b/django/contrib/contenttypes/models.py
@@ -155,7 +155,6 @@ class ContentType(models.Model):
def model_class(self):
"Returns the Python model class for this type of content."
- from django.db import models
return models.get_model(self.app_label, self.model,
only_installed=False)
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
index 5485830bf5..c7808e4849 100644
--- a/django/db/backends/oracle/creation.py
+++ b/django/db/backends/oracle/creation.py
@@ -1,5 +1,7 @@
import sys
import time
+
+from django.conf import settings
from django.db.backends.creation import BaseDatabaseCreation
from django.utils.six.moves import input
@@ -105,7 +107,6 @@ class DatabaseCreation(BaseDatabaseCreation):
print("Tests cancelled.")
sys.exit(1)
- from django.db import settings
real_settings = settings.DATABASES[self.connection.alias]
real_settings['SAVED_USER'] = self.connection.settings_dict['SAVED_USER'] = self.connection.settings_dict['USER']
real_settings['SAVED_PASSWORD'] = self.connection.settings_dict['SAVED_PASSWORD'] = self.connection.settings_dict['PASSWORD']