prepared it to work with django 1.4

peterbe · Aug 11, 2012 · 62b999a · 62b999a
1 parent 9b0d248
commit 62b999a
Show file tree

Hide file tree

Showing 36 changed files with 298 additions and 350 deletions.
diff --git a/django_mongokit/mongodb/base.py b/django_mongokit/mongodb/base.py
@@ -130,17 +130,17 @@ def _drop_database(self, database_name):
             self.connection.connection.drop_database(database_name)
 
 
-
-
 class DatabaseWrapper(BaseDatabaseWrapper):
     operators = {}
     _commit = ignore
     _rollback = ignore
 
-    autocommit = None # ignore
+    autocommit = None  # ignore
 
-    def __init__(self, settings_dict, alias=None, # alias was added in Django 1.2
+    def __init__(self, settings_dict, alias=None,  # alias was added in Django 1.2
                  *args, **kwargs):
+        super(DatabaseWrapper, self).__init__(settings_dict, alias=alias, *args, **kwargs)
+
         if settings_dict['HOST']:
             kwargs['host'] = settings_dict['HOST']
         if settings_dict['PORT']:

diff --git a/django_mongokit/test_settings.py b/django_mongokit/test_settings.py
@@ -14,16 +14,16 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'example-sqlite3.db',    # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    },             
+    },
     'mongodb': {
-        'ENGINE': 'django_mongokit.mongodb', 
-        'NAME': 'example', 
+        'ENGINE': 'django_mongokit.mongodb',
+        'NAME': 'example',
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
@@ -99,4 +99,3 @@
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
 )
-
diff --git a/django_mongokit/version.txt b/django_mongokit/version.txt
@@ -1 +1 @@
-0.2.2
+0.2.3
diff --git a/exampleproject/manage.py b/exampleproject/manage.py
diff --git a/exampleproject/settings.py b/exampleproject/settings.py
diff --git a/exampleproject/settings_django11.py b/exampleproject/settings_django11.py
diff --git a/exampleproject/test_runner.py b/exampleproject/test_runner.py
diff --git a/exampleproject/test_settings.py b/exampleproject/test_settings.py
diff --git a/exampleproject/urls.py b/exampleproject/urls.py
diff --git a/exampleproject/__init__.py → exampleproject2/exampleproject/__init__.py b/exampleproject/__init__.py → exampleproject2/exampleproject/__init__.py
diff --git a/exampleproject/benchmarker/__init__.py → ...t2/exampleproject/benchmarker/__init__.py b/exampleproject/benchmarker/__init__.py → ...t2/exampleproject/benchmarker/__init__.py
diff --git a/exampleproject/benchmarker/models.py → ...ect2/exampleproject/benchmarker/models.py b/exampleproject/benchmarker/models.py → ...ect2/exampleproject/benchmarker/models.py
diff --git a/exampleproject/benchmarker/tests.py → ...ject2/exampleproject/benchmarker/tests.py b/exampleproject/benchmarker/tests.py → ...ject2/exampleproject/benchmarker/tests.py
diff --git a/exampleproject/benchmarker/urls.py → ...oject2/exampleproject/benchmarker/urls.py b/exampleproject/benchmarker/urls.py → ...oject2/exampleproject/benchmarker/urls.py