pytest_httpserver: import API classes into namespace

csernazs · csernazs · commit 00941b187a70 · 2018-08-11T07:52:19.000+02:00
diff --git a/example.py b/example.py
@@ -3,7 +3,7 @@
 import urllib.request
 import urllib.error
 
-from pytest_httpserver.httpserver import HTTPServer
+from pytest_httpserver import HTTPServer
 
 
 def foobar(request):
diff --git a/pytest_httpserver/__init__.py b/pytest_httpserver/__init__.py
@@ -0,0 +1,3 @@
+
+from .httpserver import HTTPServer
+from .httpserver import HTTPServerError, Error, NoHandlerError
diff --git a/tests/test_mixed.py b/tests/test_mixed.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from pytest_httpserver.httpserver import HTTPServer
+from pytest_httpserver import HTTPServer
 
 
 def _setup_oneshot(server: HTTPServer):
diff --git a/tests/test_oneshot.py b/tests/test_oneshot.py
@@ -1,6 +1,6 @@
 
 import requests
-from pytest_httpserver.httpserver import HTTPServer
+from pytest_httpserver import HTTPServer
 
 
 def test_oneshot(httpserver: HTTPServer):
diff --git a/tests/test_permanent.py b/tests/test_permanent.py
@@ -3,7 +3,7 @@
 import pytest
 from werkzeug.wrappers import Response
 
-from pytest_httpserver.httpserver import HTTPServer
+from pytest_httpserver import HTTPServer
 
 JSON_STRING = '{"foo": "bar"}'
 
diff --git a/tests/test_with_statement.py b/tests/test_with_statement.py
@@ -1,4 +1,4 @@
-from pytest_httpserver.httpserver import HTTPServer
+from pytest_httpserver import HTTPServer
 
 
 def test_server_with_statement():

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+from .httpserver import HTTPServer`
	`3`	`+from .httpserver import HTTPServerError, Error, NoHandlerError`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from pytest_httpserver.httpserver import HTTPServer`
	`1`	`+from pytest_httpserver import HTTPServer`
`2`	`2`
`3`	`3`
`4`	`4`	`def test_server_with_statement():`