summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-01-04 23:14:52 +0000
committerChris McDonough <chrism@agendaless.com>2010-01-04 23:14:52 +0000
commit791a23ffbba7d22f2b66a04868f76fd97740d618 (patch)
tree17fb65970a21302ce70dd6130e3de07568a58220
parent6c67d224da50016153689219fa2f67060ba471e4 (diff)
downloadpyramid-791a23ffbba7d22f2b66a04868f76fd97740d618.tar.gz
pyramid-791a23ffbba7d22f2b66a04868f76fd97740d618.tar.bz2
pyramid-791a23ffbba7d22f2b66a04868f76fd97740d618.zip
- Make ``paster bfgshell`` and ``paster create -t bfg_xxx`` work on
Jython (fix minor incompatibility with treatment of ``__doc__`` at the class level).
-rw-r--r--CHANGES.txt12
-rw-r--r--repoze/bfg/paster.py7
2 files changed, 14 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b1ad4dd0..554c05d4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,12 @@
-After 1.2a10 (unreleased)
-=========================
+Next Release
+============
-Bugs Fixed
-----------
+Bug Fixes
+---------
+
+- Make ``paster bfgshell`` and ``paster create -t bfg_xxx`` work on
+ Jython (fix minor incompatibility with treatment of ``__doc__`` at
+ the class level).
- Updated dependency on ``WebOb`` to require a version which supports
features now used in tests.
diff --git a/repoze/bfg/paster.py b/repoze/bfg/paster.py
index 967d9b72e..452c13fc5 100644
--- a/repoze/bfg/paster.py
+++ b/repoze/bfg/paster.py
@@ -65,7 +65,6 @@ class BFGShellCommand(Command):
"""
summary = "Open an interactive shell with a repoze.bfg app loaded"
- usage = '\n' + __doc__
min_args = 2
max_args = 2
@@ -82,6 +81,12 @@ class BFGShellCommand(Command):
IPShell = IPShell # for testing
verbose = 3
+ def __init__(self, *arg, **kw):
+ # needs to be in constructor to support Jython (used to be at class
+ # scope as ``usage = '\n' + __doc__``.
+ self.usage = '\n' + self.__doc__
+ Command.__init__(self, *arg, **kw)
+
def command(self):
cprt =('Type "help" for more information. "root" is the BFG app '
'root object.')