From 55e222702262b458fb56a36af8be2b48f2db76d9 Mon Sep 17 00:00:00 2001 From: Christophe de Vienne Date: Sun, 12 Aug 2012 14:27:00 +0200 Subject: [PATCH] Remove the wsgi adapter, it is now a function on WSRoot --- wsme/root.py | 5 +++++ wsme/tests/protocol.py | 4 +--- wsme/wsgi.py | 5 ----- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 wsme/wsgi.py diff --git a/wsme/root.py b/wsme/root.py index 1ec3e56..98ab8cf 100644 --- a/wsme/root.py +++ b/wsme/root.py @@ -92,6 +92,11 @@ class WSRoot(object): self._api = None + def wsgiapp(self): + """Returns a wsgi""" + from webob.dec import wsgify + return wsgify(self._handle_request) + def begin(self): if self._transaction: return self._transaction.begin() diff --git a/wsme/tests/protocol.py b/wsme/tests/protocol.py index 472f592..2a7cebb 100644 --- a/wsme/tests/protocol.py +++ b/wsme/tests/protocol.py @@ -4,7 +4,6 @@ import unittest import warnings import datetime import decimal -import base64 import sys import six @@ -14,7 +13,6 @@ from webtest import TestApp from wsme import WSRoot, Unset from wsme import expose, validate -import wsme.wsgi import wsme.types warnings.filterwarnings('ignore', module='webob.dec') @@ -303,7 +301,7 @@ class ProtocolTestCase(unittest.TestCase): self.root.getapi() self.root.addprotocol(self.protocol, **self.protocol_options) - self.app = TestApp(wsme.wsgi.adapt(self.root)) + self.app = TestApp(self.root.wsgiapp()) def test_invalid_path(self): try: diff --git a/wsme/wsgi.py b/wsme/wsgi.py deleted file mode 100644 index dd72fc5..0000000 --- a/wsme/wsgi.py +++ /dev/null @@ -1,5 +0,0 @@ -from webob.dec import wsgify - - -def adapt(root): - return wsgify(root._handle_request)