Merge remote branch 'source/master'

Conflicts: docs/narr/hooks.rst
author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> 2011-03-24 12:07:09 -0400
committer: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> 2011-03-24 12:07:09 -0400
commit: 95e799d074de2e81914d513b4c331df1e738c00e (patch)
tree: b3039037533610d8c86d82bb28f139d8a3777013 /docs/narr/MyProject
parent: 22d3253a26767501827d86b56db3a9b79bef6c4e (diff)
parent: b596e1812627c359908759d7a8d83c339f08e385 (diff)
download: pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.gz
pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.bz2
pyramid-95e799d074de2e81914d513b4c331df1e738c00e.zip
5 files changed, 176 insertions, 78 deletions
diff --git a/docs/narr/MyProject/MANIFEST.in b/docs/narr/MyProject/MANIFEST.in
new file mode 100644
index 000000000..fa1692163
--- /dev/null
+++ b/docs/narr/MyProject/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include myproject *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 48fc81b8c..29486ce56 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -20,7 +20,7 @@ port = 6543
 # Begin logging configuration
 
 [loggers]
-keys = root
+keys = root, myproject
 
 [handlers]
 keys = console
@@ -32,6 +32,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_myproject]
+level = DEBUG
+handlers =
+qualname = myproject
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
@@ -39,6 +44,6 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
 
 # End logging configuration
diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index 02fc00eeb..632c34876 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -1,76 +1,106 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head>
-	<title>The Pyramid Web Application Development Framework</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-	<meta name="keywords" content="python web application" />
-	<meta name="description" content="pyramid web application" />
-	<link rel="shortcut icon" href="${request.application_url}/static/favicon.ico" />
-	<link rel="stylesheet" href="${request.application_url}/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
-	<link href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" rel="stylesheet"  type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<!--[if lte IE 6]>
-	<link rel="stylesheet" href="${request.application_url}/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
-	<![endif]-->
+  <title>The Pyramid Web Application Development Framework</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="${request.static_url('myproject:static/favicon.ico')}" />
+  <link rel="stylesheet" 
+        href="${request.static_url('myproject:static/pylons.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" 
+        href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="${request.static_url('myproject:static/ie6.css')}"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
 </head>
 <body>
-	<div id="wrap">
-		<div id="top">
-			<div class="top align-center">
-				<div><img src="${request.application_url}/static/pyramid.png" width="750" height="169" alt="pyramid"/></div>
-			</div>
-		</div>
-		<div id="middle">
-			<div class="middle align-center">
-				<p class="app-welcome">
-					Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
-					the Pyramid web application development framework.
-				</p>
-			</div>
-		</div>
-		<div id="bottom">
-			<div class="bottom">
-				<div id="left" class="align-right">
-					<h2>Search documentation</h2>
-					<form method="get" action="http://docs.pylonshq.com/pyramid/dev/search.html">
-		      			<input type="text" id="q" name="q" value="" />
-		      			<input type="submit" id="x" value="Go" />
-		  			</form>
-				</div>
-				<div id="right" class="align-left">
-					<h2>Pyramid links</h2>
-					<ul class="links">
-						<li>
-							<a href="http://pylonshq.com">Pylons Website</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#api-documentation">API Documentation</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#tutorials">Tutorials</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#change-history">Change History</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#sample-applications">Sample Applications</a>
-						</li>
-						<li>
-							<a href="http://docs.pylonshq.com/pyramid/dev/#support-and-development">Support and Development</a>
-						</li>
-						<li>
-							<a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
-						</li>
-		  			</ul>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div id="footer">
-		<div class="footer">© Copyright 2008-2010, Agendaless Consulting.</div>
-	</div>
+  <div id="wrap">
+    <div id="top">
+      <div class="top align-center">
+        <div>
+          <img src="${request.static_url('myproject:static/pyramid.png')}"
+               width="750" height="169" alt="pyramid"/>
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-center">
+        <p class="app-welcome">
+          Welcome to <span class="app-name">${project}</span>,
+          an application generated by<br/>
+          the Pyramid web application development framework.
+        </p>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <div id="left" class="align-right">
+          <h2>Search documentation</h2>
+          <form method="get"
+                action="http://docs.pylonsproject.org/pyramid/dev/search.html">
+            <input type="text" id="q" name="q" value="" />
+            <input type="submit" id="x" value="Go" />
+          </form>
+        </div>
+        <div id="right" class="align-left">
+          <h2>Pyramid links</h2>
+          <ul class="links">
+            <li>
+              <a href="http://pylonsproject.org">
+                Pylons Website
+              </a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">
+                Narrative Documentation
+              </a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">
+                API Documentation
+              </a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">
+                Tutorials
+              </a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">
+                Change History
+              </a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">
+                Sample Applications
+              </a>
+            </li>
+            <li>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">
+                Support and Development
+              </a>
+            </li>
+            <li>
+              <a href="irc://irc.freenode.net#pyramid">
+                IRC Channel
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">&copy; Copyright 2008-2010, Agendaless Consulting.</div>
+  </div>
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py
index b14fb37af..5fa710278 100644
--- a/docs/narr/MyProject/myproject/tests.py
+++ b/docs/narr/MyProject/myproject/tests.py
@@ -1,15 +1,13 @@
 import unittest
 
-from pyramid.config import Configurator
 from pyramid import testing
 
 class ViewTests(unittest.TestCase):
     def setUp(self):
-        self.config = Configurator(autocommit=True)
-        self.config.begin()
+        self.config = testing.setUp()
 
     def tearDown(self):
-        self.config.end()
+        testing.tearDown()
 
     def test_my_view(self):
         from myproject.views import my_view
diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini
new file mode 100644
index 000000000..c1d0eee82
--- /dev/null
+++ b/docs/narr/MyProject/production.ini
@@ -0,0 +1,63 @@
+[app:MyProject]
+use = egg:MyProject
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+
+[filter:weberror]
+use = egg:WebError#error_catcher
+debug = false
+;error_log = 
+;show_exceptions_in_wsgi_errors = true
+;smtp_server = localhost
+;error_email = janitor@example.com
+;smtp_username = janitor
+;smtp_password = "janitor's password"
+;from_address = paste@localhost
+;error_subject_prefix = "Pyramid Error"
+;smtp_use_tls =
+;error_message =
+
+[pipeline:main]
+pipeline =
+    weberror
+    MyProject
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, myproject
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_myproject]
+level = INFO
+handlers =
+qualname = myproject
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
author	Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>	2011-03-24 12:07:09 -0400
committer	Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>	2011-03-24 12:07:09 -0400
commit	95e799d074de2e81914d513b4c331df1e738c00e (patch)
tree	b3039037533610d8c86d82bb28f139d8a3777013 /docs/narr/MyProject
parent	22d3253a26767501827d86b56db3a9b79bef6c4e (diff)
parent	b596e1812627c359908759d7a8d83c339f08e385 (diff)
download	pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.gz pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.bz2 pyramid-95e799d074de2e81914d513b4c331df1e738c00e.zip