summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-18 04:22:19 -0500
committerChris McDonough <chrism@plope.com>2010-12-18 04:22:19 -0500
commitbbb9b5a5b1b97bf3c333a7fbfa68cc773ac9d263 (patch)
tree15a41901b480196e9e4f47b76b14fbb32f5ca9db
parent477e99f83a4ee19c2994ee14546cc0cc13800d61 (diff)
downloadpyramid-bbb9b5a5b1b97bf3c333a7fbfa68cc773ac9d263.tar.gz
pyramid-bbb9b5a5b1b97bf3c333a7fbfa68cc773ac9d263.tar.bz2
pyramid-bbb9b5a5b1b97bf3c333a7fbfa68cc773ac9d263.zip
spacing, note
-rw-r--r--CHANGES.txt2
-rw-r--r--pyramid/resource.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 282261769..3fd78d403 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -40,7 +40,7 @@ Terminology Changes
pyramid.testing.DummyResource
- All documentation which previously referred to "model" now refers to
- "resource".
+ "resource".
- The ``starter`` and ``starter_zcml`` paster templates now have a
``resources.py`` module instead of a ``models.py`` module.
diff --git a/pyramid/resource.py b/pyramid/resource.py
index 6c847ac1a..5e8f3c968 100644
--- a/pyramid/resource.py
+++ b/pyramid/resource.py
@@ -1,4 +1,4 @@
-""" Backwards compatibility shim module. """
+""" Backwards compatibility shim module (forever). """
from asset import * # b/w compat
resolve_resource_spec = resolve_asset_spec
resource_spec_from_abspath = asset_spec_from_abspath