Branch: refs/heads/soc2010/test-refactor
  Home:   https://github.com/django/django
  Commit: 6c10480e99118c93c046a6e83f5e84615ed8b2e7
      
https://github.com/django/django/commit/6c10480e99118c93c046a6e83f5e84615ed8b2e7
  Author: Jacob Kaplan-Moss <ja...@jacobian.org>
  Date:   2010-05-27 (Thu, 27 May 2010)

  Log Message:
  -----------
  Created test-refactor SoC branch.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13307 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 8bdf160e05f666c0f1c9106719bad46b407f9992
      
https://github.com/django/django/commit/8bdf160e05f666c0f1c9106719bad46b407f9992
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-02 (Wed, 02 Jun 2010)

  Changed paths:
    M django/core/management/base.py
    M django/db/backends/__init__.py
    M django/http/__init__.py
    M django/test/testcases.py
    M django/utils/hashcompat.py
    M django/views/debug.py
    M docs/ref/contrib/admin/index.txt
    M docs/ref/settings.txt
    M docs/topics/testing.txt
    M tests/modeltests/aggregation/models.py
    A tests/modeltests/aggregation/tests.py
    M tests/regressiontests/httpwrappers/tests.py
    M tests/regressiontests/serializers_regress/tests.py

  Log Message:
  -----------
  Merged trunk changes r13307:13316 into test-refactor SoC branch.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13317 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: e3bad40d3e4873be5f9b7103b2140ebf81361c8a
      
https://github.com/django/django/commit/e3bad40d3e4873be5f9b7103b2140ebf81361c8a
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-09 (Wed, 09 Jun 2010)

  Changed paths:
    M AUTHORS
    M django/conf/locale/pl/formats.py
    M django/core/handlers/base.py
    M django/core/management/base.py
    M django/core/management/commands/loaddata.py
    M django/db/backends/postgresql/creation.py
    M django/db/backends/postgresql/operations.py
    M django/middleware/csrf.py
    M docs/howto/custom-management-commands.txt
    M docs/ref/settings.txt
    M tests/modeltests/fixtures/models.py
    A tests/modeltests/fixtures/tests.py
    M tests/modeltests/proxy_model_inheritance/tests.py
    M tests/regressiontests/backends/models.py
    M tests/regressiontests/backends/tests.py
    M tests/regressiontests/csrf_tests/tests.py
    M tests/regressiontests/m2m_through_regress/models.py
    A tests/regressiontests/m2m_through_regress/tests.py
    M tests/regressiontests/multiple_database/tests.py
    M tests/regressiontests/utils/timesince.py

  Log Message:
  -----------
  Merged trunk changes r13316:13342 into test-refactor SOC branch.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13343 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 7289013cf18905ad2022eb21a51be91b02284a56
      
https://github.com/django/django/commit/7289013cf18905ad2022eb21a51be91b02284a56
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-09 (Wed, 09 Jun 2010)

  Changed paths:
    A tests/modeltests/choices/fixtures/initial_data.json
    M tests/modeltests/choices/models.py
    A tests/modeltests/choices/tests.py

  Log Message:
  -----------
  Converted modeltests.choices to unittests


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13344 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 75302ff6355ab770a1791b55eaf4a476bcc76d99
      
https://github.com/django/django/commit/75302ff6355ab770a1791b55eaf4a476bcc76d99
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-09 (Wed, 09 Jun 2010)

  Changed paths:
    A tests/modeltests/choices/fixtures/choices_testdata.json
    R tests/modeltests/choices/fixtures/initial_data.json
    M tests/modeltests/choices/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Renamed choices test fixture to be semantically 
meaningful.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13345 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 101796ce8da802e74720d47821157723b46800da
      
https://github.com/django/django/commit/101796ce8da802e74720d47821157723b46800da
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-09 (Wed, 09 Jun 2010)

  Changed paths:
    A tests/modeltests/custom_columns/fixtures/custom_columns_testdata.json
    M tests/modeltests/custom_columns/models.py
    A tests/modeltests/custom_columns/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Converted custom_columns doctest to unittest.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13346 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 4ffeb59e86940089037ec90db7ed1aec523c4414
      
