Author: brosner
Date: 2008-07-18 18:01:28 -0500 (Fri, 18 Jul 2008)
New Revision: 7960
Modified:
django/branches/newforms-admin/
django/branches/newforms-admin/django/db/backends/sqlite3/base.py
django/branches/newforms-admin/django/db/models/base.py
django/branches/newforms-admin/django/newforms/fields.py
Log:
newforms-admin: Merged from trunk up to [7956].
Property changes on: django/branches/newforms-admin
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7953
+
/django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7959
Modified: django/branches/newforms-admin/django/db/backends/sqlite3/base.py
===================================================================
--- django/branches/newforms-admin/django/db/backends/sqlite3/base.py
2008-07-18 22:55:31 UTC (rev 7959)
+++ django/branches/newforms-admin/django/db/backends/sqlite3/base.py
2008-07-18 23:01:28 UTC (rev 7960)
@@ -110,6 +110,9 @@
def _cursor(self, settings):
if self.connection is None:
+ if not settings.DATABASE_NAME:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Please fill out DATABASE_NAME in
the settings module before using the database."
kwargs = {
'database': settings.DATABASE_NAME,
'detect_types': Database.PARSE_DECLTYPES |
Database.PARSE_COLNAMES,
Modified: django/branches/newforms-admin/django/db/models/base.py
===================================================================
--- django/branches/newforms-admin/django/db/models/base.py 2008-07-18
22:55:31 UTC (rev 7959)
+++ django/branches/newforms-admin/django/db/models/base.py 2008-07-18
23:01:28 UTC (rev 7960)
@@ -484,9 +484,7 @@
if isinstance(raw_field, dict):
import warnings
warnings.warn(
- message = "Representing uploaded files as dictionaries is"\
- " deprecated. Use
django.core.files.SimpleUploadedFile"\
- " instead.",
+ message = "Representing uploaded files as dictionaries is
deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.",
category = DeprecationWarning,
stacklevel = 2
)
@@ -496,9 +494,7 @@
elif isinstance(raw_field, basestring):
import warnings
warnings.warn(
- message = "Representing uploaded files as strings is "\
- " deprecated. Use
django.core.files.SimpleUploadedFile "\
- " instead.",
+ message = "Representing uploaded files as dictionaries is
deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.",
category = DeprecationWarning,
stacklevel = 2
)
Modified: django/branches/newforms-admin/django/newforms/fields.py
===================================================================
--- django/branches/newforms-admin/django/newforms/fields.py 2008-07-18
22:55:31 UTC (rev 7959)
+++ django/branches/newforms-admin/django/newforms/fields.py 2008-07-18
23:01:28 UTC (rev 7960)
@@ -442,9 +442,7 @@
# We warn once, then support both ways below.
import warnings
warnings.warn(
- message = "Representing uploaded files as dictionaries is"\
- " deprecated. Use
django.core.files.SimpleUploadedFile "\
- " instead.",
+ message = "Representing uploaded files as dictionaries is
deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.",
category = DeprecationWarning,
stacklevel = 2
)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
