[django/django] 496b4d: Removed an import * that was masking importing stu...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 496b4d03314a96549d3e1f5c69d2d35bc4716906
https://github.com/django/django/commit/496b4d03314a96549d3e1f5c69d2d35bc4716906
Author: Alex Gaynor <alex....@gmail.com>
Date: 2013-09-14 (Sat, 14 Sep 2013)

Changed paths:
M django/db/backends/oracle/base.py

Log Message:
-----------
Removed an import * that was masking importing stuff from the wrong location


Commit: 5c645ec81a872116533ee6d3928b750d3737b68a
https://github.com/django/django/commit/5c645ec81a872116533ee6d3928b750d3737b68a
Author: Alex Gaynor <alex....@gmail.com>
Date: 2013-09-14 (Sat, 14 Sep 2013)

Changed paths:
M AUTHORS
M django/contrib/admin/__init__.py
M django/contrib/admin/filters.py
M django/contrib/admin/sites.py
M django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
M django/contrib/admin/static/admin/js/calendar.js
M django/contrib/admin/templates/admin/base.html
M django/contrib/auth/hashers.py
M django/contrib/auth/models.py
M django/contrib/comments/templatetags/comments.py
M django/contrib/gis/db/backends/base.py
M django/contrib/gis/db/backends/spatialite/introspection.py
M django/contrib/gis/tests/inspectapp/models.py
M django/contrib/gis/tests/inspectapp/tests.py
M django/contrib/humanize/tests.py
M django/contrib/messages/storage/base.py
M django/contrib/sessions/backends/base.py
M django/contrib/staticfiles/finders.py
M django/contrib/syndication/views.py
M django/core/cache/backends/base.py
M django/core/files/storage.py
M django/core/files/uploadedfile.py
M django/core/files/uploadhandler.py
M django/core/mail/backends/base.py
M django/core/management/base.py
M django/core/management/commands/inspectdb.py
M django/core/serializers/base.py
M django/db/backends/__init__.py
M django/db/backends/oracle/creation.py
M django/db/backends/schema.py
M django/db/migrations/operations/base.py
M django/db/migrations/writer.py
M django/db/models/deletion.py
M django/db/models/sql/compiler.py
M django/db/models/sql/query.py
M django/forms/fields.py
M django/forms/forms.py
M django/forms/util.py
M django/forms/widgets.py
M django/http/cookie.py
M django/http/response.py
M django/template/base.py
M django/template/defaulttags.py
M django/template/loader.py
M django/test/__init__.py
M django/test/runner.py
M django/test/testcases.py
M django/utils/archive.py
M django/utils/dateformat.py
M django/utils/dateparse.py
M django/utils/feedgenerator.py
M django/utils/functional.py
M django/utils/log.py
M django/utils/module_loading.py
M django/utils/regex_helper.py
M django/utils/timezone.py
M django/utils/translation/trans_real.py
M django/utils/tzinfo.py
M docs/howto/static-files/index.txt
M docs/internals/contributing/committing-code.txt
M docs/internals/contributing/writing-code/working-with-git.txt
M docs/internals/deprecation.txt
M docs/intro/reusable-apps.txt
M docs/intro/tutorial05.txt
M docs/ref/contrib/auth.txt
M docs/ref/contrib/gis/install/spatialite.txt
M docs/ref/django-admin.txt
M docs/ref/middleware.txt
M docs/ref/models/options.txt
M docs/ref/models/querysets.txt
M docs/ref/signals.txt
M docs/ref/templates/builtins.txt
M docs/ref/utils.txt
M docs/releases/1.0-porting-guide.txt
M docs/releases/1.1-beta-1.txt
M docs/releases/1.1.txt
M docs/releases/1.2.2.txt
M docs/releases/1.3-alpha-1.txt
M docs/releases/1.3.txt
M docs/releases/1.4.6.txt
A docs/releases/1.4.7.txt
M docs/releases/1.5.2.txt
A docs/releases/1.5.3.txt
M docs/releases/1.6.txt
M docs/releases/1.7.txt
M docs/releases/index.txt
M docs/topics/auth/customizing.txt
M docs/topics/cache.txt
M docs/topics/db/optimization.txt
M docs/topics/testing/advanced.txt
M docs/topics/testing/overview.txt
M tests/admin_custom_urls/__init__.py
M tests/admin_views/tests.py
M tests/admin_widgets/tests.py
M tests/aggregation/tests.py
M tests/aggregation_regress/tests.py
M tests/bash_completion/__init__.py
M tests/bash_completion/management/__init__.py
M tests/bash_completion/management/commands/__init__.py
M tests/comment_tests/tests/__init__.py
M tests/conditional_processing/__init__.py
M tests/delete_regress/__init__.py
M tests/dispatch/__init__.py
M tests/dispatch/tests/__init__.py
M tests/distinct_on_fields/__init__.py
M tests/distinct_on_fields/tests.py
M tests/expressions_regress/tests.py
M tests/file_storage/__init__.py
M tests/file_uploads/tests.py
M tests/files/__init__.py
M tests/files/tests.py
M tests/fixtures/__init__.py
M tests/fixtures/tests.py
M tests/fixtures_model_package/__init__.py
M tests/forms_tests/tests/__init__.py
M tests/forms_tests/tests/test_forms.py
M tests/httpwrappers/tests.py
M tests/i18n/tests.py
M tests/inspectdb/__init__.py
M tests/inspectdb/tests.py
M tests/introspection/tests.py
M tests/invalid_models/__init__.py
M tests/m2m_signals/__init__.py
M tests/m2m_through/__init__.py
M tests/m2m_through_regress/__init__.py
M tests/mail/__init__.py
M tests/mail/tests.py
M tests/max_lengths/__init__.py
M tests/migrations/test_writer.py
M tests/model_package/__init__.py
M tests/model_regress/tests.py
M tests/queryset_pickle/tests.py
M tests/requests/__init__.py
M tests/select_for_update/__init__.py
M tests/serializers/tests.py
M tests/syndication/feeds.py
M tests/syndication/tests.py
M tests/template_tests/filters.py
M tests/template_tests/test_parser.py
M tests/template_tests/tests.py
M tests/test_client/tests.py
M tests/test_client/urls.py
M tests/test_client/views.py
M tests/test_runner/test_discover_runner.py
M tests/timezones/tests.py
M tests/unmanaged_models/__init__.py
M tests/utils_tests/test_dateformat.py
M tests/utils_tests/test_dateparse.py
M tests/utils_tests/test_feedgenerator.py
M tests/utils_tests/test_module/__init__.py
A tests/utils_tests/test_module/another_bad_module.py
A tests/utils_tests/test_module/another_good_module.py
M tests/utils_tests/test_module_loading.py
M tests/utils_tests/test_timesince.py
M tests/utils_tests/test_timezone.py
M tests/utils_tests/test_tzinfo.py
M tests/view_tests/app0/__init__.py
M tests/view_tests/app1/__init__.py
M tests/view_tests/app2/__init__.py
M tests/view_tests/app3/__init__.py
M tests/view_tests/app4/__init__.py
M tests/view_tests/tests/__init__.py

Log Message:
-----------
Merge branch 'master' of https://github.com/django/django


Compare: https://github.com/django/django/compare/ff723d894d92...5c645ec81a87