From bf84a48501242800ba975240fd8a4327bc51b6ef Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@meme.com>
Date: Thu, 1 Nov 2018 19:51:37 -0500
Subject: [PATCH] Use context manager

---
 src/pgwui_server/__init__.py | 5 ++---
 tests/test___init__.py       | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py
index eaab761..dde886e 100644
--- a/src/pgwui_server/__init__.py
+++ b/src/pgwui_server/__init__.py
@@ -27,9 +27,8 @@ from pyramid.config import Configurator
 
 def pgwui_server_config(settings):
     rp = settings.get('pgwui.route_prefix')
-    config = Configurator(settings=settings,
-                          route_prefix=rp)
-    config.include('pgwui_common')
+    with Configurator(settings=settings, route_prefix=rp) as config:
+        config.include('pgwui_common')
     return config
 
 
diff --git a/tests/test___init__.py b/tests/test___init__.py
index 8a54296..3c0e666 100644
--- a/tests/test___init__.py
+++ b/tests/test___init__.py
@@ -22,10 +22,17 @@
 import pgwui_server.__init__ as pgwui_server_init
 
 
+# Use contextlib.AbstractContextManager for Python >= 3.6
 class MockConfigurator():
     def __init__(self, **kwargs):
         pass
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        pass
+
     def make_wsgi_app(self):
         return 'wsgi_app'
 
-- 
2.34.1