diff options
| -rw-r--r-- | TODO.txt | 2 | ||||
| -rw-r--r-- | docs/designdefense.rst | 22 | ||||
| -rw-r--r-- | docs/tutorials/catalog/index.rst | 10 | ||||
| -rw-r--r-- | docs/tutorials/modwsgi/index.rst | 2 | ||||
| -rw-r--r-- | pyramid/testing.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_docs.py | 2 |
6 files changed, 21 insertions, 19 deletions
@@ -85,3 +85,5 @@ - Try to get rid of Mako Beaker dependency. - Maybe make renderer globals lookup send an event? + +- bfgshell diff --git a/docs/designdefense.rst b/docs/designdefense.rst index 8242d7d81..c437f18d9 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -760,7 +760,7 @@ code. Pyramid Is Too Big ------------------ -"The :mod:`pyramid` compressed tarball is 1MB. It must be +"The :mod:`pyramid` compressed tarball is almost 2MB. It must be enormous!" No. We just ship it with test code and helper templates. Here's a @@ -768,26 +768,26 @@ breakdown of what's included in subdirectories of the package tree: docs/ - 2.2MB + 3.0MB -repoze/bfg/tests +pyramid/tests/ - 580KB + 1.1MB -repoze/bfg/paster_templates +pyramid/paster_templates/ - 372KB + 804KB -repoze/bfg (except for ``repoze/bfg/tests and repoze/bfg/paster_templates``) +pyramid/ (except for ``pyramd/tests and pyramid/paster_templates``) - 316K + 539K -The actual :mod:`pyramid` runtime code is about 10% of the total -size of the tarball omitting docs, helper templates used for package +The actual :mod:`pyramid` runtime code is about 10% of the total size +of the tarball omitting docs, helper templates used for package generation, and test code. Of the approximately 13K lines of Python code in the package, the code that actually has a chance of executing during normal operation, excluding tests and paster template Python -files, accounts for approximately 3K lines of Python code. This is +files, accounts for approximately 5K lines of Python code. This is comparable to Pylons, which ships with a little over 2K lines of Python code, excluding tests. diff --git a/docs/tutorials/catalog/index.rst b/docs/tutorials/catalog/index.rst index 9a5bbfb2f..424286bd9 100644 --- a/docs/tutorials/catalog/index.rst +++ b/docs/tutorials/catalog/index.rst @@ -1,7 +1,7 @@ .. _catalog_tutorial: -Using :mod:`repoze.catalog` Within :mod:`repoze.bfg` -==================================================== +Using :mod:`repoze.catalog` Within :mod:`pyramid` +================================================= :mod:`repoze.catalog` is a ZODB-based system that can be used to index Python objects. It also offers a query interface for retrieving @@ -83,12 +83,12 @@ want the application to be based on :term:`traversal`. .. code-block:: text - [chrism@snowpro sess]$ ../bin/paster --plugin=repoze.bfg bfgshell \ + [chrism@snowpro sess]$ ../bin/paster --plugin=pyramid bfgshell \ myapp.ini myapp Python 2.5.4 (r254:67916, Sep 4 2009, 02:12:16) [GCC 4.2.1 (Apple Inc. build 5646)] on darwin Type "help" for more information. "root" is the BFG app root object. - >>> from repoze.bfg.traversal import model_path + >>> from pyramid.traversal import model_path >>> from myapp.models import Document >>> root['name'] = Document('title') >>> doc = root['name'] @@ -107,7 +107,7 @@ or from within a ``bfgshell`` session to update the set of indexes used by your application. In :term:`view` code, you should be able to get a hold of the root -object via the :func:`repoze.bfg.traversal.find_root` API. The +object via the :func:`pyramid.traversal.find_root` API. The ``catalog`` attribute of that root object will represent the catalog previously added. diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst index 5572e300b..8b429a0c8 100644 --- a/docs/tutorials/modwsgi/index.rst +++ b/docs/tutorials/modwsgi/index.rst @@ -54,7 +54,7 @@ commands and files. .. code-block:: text $ cd ~/modwsgi/env - $ bin/easy_install repoze.bfg + $ bin/easy_install pyramid #. Create and install your :mod:`pyramid` application. For the purposes of this tutorial, we'll just be using the ``bfg_starter`` diff --git a/pyramid/testing.py b/pyramid/testing.py index 5d54af9e9..188485635 100644 --- a/pyramid/testing.py +++ b/pyramid/testing.py @@ -55,7 +55,7 @@ def registerDummySecurityPolicy(userid=None, groupids=(), permissive=True): .. warning:: This API is deprecated as of :mod:`pyramid` 1.0. Instead use the - :meth:`repoze.bfg.configuration.Configurator.testing_securitypolicy` + :meth:`pyramid.configuration.Configurator.testing_securitypolicy` method in your unit and integration tests. """ registry = get_current_registry() diff --git a/pyramid/tests/test_docs.py b/pyramid/tests/test_docs.py index a00171842..bf06c7ca6 100644 --- a/pyramid/tests/test_docs.py +++ b/pyramid/tests/test_docs.py @@ -20,7 +20,7 @@ if 0: m += manuel.capture.Manuel() docs = [] - egg_path = pkg_resources.get_distribution('repoze.bfg').location + egg_path = pkg_resources.get_distribution('pyramid').location path = os.path.join(egg_path, 'docs') for root, dirs, files in os.walk(path): for ignore in ('.svn', '.build', '.hg', '.git', 'CVS'): |