p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(Re-)moved some imports

This commit is contained in:
Claude Paroz 2013-05-21 17:34:08 +02:00
parent 61a8de6f4f
commit d595b61aca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/contenttypes/models.py
View File

@ -155,7 +155,6 @@ class ContentType(models.Model):
def model_class(self): def model_class(self):
"Returns the Python model class for this type of content." "Returns the Python model class for this type of content."
from django.db import models
return models.get_model(self.app_label, self.model, return models.get_model(self.app_label, self.model,
only_installed=False) only_installed=False)

3
django/db/backends/oracle/creation.py
View File

@ -1,5 +1,7 @@
import sys import sys
import time import time
from django.conf import settings
from django.db.backends.creation import BaseDatabaseCreation from django.db.backends.creation import BaseDatabaseCreation
from django.utils.six.moves import input from django.utils.six.moves import input
@ -105,7 +107,6 @@ class DatabaseCreation(BaseDatabaseCreation):
print("Tests cancelled.") print("Tests cancelled.")
sys.exit(1) sys.exit(1)
from django.db import settings
real_settings = settings.DATABASES[self.connection.alias] 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_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'] real_settings['SAVED_PASSWORD'] = self.connection.settings_dict['SAVED_PASSWORD'] = self.connection.settings_dict['PASSWORD']