https://github.com/django/django/commit/4ffeb59e86940089037ec90db7ed1aec523c4414
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-09 (Wed, 09 Jun 2010)

  Changed paths:
    M docs/internals/contributing.txt

  Log Message:
  -----------
  [soc2010/test-refactor] Modified contrib docs to require unittests.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13347 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: cc4703d5aeaf8059feddfe699ff8e58074a36e70
      
https://github.com/django/django/commit/cc4703d5aeaf8059feddfe699ff8e58074a36e70
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-10 (Thu, 10 Jun 2010)

  Changed paths:
    A tests/modeltests/custom_managers/fixtures/custom_managers_testdata.json
    M tests/modeltests/custom_managers/models.py
    A tests/modeltests/custom_managers/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Converted custom_managers doctests to unittests.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13349 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 078b13e97e474787fa45e03bb6768f2ff502fe67
      
https://github.com/django/django/commit/078b13e97e474787fa45e03bb6768f2ff502fe67
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    M tests/modeltests/custom_methods/models.py
    A tests/modeltests/custom_methods/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Updated custom_methods model test to unittests


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13373 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 42570206db67fa4206883ef5fd935f6eda8a47f7
      
https://github.com/django/django/commit/42570206db67fa4206883ef5fd935f6eda8a47f7
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    M tests/modeltests/custom_pk/models.py
    A tests/modeltests/custom_pk/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Moved custom_pk modeltest to unittest


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13374 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: af64237c3110cc859d8bdfac0f2ba1d2f8d1f919
      
https://github.com/django/django/commit/af64237c3110cc859d8bdfac0f2ba1d2f8d1f919
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    A tests/modeltests/defer/fixtures/defer_and_only_testdata.json
    M tests/modeltests/defer/models.py
    A tests/modeltests/defer/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Updated modeltests.defer to unittests


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13375 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 85f024c2b1d9b59d0a487f0743da8c21076064b7
      
https://github.com/django/django/commit/85f024c2b1d9b59d0a487f0743da8c21076064b7
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    M tests/modeltests/delete/models.py
    A tests/modeltests/delete/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] updated delete modeltest to unittest


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13376 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 52a855fd37c6e9765aedf9178d9e85c3c669c0c1
      
https://github.com/django/django/commit/52a855fd37c6e9765aedf9178d9e85c3c669c0c1
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    M tests/modeltests/empty/models.py
    A tests/modeltests/empty/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] updated empty modeltest to unittest


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13377 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: dc2fd96803dd99ac466b4c22f9bdb1294c7b3c37
      
https://github.com/django/django/commit/dc2fd96803dd99ac466b4c22f9bdb1294c7b3c37
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    A tests/modeltests/expressions/fixtures/f_expression_testdata.json
    M tests/modeltests/expressions/models.py
    A tests/modeltests/expressions/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Updated expressions modeltest to unittests


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13378 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 6f851bca15880e7aaa115edd54fe19771445d30d
      
https://github.com/django/django/commit/6f851bca15880e7aaa115edd54fe19771445d30d
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-21 (Mon, 21 Jun 2010)

  Changed paths:
    M tests/modeltests/field_defaults/models.py
    A tests/modeltests/field_defaults/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Updated field_defaults modeltest to unittest


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13379 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 222cc77e528ac83c6af8c88deb31385b0d710cc0
      
https://github.com/django/django/commit/222cc77e528ac83c6af8c88deb31385b0d710cc0
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-22 (Tue, 22 Jun 2010)

  Log Message:
  -----------
  [soc2010/test-refactor] Added svnmerge props


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13390 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: c8624d43cbaee8b9d434f555d99fb7859011b4c9
      
https://github.com/django/django/commit/c8624d43cbaee8b9d434f555d99fb7859011b4c9
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-22 (Tue, 22 Jun 2010)

  Changed paths:
    M django/__init__.py
    M django/contrib/markup/tests.py
    M django/core/management/commands/testserver.py
    M docs/ref/databases.txt
    M docs/ref/django-admin.txt
    M docs/ref/models/instances.txt
    M docs/ref/request-response.txt
    M docs/releases/1.2.txt
    A docs/releases/1.3.txt
    M docs/releases/index.txt

  Log Message:
  -----------
  [soc2010/test-refactor] Merged changes from trunk up to 13390


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13391 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: e09d2de9063cf6a709441c2d21c1e6d42a62b770
      
