From ccdcd2b494331255e2b77f22295f90b90c3fc275 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 6 Dec 2010 10:06:20 -0500 Subject: [PATCH] removed egg directory and modified set_config so it does not require pecan before calling conf --- .gitignore | 1 + pecan.egg-info/PKG-INFO | 10 ---------- pecan.egg-info/SOURCES.txt | 22 ---------------------- pecan.egg-info/dependency_links.txt | 1 - pecan.egg-info/entry_points.txt | 4 ---- pecan.egg-info/not-zip-safe | 1 - pecan.egg-info/requires.txt | 7 ------- pecan.egg-info/top_level.txt | 3 --- pecan/__init__.py | 2 +- templates/project/start.py_tmpl | 2 +- 10 files changed, 3 insertions(+), 50 deletions(-) create mode 100644 .gitignore delete mode 100644 pecan.egg-info/PKG-INFO delete mode 100644 pecan.egg-info/SOURCES.txt delete mode 100644 pecan.egg-info/dependency_links.txt delete mode 100644 pecan.egg-info/entry_points.txt delete mode 100644 pecan.egg-info/not-zip-safe delete mode 100644 pecan.egg-info/requires.txt delete mode 100644 pecan.egg-info/top_level.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..04c572a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +pecan.egg-info diff --git a/pecan.egg-info/PKG-INFO b/pecan.egg-info/PKG-INFO deleted file mode 100644 index cd59344..0000000 --- a/pecan.egg-info/PKG-INFO +++ /dev/null @@ -1,10 +0,0 @@ -Metadata-Version: 1.0 -Name: pecan -Version: 0.1dev -Summary: A WSGI object-dispatching web framework, in the spirit of TurboGears, only much much smaller, with many fewer dependencies. -Home-page: http://github.com/cleverdevil/pecan -Author: Jonathan LaCour -Author-email: jonathan@cleverdevil.org -License: BSD -Description: UNKNOWN -Platform: UNKNOWN diff --git a/pecan.egg-info/SOURCES.txt b/pecan.egg-info/SOURCES.txt deleted file mode 100644 index c1ce750..0000000 --- a/pecan.egg-info/SOURCES.txt +++ /dev/null @@ -1,22 +0,0 @@ -README -setup.cfg -setup.py -pecan/__init__.py -pecan/configuration.py -pecan/decorators.py -pecan/hooks.py -pecan/jsonify.py -pecan/pecan.py -pecan/rest.py -pecan/routing.py -pecan/secure.py -pecan/templating.py -pecan.egg-info/PKG-INFO -pecan.egg-info/SOURCES.txt -pecan.egg-info/dependency_links.txt -pecan.egg-info/entry_points.txt -pecan.egg-info/requires.txt -pecan.egg-info/top_level.txt -pecan.egg-info/zip-safe -templates/__init__.py -tests/templates/__init__.py \ No newline at end of file diff --git a/pecan.egg-info/dependency_links.txt b/pecan.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/pecan.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pecan.egg-info/entry_points.txt b/pecan.egg-info/entry_points.txt deleted file mode 100644 index 0dc6953..0000000 --- a/pecan.egg-info/entry_points.txt +++ /dev/null @@ -1,4 +0,0 @@ - - [paste.paster_create_template] - pecan-base = templates:NewProjectTemplate - \ No newline at end of file diff --git a/pecan.egg-info/not-zip-safe b/pecan.egg-info/not-zip-safe deleted file mode 100644 index 8b13789..0000000 --- a/pecan.egg-info/not-zip-safe +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pecan.egg-info/requires.txt b/pecan.egg-info/requires.txt deleted file mode 100644 index 5a27ea5..0000000 --- a/pecan.egg-info/requires.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebOb == 1.0.0 -WebCore == 1.0.0 -simplegeneric == 0.7 -Kajiki == 0.3.1 -Paste == 1.7.5.1 -PasteScript == 1.7.3 -formencode == 1.2.2 \ No newline at end of file diff --git a/pecan.egg-info/top_level.txt b/pecan.egg-info/top_level.txt deleted file mode 100644 index e2c770a..0000000 --- a/pecan.egg-info/top_level.txt +++ /dev/null @@ -1,3 +0,0 @@ -templates -tests -pecan diff --git a/pecan/__init__.py b/pecan/__init__.py index 16f4f2c..189d932 100644 --- a/pecan/__init__.py +++ b/pecan/__init__.py @@ -23,4 +23,4 @@ def make_app(root, static_root=None, debug=False, errorcfg={}, **kw): return app def set_config(name): - pecan.conf.update_with_module(name) + conf.update_with_module(name) diff --git a/templates/project/start.py_tmpl b/templates/project/start.py_tmpl index d42b6d5..b9457af 100644 --- a/templates/project/start.py_tmpl +++ b/templates/project/start.py_tmpl @@ -7,7 +7,7 @@ if __name__ == '__main__': sys.exit(1) runtime_conf = set_config(sys.argv[1]) - app_conf = runtime_conf.application + app_conf = runtime_conf.app serv_conf = runtime_conf.server app = make_app(