summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-03 23:14:53 -0400
committerChris McDonough <chrism@plope.com>2011-09-03 23:14:53 -0400
commitd54b1066219cd4fca5ccaa8fc39f9c83ef355d31 (patch)
treec4183c0ab1db3da35a0b2a0efb42df6f68d52382
parentd94e4dada6baf4962af9fb57b4493998bf2862bd (diff)
downloadpyramid-d54b1066219cd4fca5ccaa8fc39f9c83ef355d31.tar.gz
pyramid-d54b1066219cd4fca5ccaa8fc39f9c83ef355d31.tar.bz2
pyramid-d54b1066219cd4fca5ccaa8fc39f9c83ef355d31.zip
another credit
-rw-r--r--pyramid/config/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 89802513f..8ee0bfac4 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -1025,6 +1025,7 @@ def resolveConflicts(actions):
return r
+# this function is licensed under the ZPL (stolen from Zope)
def expand_action(discriminator, callable=None, args=(), kw=None,
includepath=(), info='', order=0):
if kw is None: