summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-07 08:52:37 -0400
committerChris McDonough <chrism@plope.com>2011-10-07 08:52:37 -0400
commitda8e2a8a84a36245eb601d6069e6ffd2a1947f46 (patch)
tree08f2a60acd4f0e38e1a9547cf84537c693961cb3
parent1475676963d24559aaf4dda88ec303a2f76d2479 (diff)
downloadpyramid-da8e2a8a84a36245eb601d6069e6ffd2a1947f46.tar.gz
pyramid-da8e2a8a84a36245eb601d6069e6ffd2a1947f46.tar.bz2
pyramid-da8e2a8a84a36245eb601d6069e6ffd2a1947f46.zip
docstring fixes
-rw-r--r--pyramid/config/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index b55a7a9e4..40c3c037b 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -669,10 +669,9 @@ class Configurator(
@classmethod
def with_context(cls, context):
- """A classmethod used by ZCML directives,
- :meth:`pyramid.config.Configurator.with_package`, and
- :meth:`pyramid.config.Configurator.include` to obtain a configurator
- with 'the right' context. Returns a new Configurator instance."""
+ """A classmethod used by ``pyramid_zcml`` directives to obtain a
+ configurator with 'the right' context. Returns a new Configurator
+ instance."""
configurator = cls(
registry=context.registry,
package=context.package,
@@ -823,7 +822,8 @@ class Configurator(
# this class is licensed under the ZPL (stolen from Zope)
class ActionState(object):
def __init__(self):
- self.actions = [] # NB "actions" is an API, dep'd upon by pyramid_zcml
+ # NB "actions" is an API, dep'd upon by pyramid_zcml's load_zcml func
+ self.actions = []
self._seen_files = set()
def processSpec(self, spec):