[pypy-svn] r54856 - in pypy/django/django: core/management/commands db/backends/sqlite3 db/models

[fijal at codespeak.net]

Author: fijal
Date: Sat May 17 18:06:02 2008
New Revision: 54856

Modified:
   pypy/django/django/core/management/commands/syncdb.py
   pypy/django/django/db/backends/sqlite3/base.py
   pypy/django/django/db/models/base.py
   pypy/django/django/db/models/options.py
Log:
(pedronis, fijal)
* Fix places where djange used details of oldstyle classes
* Import pysqlite2 by default


Modified: pypy/django/django/core/management/commands/syncdb.py
==============================================================================
--- pypy/django/django/core/management/commands/syncdb.py	(original)
+++ pypy/django/django/core/management/commands/syncdb.py	Sat May 17 18:06:02 2008
@@ -34,7 +34,8 @@
             try:
                 __import__(app_name + '.management', {}, {}, [''])
             except ImportError, exc:
-                if not exc.args[0].startswith('No module named management'):
+                if 'management' not in exc.args[0]:
+                #if not exc.args[0].startswith('No module named management'):
                     raise
 
         cursor = connection.cursor()

Modified: pypy/django/django/db/backends/sqlite3/base.py
==============================================================================
--- pypy/django/django/db/backends/sqlite3/base.py	(original)
+++ pypy/django/django/db/backends/sqlite3/base.py	Sat May 17 18:06:02 2008
@@ -8,10 +8,10 @@
 
 from django.db.backends import BaseDatabaseWrapper, BaseDatabaseFeatures, BaseDatabaseOperations, util
 try:
-    try:
-        from sqlite3 import dbapi2 as Database
-    except ImportError:
-        from pysqlite2 import dbapi2 as Database
+    #try:
+    #    from sqlite3 import dbapi2 as Database
+    #except ImportError:
+    from pysqlite2 import dbapi2 as Database
 except ImportError, e:
     import sys
     from django.core.exceptions import ImproperlyConfigured

Modified: pypy/django/django/db/models/base.py
==============================================================================
--- pypy/django/django/db/models/base.py	(original)
+++ pypy/django/django/db/models/base.py	Sat May 17 18:06:02 2008
@@ -135,7 +135,7 @@
 
     def add_to_class(cls, name, value):
         if name == 'Admin':
-            assert type(value) == types.ClassType, "%r attribute of %s model must be a class, not a %s object" % (name, cls.__name__, type(value))
+            assert type(value) in (types.ClassType, type), "%r attribute of %s model must be a class, not a %s object" % (name, cls.__name__, type(value))
             value = AdminOptions(**dict([(k, v) for k, v in value.__dict__.items() if not k.startswith('_')]))
         if hasattr(value, 'contribute_to_class'):
             value.contribute_to_class(cls, name)

Modified: pypy/django/django/db/models/options.py
==============================================================================
--- pypy/django/django/db/models/options.py	(original)
+++ pypy/django/django/db/models/options.py	Sat May 17 18:06:02 2008
@@ -58,6 +58,9 @@
             meta_attrs = self.meta.__dict__.copy()
             del meta_attrs['__module__']
             del meta_attrs['__doc__']
+            for name in ['__dict__', '__weakref__']:
+                if name in meta_attrs:
+                    del meta_attrs[name]
             for attr_name in DEFAULT_NAMES:
                 if attr_name in meta_attrs:
                     setattr(self, attr_name, meta_attrs.pop(attr_name))