Permalink
Browse files

gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,67…

…53,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend `base.py` due to ikelly's patch in r6905.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 5799c2e commit 34560a01daee3c42a7c5ec462f38a485cccf4df7 @jbronn jbronn committed Dec 15, 2007
Showing with 3,823 additions and 1,644 deletions.
  1. +8 −0 AUTHORS
  2. +3 −3 django/conf/__init__.py
  3. +5 −1 django/conf/global_settings.py
  4. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  5. +198 −194 django/conf/locale/ca/LC_MESSAGES/django.po
  6. BIN django/conf/locale/ca/LC_MESSAGES/djangojs.mo
  7. +8 −6 django/conf/locale/ca/LC_MESSAGES/djangojs.po
  8. +1 −1 django/contrib/admin/templatetags/admin_list.py
  9. +1 −1 django/contrib/auth/models.py
  10. +12 −0 django/contrib/auth/tests.py
  11. +21 −21 django/contrib/contenttypes/generic.py
  12. 0 django/contrib/localflavor/mx/__init__.py
  13. +14 −0 django/contrib/localflavor/mx/forms.py
  14. +45 −0 django/contrib/localflavor/mx/mx_states.py
  15. +17 −1 django/contrib/localflavor/uk/forms.py
  16. +97 −0 django/contrib/localflavor/uk/uk_regions.py
  17. 0 django/contrib/localflavor/za/__init__.py
  18. +57 −0 django/contrib/localflavor/za/forms.py
  19. +13 −0 django/contrib/localflavor/za/za_provinces.py
  20. +29 −2 django/contrib/markup/templatetags/markup.py
  21. +8 −1 django/contrib/markup/tests.py
  22. +8 −0 django/contrib/sessions/backends/base.py
  23. +11 −2 django/contrib/sessions/backends/file.py
  24. +0 −34 django/contrib/sessions/models.py
  25. +13 −0 django/contrib/sessions/tests.py
  26. +10 −1 django/core/cache/__init__.py
  27. +90 −41 django/core/cache/backends/filebased.py
  28. +81 −24 django/core/cache/backends/locmem.py
  29. +0 −73 django/core/cache/backends/simple.py
  30. +4 −0 django/core/exceptions.py
  31. +3 −2 django/core/handlers/base.py
  32. +5 −4 django/core/handlers/modpython.py
  33. +2 −2 django/core/handlers/wsgi.py
  34. +36 −46 django/core/management/__init__.py
  35. +3 −3 django/core/management/commands/loaddata.py
  36. +3 −2 django/core/management/commands/syncdb.py
  37. +12 −4 django/core/management/validation.py
  38. +15 −1 django/core/serializers/pyyaml.py
  39. +2 −2 django/db/__init__.py
  40. +23 −13 django/db/backends/oracle/base.py
  41. +2 −0 django/db/backends/postgresql_psycopg2/base.py
  42. +3 −1 django/db/models/base.py
  43. +1 −1 django/db/models/fields/__init__.py
  44. +3 −3 django/db/models/options.py
  45. +2 −1 django/db/models/query.py
  46. +1 −1 django/http/__init__.py
  47. +2 −3 django/http/utils.py
  48. +43 −15 django/middleware/common.py
  49. +10 −16 django/newforms/fields.py
  50. +166 −2 django/newforms/models.py
  51. +1 −1 django/shortcuts/__init__.py
  52. +5 −2 django/template/context.py
  53. +26 −2 django/template/defaultfilters.py
  54. +11 −0 django/test/_doctest.py
  55. +3 −3 django/utils/datastructures.py
  56. +12 −12 django/utils/html.py
  57. +8 −10 django/utils/maxlength.py
  58. +9 −12 django/utils/safestring.py
  59. +63 −30 django/views/debug.py
  60. +1 −1 django/views/generic/date_based.py
  61. +1 −1 django/views/generic/list_detail.py
  62. +30 −11 docs/add_ons.txt
  63. +54 −1 docs/authentication.txt
  64. +4 −0 docs/cache.txt
  65. +12 −7 docs/contributing.txt
  66. +144 −129 docs/custom_model_fields.txt
  67. +5 −0 docs/databases.txt
  68. +5 −3 docs/email.txt
  69. +418 −0 docs/form_for_model.txt
  70. +2 −2 docs/generic_views.txt
  71. +9 −7 docs/install.txt
  72. +654 −0 docs/localflavor.txt
  73. +14 −5 docs/middleware.txt
  74. +3 −2 docs/model-api.txt
  75. +313 −0 docs/modelforms.txt
  76. +22 −425 docs/newforms.txt
  77. +11 −7 docs/request_response.txt
  78. +2 −7 docs/serialization.txt
  79. +2 −0 docs/sessions.txt
  80. +44 −3 docs/settings.txt
  81. +2 −2 docs/shortcuts.txt
  82. +8 −5 docs/syndication_feeds.txt
  83. +170 −103 docs/templates.txt
  84. +139 −130 docs/templates_python.txt
  85. +25 −25 docs/tutorial02.txt
  86. +1 −1 tests/modeltests/empty/models.py
  87. +5 −0 tests/modeltests/field_defaults/models.py
  88. +17 −13 tests/modeltests/generic_relations/models.py
  89. +1 −1 tests/modeltests/get_object_or_404/models.py
  90. +6 −0 tests/modeltests/invalid_models/models.py
  91. +165 −129 tests/modeltests/model_forms/models.py
  92. +1 −1 tests/modeltests/select_related/models.py
  93. +39 −1 tests/modeltests/serializers/models.py
  94. +1 −1 tests/modeltests/test_client/models.py
  95. +2 −2 tests/modeltests/user_commands/models.py
  96. +53 −7 tests/regressiontests/cache/tests.py
  97. +12 −0 tests/regressiontests/defaultfilters/tests.py
  98. +40 −0 tests/regressiontests/forms/localflavor/za.py
  99. +2 −0 tests/regressiontests/forms/tests.py
  100. +14 −1 tests/regressiontests/i18n/tests.py
  101. +3 −3 tests/regressiontests/maxlength/tests.py
  102. 0 tests/regressiontests/middleware/__init__.py
  103. +93 −0 tests/regressiontests/middleware/tests.py
  104. +7 −0 tests/regressiontests/middleware/urls.py
  105. +10 −0 tests/regressiontests/model_regress/models.py
  106. +4 −4 tests/regressiontests/string_lookup/models.py
  107. +18 −0 tests/regressiontests/templates/context.py
  108. +2 −0 tests/regressiontests/templates/tests.py
  109. +0 −2 tests/regressiontests/views/views.py
  110. +1 −2 tests/runtests.py
  111. +3 −0 tests/urls.py
