diff --git a/docs/dal.adapters.rst b/docs/dal.adapters.rst deleted file mode 100644 index bef54380..00000000 --- a/docs/dal.adapters.rst +++ /dev/null @@ -1,150 +0,0 @@ -gluon.dal.adapters package -========================== - -Submodules ----------- - -gluon.dal.adapters.base module ------------------------------- - -.. automodule:: gluon.dal.adapters.base - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.couchdb module ---------------------------------- - -.. automodule:: gluon.dal.adapters.couchdb - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.cubrid module --------------------------------- - -.. automodule:: gluon.dal.adapters.cubrid - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.db2 module ------------------------------ - -.. automodule:: gluon.dal.adapters.db2 - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.firebird module ----------------------------------- - -.. automodule:: gluon.dal.adapters.firebird - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.google module --------------------------------- - -.. automodule:: gluon.dal.adapters.google - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.imap module ------------------------------- - -.. automodule:: gluon.dal.adapters.imap - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.informix module ----------------------------------- - -.. automodule:: gluon.dal.adapters.informix - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.ingres module --------------------------------- - -.. automodule:: gluon.dal.adapters.ingres - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.mongo module -------------------------------- - -.. automodule:: gluon.dal.adapters.mongo - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.mssql module -------------------------------- - -.. automodule:: gluon.dal.adapters.mssql - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.mysql module -------------------------------- - -.. automodule:: gluon.dal.adapters.mysql - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.oracle module --------------------------------- - -.. automodule:: gluon.dal.adapters.oracle - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.postgre module ---------------------------------- - -.. automodule:: gluon.dal.adapters.postgre - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.sapdb module -------------------------------- - -.. automodule:: gluon.dal.adapters.sapdb - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.sqlite module --------------------------------- - -.. automodule:: gluon.dal.adapters.sqlite - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.adapters.teradata module ----------------------------------- - -.. automodule:: gluon.dal.adapters.teradata - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- - -.. automodule:: gluon.dal.adapters - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/dal.helpers.rst b/docs/dal.helpers.rst deleted file mode 100644 index bc146429..00000000 --- a/docs/dal.helpers.rst +++ /dev/null @@ -1,38 +0,0 @@ -gluon.dal.helpers package -========================= - -Submodules ----------- - -gluon.dal.helpers.classes module --------------------------------- - -.. automodule:: gluon.dal.helpers.classes - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.helpers.methods module --------------------------------- - -.. automodule:: gluon.dal.helpers.methods - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.helpers.regex module ------------------------------- - -.. automodule:: gluon.dal.helpers.regex - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- - -.. automodule:: gluon.dal.helpers - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/dal.rst b/docs/dal.rst index 90c1564e..d3d9aa27 100644 --- a/docs/dal.rst +++ b/docs/dal.rst @@ -1,44 +1,8 @@ -gluon.dal package -================= -Subpackages ------------ +:mod:`dal` Module +------------------- -.. toctree:: - - dal.adapters - dal.helpers - -Submodules ----------- - -gluon.dal.base module ---------------------- - -.. automodule:: gluon.dal.base - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.connection module ---------------------------- - -.. automodule:: gluon.dal.connection - :members: - :undoc-members: - :show-inheritance: - -gluon.dal.objects module ------------------------- - -.. automodule:: gluon.dal.objects - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- +Go to http://pydal.readthedocs.org/en/latest/ for docs on pyDAL .. automodule:: gluon.dal :members: diff --git a/docs/index.rst b/docs/index.rst index b113c737..d23a2bae 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -27,7 +27,7 @@ Contents: myregex newcron portalocker - reserved_sql_keywords + recfile restricted rewrite sanitizer diff --git a/docs/recfile.rst b/docs/recfile.rst new file mode 100644 index 00000000..642d85bc --- /dev/null +++ b/docs/recfile.rst @@ -0,0 +1,8 @@ + +:mod:`recfile` Module +---------------------- + +.. automodule:: gluon.recfile + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/reserved_sql_keywords.rst b/docs/reserved_sql_keywords.rst deleted file mode 100644 index c9db97b7..00000000 --- a/docs/reserved_sql_keywords.rst +++ /dev/null @@ -1,9 +0,0 @@ - -:mod:`reserved_sql_keywords` Module ------------------------------------ - - -.. automodule:: gluon.reserved_sql_keywords - :members: - :undoc-members: - :show-inheritance: diff --git a/gluon/dal.py b/gluon/dal.py index a970e88a..8bfcac02 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1,4 +1,15 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- + +""" +| This file is part of the web2py Web Framework +| Copyrighted by Massimo Di Pierro +| License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) + +Takes care of adapting pyDAL to web2py's needs +-------------------------------------------- +""" + from pydal import DAL as pyDAL from pydal import Field, SQLCustomType, geoPoint, geoLine, geoPolygon diff --git a/gluon/recfile.py b/gluon/recfile.py index 1013f66a..34f191b7 100755 --- a/gluon/recfile.py +++ b/gluon/recfile.py @@ -1,3 +1,14 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +| This file is part of the web2py Web Framework +| Copyrighted by Massimo Di Pierro +| License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) + +Generates names for cache and session files +-------------------------------------------- +""" import os, uuid def generate(filename, depth=2, base=512):