From bda1306749c62ef4f11cfe567ed7d56c8ad94240 Mon Sep 17 00:00:00 2001
From: Michael Merickel <github@m.merickel.org>
Date: Mon, 15 Oct 2018 16:56:42 +0200
Subject: [PATCH] Merge pull request #3388 from mmerickel/black

---
 tests/test_scripting.py |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/test_scripting.py b/tests/test_scripting.py
index ed88bb4..8f74f35 100644
--- a/tests/test_scripting.py
+++ b/tests/test_scripting.py
@@ -1,8 +1,10 @@
 import unittest
 
+
 class Test_get_root(unittest.TestCase):
     def _callFUT(self, app, request=None):
         from pyramid.scripting import get_root
+
         return get_root(app, request)
 
     def _makeRegistry(self):
@@ -10,6 +12,7 @@
 
     def setUp(self):
         from pyramid.threadlocal import manager
+
         self.manager = manager
         self.default = manager.get()
 
@@ -38,9 +41,11 @@
         closer()
         self.assertEqual(self.default, self.manager.get())
 
+
 class Test_prepare(unittest.TestCase):
     def _callFUT(self, request=None, registry=None):
         from pyramid.scripting import prepare
+
         return prepare(request, registry)
 
     def _makeRegistry(self, L=None):
@@ -50,11 +55,13 @@
 
     def setUp(self):
         from pyramid.threadlocal import manager
+
         self.manager = manager
         self.default = manager.get()
 
     def test_it_no_valid_apps(self):
         from pyramid.exceptions import ConfigurationError
+
         self.assertRaises(ConfigurationError, self._callFUT)
 
     def test_it_norequest(self):
@@ -114,12 +121,13 @@
         request.context = context
         registry = request.registry = self._makeRegistry()
         info = self._callFUT(request=request, registry=registry)
-        root, closer, root = info['root'], info['closer'], info['root']
+        closer = info['closer']
         closer()
         self.assertEqual(request.context, context)
 
     def test_it_with_extensions(self):
         from pyramid.util import InstancePropertyHelper
+
         exts = DummyExtensions()
         ext_method = lambda r: 'bar'
         name, fn = InstancePropertyHelper.make_property(ext_method, 'foo')
@@ -128,7 +136,7 @@
         registry = request.registry = self._makeRegistry([exts, DummyFactory])
         info = self._callFUT(request=request, registry=registry)
         self.assertEqual(request.foo, 'bar')
-        root, closer = info['root'], info['closer']
+        closer = info['closer']
         closer()
 
     def test_it_is_a_context_manager(self):
@@ -143,18 +151,22 @@
             self.assertEqual(pushed['request'].registry, registry)
             self.assertEqual(root.a, (request,))
             orig_closer = info['closer']
+
             def closer():
                 orig_closer()
                 closer_called[0] = True
+
             info['closer'] = closer
         self.assertTrue(closer_called[0])
         self.assertEqual(self.default, self.manager.get())
         self.assertEqual(request.context, root)
         self.assertEqual(request.registry, registry)
 
+
 class Test__make_request(unittest.TestCase):
     def _callFUT(self, path='/', registry=None):
         from pyramid.scripting import _make_request
+
         return _make_request(path, registry)
 
     def _makeRegistry(self):
@@ -168,6 +180,7 @@
 
     def test_it_with_no_registry(self):
         from pyramid.config import global_registries
+
         registry = self._makeRegistry()
         global_registries.add(registry)
         try:
@@ -177,10 +190,13 @@
         finally:
             global_registries.empty()
 
+
 class Dummy:
     pass
 
+
 dummy_root = Dummy()
+
 
 class DummyFactory(object):
     @classmethod
@@ -192,14 +208,16 @@
         self.a = a
         self.kw = kw
 
+
 class DummyRegistry(object):
     def __init__(self, utilities):
         self.utilities = utilities
 
-    def queryUtility(self, iface, default=None): # pragma: no cover
+    def queryUtility(self, iface, default=None):  # pragma: no cover
         if self.utilities:
             return self.utilities.pop(0)
         return default
+
 
 class DummyApp:
     def __init__(self, registry=None):
@@ -209,12 +227,15 @@
     def root_factory(self, environ):
         return dummy_root
 
+
 class DummyRequest(object):
     matchdict = None
     matched_route = None
+
     def __init__(self, environ):
         self.environ = environ
 
+
 class DummyExtensions:
     def __init__(self):
         self.descriptors = {}

--
Gitblit v1.9.3