View
@@ -89,6 +89,7 @@ answer newbie questions, and generally made Django that much better:
Paul Collier <paul@paul-collier.com>
Pete Crosier <pete.crosier@gmail.com>
Matt Croydon <http://www.postneo.com/>
+ Leah Culver <leah@pownce.com>
flavio.curella@gmail.com
Jure Cuhalev <gandalf@owca.info>
John D'Agostino <john.dagostino@gmail.com>
@@ -132,6 +133,7 @@ answer newbie questions, and generally made Django that much better:
Jorge Gajon <gajon@gajon.org>
gandalf@owca.info
Marc Garcia <marc.garcia@accopensys.com>
+ Andy Gayton <andy-django@thecablelounge.com>
Baishampayan Ghose
Dimitris Glezos <dimitris@glezos.com>
glin@seznam.cz
@@ -171,6 +173,7 @@ answer newbie questions, and generally made Django that much better:
junzhang.jn@gmail.com
Antti Kaihola <http://akaihola.blogspot.com/>
Nagy Károly <charlie@rendszergazda.com>
+ Erik Karulf <erik@karulf.com>
Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
Ian G. Kelly <ian.g.kelly@gmail.com>
Thomas Kerpe <thomas@kerpe.net>
@@ -190,6 +193,7 @@ answer newbie questions, and generally made Django that much better:
Joseph Kocherhans
konrad@gwu.edu
knox <christobzr@gmail.com>
+ David Krauth
kurtiss@meetro.com
lakin.wecker@gmail.com
Nick Lane <nick.lane.au@gmail.com>
@@ -204,6 +208,7 @@ answer newbie questions, and generally made Django that much better:
Waylan Limberg <waylan@gmail.com>
limodou
Philip Lindborg <philip.lindborg@gmail.com>
+ Trey Long <trey@ktrl.com>
msaelices <msaelices@gmail.com>
Matt McClanahan <http://mmcc.cx/>
Martin Maney <http://www.chipy.org/Martin_Maney>
@@ -251,6 +256,7 @@ answer newbie questions, and generally made Django that much better:
Gustavo Picon
Luke Plant <http://lukeplant.me.uk/>
plisk
+ Mihai Preda <mihai_preda@yahoo.com>
Daniel Poelzleithner <http://poelzi.org/>
polpak@yahoo.com
Jyrki Pulliainen <jyrki.pulliainen@gmail.com>
@@ -262,6 +268,7 @@ answer newbie questions, and generally made Django that much better:
Massimiliano Ravelli <massimiliano.ravelli@gmail.com>
Brian Ray <http://brianray.chipy.org/>
remco@diji.biz
+ David Reynolds <david@reynoldsfamily.org.uk>
rhettg@gmail.com
ricardojbarrios@gmail.com
Matt Riggott
@@ -281,6 +288,7 @@ answer newbie questions, and generally made Django that much better:
Pete Shinners <pete@shinners.org>
jason.sidabras@gmail.com
Jozko Skrablin <jozko.skrablin@gmail.com>
+ Ben Slavin <benjamin.slavin@gmail.com>
SmileyChris <smileychris@gmail.com>
smurf@smurf.noris.de
Vsevolod Solovyov
@@ -52,7 +52,7 @@ def _import_settings(self):
if not settings_module: # If it's set but is an empty string.
raise KeyError
except KeyError:
- raise EnvironmentError, "Environment variable %s is undefined." % ENVIRONMENT_VARIABLE
+ raise ImportError, "Environment variable %s is undefined so settings cannot be imported." % ENVIRONMENT_VARIABLE # NOTE: This is arguably an EnvironmentError, but that causes problems with Python's interactive help
self._target = Settings(settings_module)
@@ -63,7 +63,7 @@ def configure(self, default_settings=global_settings, **options):
argument must support attribute access (__getattr__)).
"""
if self._target != None:
- raise EnvironmentError, 'Settings already configured.'
+ raise RuntimeError, 'Settings already configured.'
holder = UserSettingsHolder(default_settings)
for name, value in options.items():
setattr(holder, name, value)
@@ -82,7 +82,7 @@ def __init__(self, settings_module):
try:
mod = __import__(self.SETTINGS_MODULE, {}, {}, [''])
except ImportError, e:
- raise EnvironmentError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
+ raise ImportError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
# Settings that should be converted into tuples if they're mistakenly entered
# as strings.
@@ -253,6 +253,10 @@
from django import get_version
URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version()
+# The tablespaces to use for each model when not specified otherwise.
+DEFAULT_TABLESPACE = ''
+DEFAULT_INDEX_TABLESPACE = ''
+
##############
# MIDDLEWARE #
##############
@@ -289,7 +293,7 @@
# The cache backend to use. See the docstring in django.core.cache for the
# possible values.
-CACHE_BACKEND = 'simple://'
+CACHE_BACKEND = 'locmem://'
CACHE_MIDDLEWARE_KEY_PREFIX = ''
CACHE_MIDDLEWARE_SECONDS = 600
Binary file not shown.
Oops, something went wrong.

0 comments on commit 34560a0

Please sign in to comment.