Use context manager

diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py
index eaab761c394a4a42c6c942fac49ab1ad8e33563c..dde886e652b9428f075101e8558e2c4bfa14c5b5 100644 (file)
--- 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 8a5429622563bd8cb4e7ced77c082409f0f973a8..3c0e6668254584d2e5c62ec61ea14a6220a57ad2 100644 (file)
--- 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'