Skip to content

Commit 25165ad

Browse files
waprinJon Wayne Parrott
authored and
Jon Wayne Parrott
committed
Refactor Django helpers (googleapis#546)
* Move all Django code into contrib.django_util. * Add DjangORMStorage. This is backwards compatible with old django_orm storage. * Add new functionality to decorators and views that integrate with Django ORM-based storage. * Fix issue where Django storage always creates new Models. * Move tests into Django package and have them create an actual test app to create test databases etc. * Remove FlowField.
1 parent 3ba3c60 commit 25165ad

26 files changed

+1526
-996
lines changed

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# settings module and load it. This assumes django has been installed
1313
# (but it must be for the docs to build), so if it has not already
1414
# been installed run `pip install -r docs/requirements.txt`.
15-
os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.contrib.test_django_settings'
15+
os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.contrib.django_util.settings'
1616
import django
1717
import mock
1818
from pkg_resources import get_distribution

docs/source/oauth2client.contrib.django_orm.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
oauth2client.contrib.django_util.models module
2+
==============================================
3+
4+
.. automodule:: oauth2client.contrib.django_util.models
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

docs/source/oauth2client.contrib.django_util.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Submodules
88

99
oauth2client.contrib.django_util.apps
1010
oauth2client.contrib.django_util.decorators
11+
oauth2client.contrib.django_util.models
1112
oauth2client.contrib.django_util.signals
1213
oauth2client.contrib.django_util.site
1314
oauth2client.contrib.django_util.storage

docs/source/oauth2client.contrib.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Submodules
1616
oauth2client.contrib.appengine
1717
oauth2client.contrib.devshell
1818
oauth2client.contrib.dictionary_storage
19-
oauth2client.contrib.django_orm
2019
oauth2client.contrib.flask_util
2120
oauth2client.contrib.gce
2221
oauth2client.contrib.keyring_storage

oauth2client/contrib/django_orm.py

Lines changed: 0 additions & 182 deletions
This file was deleted.

0 commit comments

Comments
 (0)