aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBill Prin <waprin@gmail.com>2016-07-26 12:04:48 -0700
committerJon Wayne Parrott <jonwayne@google.com>2016-07-26 12:04:48 -0700
commit25165adbc18101567ac0b75b086a072745b07f41 (patch)
tree828e1c431dc068628cc6f0347befe4ffd971fee6 /docs
parent3ba3c60b3eab5939c78d872362aef4e2052cc8b9 (diff)
downloadoauth2client-25165adbc18101567ac0b75b086a072745b07f41.tar.gz
Refactor Django helpers (#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.
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py2
-rw-r--r--docs/source/oauth2client.contrib.django_orm.rst7
-rw-r--r--docs/source/oauth2client.contrib.django_util.models.rst7
-rw-r--r--docs/source/oauth2client.contrib.django_util.rst1
-rw-r--r--docs/source/oauth2client.contrib.rst1
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 85077e1..1b4663b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,7 +12,7 @@ import sys
# settings module and load it. This assumes django has been installed
# (but it must be for the docs to build), so if it has not already
# been installed run `pip install -r docs/requirements.txt`.
-os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.contrib.test_django_settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.contrib.django_util.settings'
import django
import mock
from pkg_resources import get_distribution
diff --git a/docs/source/oauth2client.contrib.django_orm.rst b/docs/source/oauth2client.contrib.django_orm.rst
deleted file mode 100644
index e4d1656..0000000
--- a/docs/source/oauth2client.contrib.django_orm.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-oauth2client.contrib.django_orm module
-======================================
-
-.. automodule:: oauth2client.contrib.django_orm
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/source/oauth2client.contrib.django_util.models.rst b/docs/source/oauth2client.contrib.django_util.models.rst
new file mode 100644
index 0000000..4be59d3
--- /dev/null
+++ b/docs/source/oauth2client.contrib.django_util.models.rst
@@ -0,0 +1,7 @@
+oauth2client.contrib.django_util.models module
+==============================================
+
+.. automodule:: oauth2client.contrib.django_util.models
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/source/oauth2client.contrib.django_util.rst b/docs/source/oauth2client.contrib.django_util.rst
index c1a423d..f60195a 100644
--- a/docs/source/oauth2client.contrib.django_util.rst
+++ b/docs/source/oauth2client.contrib.django_util.rst
@@ -8,6 +8,7 @@ Submodules
oauth2client.contrib.django_util.apps
oauth2client.contrib.django_util.decorators
+ oauth2client.contrib.django_util.models
oauth2client.contrib.django_util.signals
oauth2client.contrib.django_util.site
oauth2client.contrib.django_util.storage
diff --git a/docs/source/oauth2client.contrib.rst b/docs/source/oauth2client.contrib.rst
index a06b48f..44be6f9 100644
--- a/docs/source/oauth2client.contrib.rst
+++ b/docs/source/oauth2client.contrib.rst
@@ -16,7 +16,6 @@ Submodules
oauth2client.contrib.appengine
oauth2client.contrib.devshell
oauth2client.contrib.dictionary_storage
- oauth2client.contrib.django_orm
oauth2client.contrib.flask_util
oauth2client.contrib.gce
oauth2client.contrib.keyring_storage