From ba85e591d563ed654f492f7cab5ca492a32a86d7 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 13 Mar 2014 18:17:43 -0400
Subject: Strip redundant logging config from tutorial INI files.

Leave it for the 'logging' and 'scaffolds' sections, where it is germane.
---
 docs/quick_tutorial/jinja2/development.ini | 31 ------------------------------
 1 file changed, 31 deletions(-)

(limited to 'docs/quick_tutorial/jinja2')

diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini
index 62e0c5123..4d47e54a5 100644
--- a/docs/quick_tutorial/jinja2/development.ini
+++ b/docs/quick_tutorial/jinja2/development.ini
@@ -8,34 +8,3 @@ pyramid.includes =
 use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
-
-# Begin logging configuration
-
-[loggers]
-keys = root, tutorial
-
-[logger_tutorial]
-level = DEBUG
-handlers =
-qualname = tutorial
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[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
-- 
cgit v1.2.3


From c688c70fb2bf6731bbdbf68682eebb203b540a04 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 2 Jul 2014 14:36:27 -0400
Subject: dont need to use any settings, we include pyramid_jinja2 in main

---
 docs/quick_tutorial/jinja2/tutorial/tests.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'docs/quick_tutorial/jinja2')

diff --git a/docs/quick_tutorial/jinja2/tutorial/tests.py b/docs/quick_tutorial/jinja2/tutorial/tests.py
index 0b22946f3..4381235ec 100644
--- a/docs/quick_tutorial/jinja2/tutorial/tests.py
+++ b/docs/quick_tutorial/jinja2/tutorial/tests.py
@@ -30,13 +30,7 @@ class TutorialViewTests(unittest.TestCase):
 class TutorialFunctionalTests(unittest.TestCase):
     def setUp(self):
         from tutorial import main
-
-        settings = {
-            'pyramid.includes': [
-                'pyramid_jinja2'
-            ]
-        }
-        app = main({}, **settings)
+        app = main({})
         from webtest import TestApp
 
         self.testapp = TestApp(app)
-- 
cgit v1.2.3