https://github.com/django/django/commit/e09d2de9063cf6a709441c2d21c1e6d42a62b770
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-23 (Wed, 23 Jun 2010)

  Changed paths:
    M tests/modeltests/files/models.py
    A tests/modeltests/files/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Converted files modeltest to unittest. Removed unused 
custom field on Storage model (the same functionality is tested by random). 
Sadly these tests aren't threadsafe because the Storage model's temp_storage 
can't be changed for each testcase.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13392 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 2ca92d49f84e26972c967488b88a2d4c32a041b2
      
https://github.com/django/django/commit/2ca92d49f84e26972c967488b88a2d4c32a041b2
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-23 (Wed, 23 Jun 2010)

  Changed paths:
    M tests/modeltests/force_insert_update/models.py
    A tests/modeltests/force_insert_update/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Converted force_insert_update to unittest. We have 
always been at war with doctests.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13395 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 154808166afba5a3fd3532423df58cd366f2ea06
      
https://github.com/django/django/commit/154808166afba5a3fd3532423df58cd366f2ea06
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-06-30 (Wed, 30 Jun 2010)

  Changed paths:
    M django/test/testcases.py
    M tests/regressiontests/test_client_regress/models.py

  Log Message:
  -----------
  [soc2010/test-refactor] Provisional unittest2 support. Currently requires 
unittest2 to be in the pythonpath. The test_client_regress fix cleans up error 
checking to be less brittle (and pass with unittest2).


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13406 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 86580d042ecc12e0e34f369edee9bf9b71ade816
      
https://github.com/django/django/commit/86580d042ecc12e0e34f369edee9bf9b71ade816
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M django/test/simple.py
    M django/test/testcases.py
    A django/utils/unittest/__init__.py
    A django/utils/unittest/__main__.py
    A django/utils/unittest/case.py
    A django/utils/unittest/collector.py
    A django/utils/unittest/compatibility.py
    A django/utils/unittest/loader.py
    A django/utils/unittest/main.py
    A django/utils/unittest/result.py
    A django/utils/unittest/runner.py
    A django/utils/unittest/signals.py
    A django/utils/unittest/suite.py
    A django/utils/unittest/unittest2_package_init.py
    A django/utils/unittest/util.py

  Log Message:
  -----------
  [soc2010/test-refactor] Unittest2 integration properly done. unittest2 
package (at rev 221) is bundled as django.utils.unittest and the imports are 
patched to reflect django usage. Tests should import django.utils.unittest 
rather than the stdlib package. "It's a beautiful thing, the destruction of 
doctests."


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13410 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: e87ead6d082687741d6ed6bfd9ed5130282394e7
      
https://github.com/django/django/commit/e87ead6d082687741d6ed6bfd9ed5130282394e7
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M django/test/testcases.py

  Log Message:
  -----------
  [soc2010/test-refactor] Forgot to remove a comment.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13411 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 62e587418cdfc8f54b6058072497df47e6ab3abd
      
https://github.com/django/django/commit/62e587418cdfc8f54b6058072497df47e6ab3abd
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M tests/modeltests/custom_pk/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] updated custom_pk modeltest to take advantage of 
unittest2


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13412 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: c298937c9434752aa961888e680bfb638230ec62
      
https://github.com/django/django/commit/c298937c9434752aa961888e680bfb638230ec62
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M django/utils/unittest/case.py

  Log Message:
  -----------
  [soc2010/test-refactor] small fix to allow unittest2 to compare 
ValuesQuerySet using assertItemsEqual


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13413 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: dfd3da2853e7fef61ed40f5f903f8d97085cb953
      
https://github.com/django/django/commit/dfd3da2853e7fef61ed40f5f903f8d97085cb953
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M tests/modeltests/expressions/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] update expressions test to use unittest2 
assertItemsEqual


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13414 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 9d69c8f01d84186c5381a896afafb3d789afe9cb
      
https://github.com/django/django/commit/9d69c8f01d84186c5381a896afafb3d789afe9cb
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M tests/modeltests/field_defaults/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Updated field_defaults to use unittest2 delta arg for 
assertAlmostEqual


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13415 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: e0bd235ffa78e74cdeccac5dabedd66487fd124f
      
