use paren-bracketed imports for modules from the same source

8 files changed, 42 insertions, 22 deletions

diff --git a/pyramid/tests/test_authentication.py b/pyramid/tests/test_authentication.py
index 02bfa1fed..e513b9a48 100644
--- a/pyramid/tests/test_authentication.py
+++ b/pyramid/tests/test_authentication.py
@@ -1,7 +1,9 @@
 import unittest
 from pyramid import testing
-from pyramid.compat import text_
-from pyramid.compat import bytes_
+from pyramid.compat import (
+    text_,
+    bytes_,
+    )
 
 class TestCallbackAuthenticationPolicyDebugging(unittest.TestCase):
     def setUp(self):
diff --git a/pyramid/tests/test_encode.py b/pyramid/tests/test_encode.py
index ccc8f16e3..736ecb5b3 100644
--- a/pyramid/tests/test_encode.py
+++ b/pyramid/tests/test_encode.py
@@ -1,6 +1,8 @@
 import unittest
-from pyramid.compat import text_
-from pyramid.compat import native_
+from pyramid.compat import (
+    text_,
+    native_,
+    )
 
 class UrlEncodeTests(unittest.TestCase):
     def _callFUT(self, query, doseq=False):
diff --git a/pyramid/tests/test_httpexceptions.py b/pyramid/tests/test_httpexceptions.py
index 84485fadc..0061907ba 100644
--- a/pyramid/tests/test_httpexceptions.py
+++ b/pyramid/tests/test_httpexceptions.py
@@ -1,7 +1,9 @@
 import unittest
 
-from pyramid.compat import bytes_
-from pyramid.compat import text_
+from pyramid.compat import (
+    bytes_,
+    text_,
+    )
 
 class Test_exception_response(unittest.TestCase):
     def _callFUT(self, *arg, **kw):
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 0d63b0b6b..85a68ab25 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -8,8 +8,10 @@ import unittest
 from pyramid.wsgi import wsgiapp
 from pyramid.view import view_config
 from pyramid.static import static_view
-from pyramid.compat import text_
-from pyramid.compat import url_quote
+from pyramid.compat import (
+    text_,
+    url_quote,
+    )
 
 from zope.interface import Interface
 
@@ -616,7 +618,7 @@ def read_(filename):
         return val
     
 def _assertBody(body, filename):
-    if defaultlocale is None:
+    if defaultlocale is None: # pragma: no cover
         # If system locale does not have an encoding then default to utf-8
         filename = filename.encode('utf-8')
     assert(body.replace(b'\r', b'') == read_(filename))
diff --git a/pyramid/tests/test_mako_templating.py b/pyramid/tests/test_mako_templating.py
index 0726c5250..550c95312 100644
--- a/pyramid/tests/test_mako_templating.py
+++ b/pyramid/tests/test_mako_templating.py
@@ -2,8 +2,10 @@
 
 import unittest
 from pyramid import testing
-from pyramid.compat import text_
-from pyramid.compat import text_type
+from pyramid.compat import (
+    text_,
+    text_type,
+    )
 
 class Base(object):
     def setUp(self):
diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py
index 8a5215a2b..170ea5c97 100644
--- a/pyramid/tests/test_request.py
+++ b/pyramid/tests/test_request.py
@@ -1,11 +1,15 @@
 import unittest
 from pyramid import testing
 
-from pyramid.compat import PY3
-from pyramid.compat import text_
-from pyramid.compat import bytes_
-from pyramid.compat import native_
-from pyramid.compat import iteritems_, iterkeys_, itervalues_
+from pyramid.compat import (
+    PY3,
+    text_,
+    bytes_,
+    native_,
+    iteritems_,
+    iterkeys_,
+    itervalues_,
+    )
 
 class TestRequest(unittest.TestCase):
     def setUp(self):
diff --git a/pyramid/tests/test_url.py b/pyramid/tests/test_url.py
index 7b05368ce..527bf31bc 100644
--- a/pyramid/tests/test_url.py
+++ b/pyramid/tests/test_url.py
@@ -1,10 +1,14 @@
 import unittest
 import warnings
 
-from pyramid.testing import setUp
-from pyramid.testing import tearDown
-from pyramid.compat import text_
-from pyramid.compat import native_
+from pyramid.testing import (
+    setUp,
+    tearDown,
+    )
+from pyramid.compat import (
+    text_,
+    native_,
+    )
 
 class TestURLMethodsMixin(unittest.TestCase):
     def setUp(self):
diff --git a/pyramid/tests/test_view.py b/pyramid/tests/test_view.py
index a775e7bc9..a105adb70 100644
--- a/pyramid/tests/test_view.py
+++ b/pyramid/tests/test_view.py
@@ -3,8 +3,10 @@ import sys
 
 from zope.interface import implementer
 
-from pyramid.testing import setUp
-from pyramid.testing import tearDown
+from pyramid.testing import (
+    setUp,
+    tearDown,
+    )
 
 class BaseTest(object):
     def setUp(self):