Permalink
Browse files

gis: Merged revisions 7458,7471-7473,7476-7478,7480 via svnmerge from…

… trunk.

This includes all necessary patches for compatibility with queryset-refactor.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 5456919 commit e973fea91c4e5924f1d0d709b9c8f0d069380709 @jbronn jbronn committed Apr 27, 2008
Showing with 9,904 additions and 3,945 deletions.
  1. +2 −1 AUTHORS
  2. +6 −2 django/bin/make-messages.py
  3. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  4. +170 −160 django/conf/locale/ca/LC_MESSAGES/django.po
  5. BIN django/conf/locale/fr/LC_MESSAGES/django.mo
  6. +15 −5 django/conf/locale/fr/LC_MESSAGES/django.po
  7. BIN django/conf/locale/ro/LC_MESSAGES/django.mo
  8. +3,722 −1,454 django/conf/locale/ro/LC_MESSAGES/django.po
  9. BIN django/conf/locale/ro/LC_MESSAGES/djangojs.mo
  10. +30 −32 django/conf/locale/ro/LC_MESSAGES/djangojs.po
  11. BIN django/conf/locale/ru/LC_MESSAGES/djangojs.mo
  12. +1 −1 django/conf/locale/ru/LC_MESSAGES/djangojs.po
  13. +7 −11 django/contrib/admin/views/main.py
  14. +5 −0 django/contrib/contenttypes/generic.py
  15. +29 −257 django/contrib/gis/db/backend/__init__.py
  16. +0 −2 django/contrib/gis/db/models/fields/__init__.py
  17. +184 −275 django/contrib/gis/db/models/query.py
  18. +2 −1 django/contrib/gis/tests/geoapp/tests.py
  19. +20 −8 django/contrib/gis/tests/geoapp/tests_mysql.py
  20. +5 −0 django/core/exceptions.py
  21. +9 −15 django/core/management/sql.py
  22. +18 −12 django/core/management/validation.py
  23. +1 −1 django/core/serializers/base.py
  24. +9 −5 django/db/__init__.py
  25. +33 −6 django/db/backends/__init__.py
  26. +5 −0 django/db/backends/mysql/base.py
  27. +5 −0 django/db/backends/mysql_old/base.py
  28. +37 −237 django/db/backends/oracle/base.py
  29. +151 −0 django/db/backends/oracle/query.py
  30. +3 −0 django/db/backends/postgresql/operations.py
  31. +3 −0 django/db/backends/sqlite3/base.py
  32. +238 −145 django/db/models/base.py
  33. +30 −13 django/db/models/fields/__init__.py
  34. +16 −0 django/db/models/fields/proxy.py
  35. +111 −144 django/db/models/fields/related.py
  36. +34 −6 django/db/models/manager.py
  37. +273 −45 django/db/models/options.py
  38. +471 −940 django/db/models/query.py
  39. +50 −0 django/db/models/query_utils.py
  40. +7 −0 django/db/models/sql/__init__.py
  41. +36 −0 django/db/models/sql/constants.py
  42. +103 −0 django/db/models/sql/datastructures.py
  43. +1,504 −0 django/db/models/sql/query.py
  44. +367 −0 django/db/models/sql/subqueries.py
  45. +171 −0 django/db/models/sql/where.py
  46. +134 −0 django/utils/tree.py
  47. +373 −65 docs/db-api.txt
  48. +271 −7 docs/model-api.txt
  49. +3 −5 tests/modeltests/basic/models.py
  50. +3 −3 tests/modeltests/custom_columns/models.py
  51. +3 −2 tests/modeltests/field_subclassing/models.py
  52. +29 −3 tests/modeltests/lookup/models.py
  53. +5 −0 tests/modeltests/many_to_many/models.py
  54. +11 −6 tests/modeltests/many_to_one/models.py
  55. +5 −0 tests/modeltests/many_to_one_null/models.py
  56. +226 −11 tests/modeltests/model_inheritance/models.py
  57. +34 −9 tests/modeltests/one_to_one/models.py
  58. +16 −5 tests/modeltests/or_lookups/models.py
  59. 0 tests/modeltests/order_with_respect_to/__init__.py
  60. +78 −0 tests/modeltests/order_with_respect_to/models.py
  61. +13 −0 tests/modeltests/ordering/models.py
  62. +0 −2 tests/modeltests/reserved_names/models.py
  63. +1 −1 tests/modeltests/reverse_lookup/models.py
  64. +42 −5 tests/modeltests/select_related/models.py
  65. +15 −14 tests/modeltests/serializers/models.py
  66. +2 −1 tests/modeltests/signals/models.py
  67. +1 −1 tests/modeltests/transactions/models.py
  68. 0 tests/modeltests/update/__init__.py
  69. +67 −0 tests/modeltests/update/models.py
  70. +10 −5 tests/regressiontests/null_queries/models.py
  71. 0 tests/regressiontests/queries/__init__.py
  72. +658 −0 tests/regressiontests/queries/models.py
  73. +13 −14 tests/regressiontests/serializers_regress/models.py
  74. +8 −8 tests/regressiontests/serializers_regress/tests.py
View
@@ -104,6 +104,7 @@ answer newbie questions, and generally made Django that much better:
Jure Cuhalev <gandalf@owca.info>
John D'Agostino <john.dagostino@gmail.com>
dackze+django@gmail.com
+ Mihai Damian <yang_damian@yahoo.com>
David Danier <goliath.mailinglist@gmx.de>
Dirk Datzert <dummy@habmalnefrage.de>
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
@@ -347,7 +348,7 @@ answer newbie questions, and generally made Django that much better:
Zach Thompson <zthompson47@gmail.com>
Michael Thornhill
Deepak Thukral <deep.thukral@gmail.com>
- tibimicu@gmax.net
+ tibimicu@gmx.net
tobias@neuyork.de
Tom Tobin
Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
@@ -85,8 +85,7 @@ def make_messages():
src = pythonize_re.sub('\n#', src)
open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
thefile = '%s.py' % file
- cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
- os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
+ cmd = 'xgettext -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (domain, os.path.join(dirpath, thefile))
(stdin, stdout, stderr) = os.popen3(cmd, 't')
msgs = stdout.read()
errors = stderr.read()
@@ -97,6 +96,11 @@ def make_messages():
old = '#: '+os.path.join(dirpath, thefile)[2:]
new = '#: '+os.path.join(dirpath, file)[2:]
msgs = msgs.replace(old, new)
+ if os.path.exists(potfile):
+ # Strip the header
+ msgs = '\n'.join(dropwhile(len, msgs.split('\n')))
+ else:
+ msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
if msgs:
open(potfile, 'ab').write(msgs)
os.unlink(os.path.join(dirpath, thefile))
Binary file not shown.
Oops, something went wrong. Retry.

0 comments on commit e973fea

Please sign in to comment.