https://github.com/django/django/commit/e0bd235ffa78e74cdeccac5dabedd66487fd124f
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M django/test/__init__.py
    M django/test/utils.py

  Log Message:
  -----------
  [soc2010/test-refactor] Added skipIfDBEngine() decorator to django.test


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13416 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: cee4afc267e169d9a92d65287f46deebcae98306
      
https://github.com/django/django/commit/cee4afc267e169d9a92d65287f46deebcae98306
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M tests/modeltests/fixtures/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] updated fixtures tests to use @skipIfDBEngine() 
decorator


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13417 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 90fab13583224a69490b5ef67b086d7ef4d2bb14
      
https://github.com/django/django/commit/90fab13583224a69490b5ef67b086d7ef4d2bb14
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-02 (Fri, 02 Jul 2010)

  Changed paths:
    M tests/modeltests/fixtures/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Can't use class decorators in python 2.4.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13418 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: ae2c227f51b86c2644cf0ca76a1b5b6e53307e17
      
https://github.com/django/django/commit/ae2c227f51b86c2644cf0ca76a1b5b6e53307e17
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-06 (Tue, 06 Jul 2010)

  Changed paths:
    M django/test/utils.py

  Log Message:
  -----------
  [soc2010/test-refactor] Fixed @skipIfDBEngine to be more explicit


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13427 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 9315b44ad1db3e7b23e19a9ec52788e13fc7bd3f
      
https://github.com/django/django/commit/9315b44ad1db3e7b23e19a9ec52788e13fc7bd3f
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-07-06 (Tue, 06 Jul 2010)

  Changed paths:
    M django/contrib/admin/media/css/base.css
    M django/contrib/admin/templates/admin/base.html
    M django/contrib/gis/gdal/libgdal.py
    M django/middleware/csrf.py
    M docs/faq/install.txt
    M docs/intro/install.txt
    M docs/ref/contrib/gis/create_template_postgis-1.4.sh
    M docs/ref/contrib/gis/install.txt
    M docs/ref/validators.txt
    M docs/topics/auth.txt
    M docs/topics/db/optimization.txt
    M docs/topics/install.txt
    M docs/topics/serialization.txt
    M tests/regressiontests/m2m_through_regress/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Merged up to trunk.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13428 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 5875c4e01c16540547cfa7bb5c4b379f5476d990
      
https://github.com/django/django/commit/5875c4e01c16540547cfa7bb5c4b379f5476d990
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-08-04 (Wed, 04 Aug 2010)

  Changed paths:
    M django/contrib/gis/db/backends/mysql/creation.py
    M django/contrib/gis/db/models/sql/compiler.py
    M django/contrib/gis/tests/relatedapp/models.py
    M django/contrib/gis/tests/relatedapp/tests.py
    M django/core/management/commands/flush.py
    M django/db/backends/postgresql/creation.py
    M django/db/backends/postgresql/operations.py
    M django/db/models/fields/related.py
    M django/db/models/sql/query.py
    M django/template/defaultfilters.py
    M docs/Makefile
    M docs/_ext/djangodocs.py
    R docs/_static/default.css
    R docs/_static/djangodocs.css
    R docs/_static/docicons-behindscenes.png
    R docs/_static/docicons-note.png
    R docs/_static/docicons-philosophy.png
    R docs/_static/homepage.css
    R docs/_static/reset-fonts-grids.css
    R docs/_templates/genindex.html
    R docs/_templates/layout.html
    R docs/_templates/modindex.html
    R docs/_templates/search.html
    A docs/_theme/djangodocs/genindex.html
    A docs/_theme/djangodocs/layout.html
    A docs/_theme/djangodocs/modindex.html
    A docs/_theme/djangodocs/search.html
    A docs/_theme/djangodocs/static/default.css
    A docs/_theme/djangodocs/static/djangodocs.css
    A docs/_theme/djangodocs/static/docicons-behindscenes.png
    A docs/_theme/djangodocs/static/docicons-note.png
    A docs/_theme/djangodocs/static/docicons-philosophy.png
    A docs/_theme/djangodocs/static/homepage.css
    A docs/_theme/djangodocs/static/reset-fonts-grids.css
    A docs/_theme/djangodocs/theme.conf
    M docs/conf.py
    M docs/internals/documentation.txt
    M docs/ref/contrib/admin/index.txt
    M docs/ref/models/instances.txt
    M tests/regressiontests/backends/models.py
    M tests/regressiontests/backends/tests.py
    M tests/regressiontests/templates/filters.py
    M tests/regressiontests/templates/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Merged up to trunk.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13468 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 0620a1c223bc6bd7b83756376eccd68362610826
      
