summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkmcclain <mark.mcclain@dreamhost.com>2013-03-12 15:08:30 -0700
committermarkmcclain <mark.mcclain@dreamhost.com>2013-03-12 15:08:30 -0700
commite98ead72c47abe52134677a399c49a9cdb90f48f (patch)
tree642ccd539b69f9c64a05031bd7f66e57db3d1cca
parent6fe9a0120ae8c20d838a3148950dddf3999a148b (diff)
parent870d750fe6b08980ffd2cb7706657d57e40b959f (diff)
downloadpecan-e98ead72c47abe52134677a399c49a9cdb90f48f.tar.gz
Merge pull request #195 from ryanpetrello/next
Attempt to resolve an issue that causes tests to fail in Travis-CI.
-rw-r--r--pecan/core.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/pecan/core.py b/pecan/core.py
index 8817ac6..5897988 100644
--- a/pecan/core.py
+++ b/pecan/core.py
@@ -138,15 +138,13 @@ def render(template, namespace):
return state.app.render(template, namespace)
-def load_app(config=None):
+def load_app(config):
'''
Used to load a ``Pecan`` application and its environment based on passed
configuration.
:param config: Can be a dictionary containing configuration, a string which
- represents a (relative) configuration filename or ``None``
- which will fallback to get the ``PECAN_CONFIG`` env
- variable.
+ represents a (relative) configuration filename
returns a pecan.Pecan object
'''