summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-22 22:09:30 -0500
committerChris McDonough <chrism@plope.com>2012-02-22 22:09:30 -0500
commitb0ebdf0bf54b1eb40d714710e1fcaf24a055003e (patch)
tree8d6dcf05d708932b5506f797330afeef210c92ea
parentf2f67edd97b9525ae6c6a20a09a9afa9189c018e (diff)
downloadpyramid-b0ebdf0bf54b1eb40d714710e1fcaf24a055003e.tar.gz
pyramid-b0ebdf0bf54b1eb40d714710e1fcaf24a055003e.tar.bz2
pyramid-b0ebdf0bf54b1eb40d714710e1fcaf24a055003e.zip
- ``pyramid.config.Configurator.with_package`` didn't work if the
Configurator was an old-style ``pyramid.configuration.Configurator`` instance.
-rw-r--r--CHANGES.txt10
-rw-r--r--pyramid/configuration.py2
-rw-r--r--pyramid/tests/test_configuration.py6
3 files changed, 18 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index bcedb19a1..d07d49f8b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- ``pyramid.config.Configurator.with_package`` didn't work if the
+ Configurator was an old-style ``pyramid.configuration.Configurator``
+ instance.
+
1.3a9 (2012-02-22)
==================
diff --git a/pyramid/configuration.py b/pyramid/configuration.py
index f6543906e..802c10d1f 100644
--- a/pyramid/configuration.py
+++ b/pyramid/configuration.py
@@ -29,6 +29,7 @@ class Configurator(BaseConfigurator):
session_factory=None,
autocommit=True,
route_prefix=None,
+ introspection=True,
):
if package is None:
package = caller_package()
@@ -49,6 +50,7 @@ class Configurator(BaseConfigurator):
session_factory=session_factory,
autocommit=autocommit,
route_prefix=route_prefix,
+ introspection=introspection,
)
deprecated(
diff --git a/pyramid/tests/test_configuration.py b/pyramid/tests/test_configuration.py
index 688a597f6..0a98bcb5c 100644
--- a/pyramid/tests/test_configuration.py
+++ b/pyramid/tests/test_configuration.py
@@ -22,4 +22,10 @@ class ConfiguratorTests(unittest.TestCase):
config = self._makeOne(package='pyramid')
self.assertEqual(config.package, pyramid)
+ def test_with_package(self):
+ import pyramid
+ config = self._makeOne()
+ newconfig = config.with_package('pyramid')
+ self.assertEqual(newconfig.package, pyramid)
+