https://github.com/django/django/commit/0620a1c223bc6bd7b83756376eccd68362610826
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-08-04 (Wed, 04 Aug 2010)

  Changed paths:
    M docs/internals/contributing.txt
    M docs/topics/testing.txt

  Log Message:
  -----------
  [soc2010/test-refactor] Update docs to reflect unittest2 changes.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13477 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 6c7baa96d84d33c8d02d8899f462255d805d695e
      
https://github.com/django/django/commit/6c7baa96d84d33c8d02d8899f462255d805d695e
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-08-04 (Wed, 04 Aug 2010)

  Changed paths:
    M django/core/cache/backends/db.py
    M django/core/management/commands/dumpdata.py
    M django/core/management/commands/flush.py
    M django/db/backends/creation.py
    M django/db/models/fields/__init__.py
    M docs/topics/cache.txt
    M docs/topics/db/managers.txt
    M tests/regressiontests/model_forms_regress/models.py
    M tests/regressiontests/model_forms_regress/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Merged up to trunk again to fix failing tests.


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13478 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: a2e30a41dd00baaa85f0162934327ff0e3dfce51
      
https://github.com/django/django/commit/a2e30a41dd00baaa85f0162934327ff0e3dfce51
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-08-09 (Mon, 09 Aug 2010)

  Changed paths:
    M AUTHORS
    M django/conf/global_settings.py
    M django/conf/locale/cs/LC_MESSAGES/django.mo
    M django/conf/locale/cs/LC_MESSAGES/django.po
    M django/conf/locale/cs/LC_MESSAGES/djangojs.mo
    M django/conf/locale/cs/LC_MESSAGES/djangojs.po
    M django/conf/locale/da/LC_MESSAGES/djangojs.mo
    M django/conf/locale/da/LC_MESSAGES/djangojs.po
    M django/conf/locale/de/LC_MESSAGES/django.mo
    M django/conf/locale/de/LC_MESSAGES/django.po
    M django/conf/locale/es_AR/LC_MESSAGES/django.mo
    M django/conf/locale/es_AR/LC_MESSAGES/django.po
    M django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
    M django/conf/locale/es_AR/LC_MESSAGES/djangojs.po
    A django/conf/locale/ml/LC_MESSAGES/django.mo
    A django/conf/locale/ml/LC_MESSAGES/django.po
    A django/conf/locale/ml/LC_MESSAGES/djangojs.mo
    A django/conf/locale/ml/LC_MESSAGES/djangojs.po
    A django/conf/locale/ml/__init__.py
    A django/conf/locale/ml/formats.py
    M django/conf/locale/sr/LC_MESSAGES/django.mo
    M django/conf/locale/sr/LC_MESSAGES/django.po
    M django/conf/locale/sr/LC_MESSAGES/djangojs.mo
    M django/conf/locale/sr/LC_MESSAGES/djangojs.po
    M django/conf/locale/sr/formats.py
    M django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
    M django/conf/locale/sr_Latn/LC_MESSAGES/django.po
    M django/conf/locale/sr_Latn/formats.py
    M django/contrib/admin/options.py
    M django/contrib/admin/sites.py
    M django/contrib/admin/templates/admin/auth/user/add_form.html
    M django/contrib/databrowse/plugins/calendars.py
    M django/contrib/databrowse/plugins/fieldchoices.py
    M django/contrib/sessions/backends/file.py
    M django/contrib/sessions/tests.py
    M django/core/management/__init__.py
    M django/core/management/base.py
    M django/core/management/commands/dumpdata.py
    M django/core/management/commands/loaddata.py
    M django/core/management/commands/syncdb.py
    M django/core/urlresolvers.py
    M django/db/__init__.py
    M django/db/backends/creation.py
    M django/db/backends/oracle/creation.py
    M django/db/backends/sqlite3/creation.py
    M django/db/models/base.py
    M django/db/models/fields/__init__.py
    M django/db/models/fields/related.py
    M django/db/models/query.py
    M django/db/models/signals.py
    M django/forms/forms.py
    M django/forms/formsets.py
    M django/forms/widgets.py
    M django/template/defaultfilters.py
    M django/test/client.py
    M django/test/testcases.py
    M django/test/utils.py
    M django/utils/text.py
    M django/utils/translation/trans_real.py
    M docs/faq/install.txt
    M docs/internals/contributing.txt
    M docs/ref/contrib/admin/index.txt
    M docs/ref/contrib/contenttypes.txt
    M docs/ref/contrib/formtools/form-wizard.txt
    M docs/ref/django-admin.txt
    M docs/ref/forms/widgets.txt
    M docs/ref/models/querysets.txt
    M docs/ref/request-response.txt
    M docs/ref/settings.txt
    M docs/ref/signals.txt
    M docs/ref/templates/builtins.txt
    M docs/releases/1.1-beta-1.txt
    M docs/releases/1.1.txt
    M docs/releases/1.3.txt
    M docs/topics/auth.txt
    M docs/topics/db/aggregation.txt
    M docs/topics/db/models.txt
    M docs/topics/db/optimization.txt
    M docs/topics/db/sql.txt
    M docs/topics/email.txt
    M docs/topics/forms/modelforms.txt
    M docs/topics/http/urls.txt
    M docs/topics/i18n/internationalization.txt
    M docs/topics/serialization.txt
    M setup.cfg
    M tests/modeltests/fixtures/tests.py
    M tests/modeltests/model_forms/models.py
    M tests/regressiontests/admin_views/models.py
    M tests/regressiontests/admin_views/tests.py
    M tests/regressiontests/forms/forms.py
    A tests/regressiontests/forms/input_formats.py
    M tests/regressiontests/forms/localflavor/au.py
    M tests/regressiontests/forms/tests.py
    M tests/regressiontests/forms/widgets.py
    R tests/regressiontests/localflavor/forms.py
    M tests/regressiontests/localflavor/models.py
    M tests/regressiontests/localflavor/tests.py
    A tests/regressiontests/localflavor/us/__init__.py
    A tests/regressiontests/localflavor/us/forms.py
    A tests/regressiontests/localflavor/us/models.py
    A tests/regressiontests/localflavor/us/tests.py
    M tests/regressiontests/model_forms_regress/tests.py
    M tests/regressiontests/multiple_database/tests.py
    M tests/regressiontests/test_client_regress/models.py
    M tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
    M tests/regressiontests/urlpatterns_reverse/namespace_urls.py
    M tests/regressiontests/urlpatterns_reverse/tests.py
    M tests/regressiontests/urlpatterns_reverse/views.py
    M tests/runtests.py

  Log Message:
  -----------
  [soc2010/test-refactor] Merged back up to trunk


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13566 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: 6f5899c281ae3259ec9061fd03eebe827cdac4da
      
https://github.com/django/django/commit/6f5899c281ae3259ec9061fd03eebe827cdac4da
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-08-09 (Mon, 09 Aug 2010)

  Changed paths:
    M tests/regressiontests/test_client_regress/models.py

  Log Message:
  -----------
  [soc2010/test-refactor] fix to updated syntax for error messages to match 
trunk


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13567 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


  Commit: fe09017f70f2687f972b8a4358247fd4be8090c1
      
https://github.com/django/django/commit/fe09017f70f2687f972b8a4358247fd4be8090c1
  Author: Paul McMillan <p...@mcmillan.ws>
  Date:   2010-08-23 (Mon, 23 Aug 2010)

  Changed paths:
    M tests/regressiontests/custom_managers_regress/models.py
    A tests/regressiontests/custom_managers_regress/tests.py

  Log Message:
  -----------
  [soc2010/test-refactor] converted custom_managers_regress


git-svn-id: 
http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13635 
bcc190cf-cafb-0310-a4f2-bffc1f526a37


Compare: https://github.com/django/django/compare/6c10480^...fe09017

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to