From 6df90b7035cb06412a451881e6f4e31438fc570b Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 24 Sep 2011 00:40:11 -0400
Subject: beat down more test failures

---
 pyramid/config/util.py                       | 2 +-
 pyramid/tests/pkgs/exceptionviewapp/views.py | 2 +-
 pyramid/tests/pkgs/fixtureapp/__init__.py    | 2 +-
 pyramid/tests/pkgs/forbiddenapp/__init__.py  | 3 ++-
 pyramid/tests/test_httpexceptions.py         | 4 +++-
 pyramid/tests/test_integration.py            | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyramid/config/util.py b/pyramid/config/util.py
index febef4b8f..73bd053bd 100644
--- a/pyramid/config/util.py
+++ b/pyramid/config/util.py
@@ -99,7 +99,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None,
         h.update(bytes_('xhr:%r' % bool(xhr)))
 
     if request_method is not None:
-        if not hasattr(request_method, '__iter__'):
+        if not is_nonstr_iter(request_method):
             request_method = (request_method,)
         request_method = sorted(request_method)
         def request_method_predicate(context, request):
diff --git a/pyramid/tests/pkgs/exceptionviewapp/views.py b/pyramid/tests/pkgs/exceptionviewapp/views.py
index 1432618cf..33b97671e 100644
--- a/pyramid/tests/pkgs/exceptionviewapp/views.py
+++ b/pyramid/tests/pkgs/exceptionviewapp/views.py
@@ -1,5 +1,5 @@
 from webob import Response
-from models import AnException
+from .models import AnException
 
 def no(request):
     return Response('no')
diff --git a/pyramid/tests/pkgs/fixtureapp/__init__.py b/pyramid/tests/pkgs/fixtureapp/__init__.py
index c74747bfd..27063aae2 100644
--- a/pyramid/tests/pkgs/fixtureapp/__init__.py
+++ b/pyramid/tests/pkgs/fixtureapp/__init__.py
@@ -5,7 +5,7 @@ def includeme(config):
     config.add_view('.views.erroneous_view', name='error.html')
     config.add_view('.views.fixture_view', name='dummyskin.html',
                     request_type='.views.IDummy')
-    from models import fixture, IFixture
+    from .models import fixture, IFixture
     config.registry.registerUtility(fixture, IFixture)
     config.add_view('.views.fixture_view', name='another.html')
 
diff --git a/pyramid/tests/pkgs/forbiddenapp/__init__.py b/pyramid/tests/pkgs/forbiddenapp/__init__.py
index 7001b87f5..888dc9317 100644
--- a/pyramid/tests/pkgs/forbiddenapp/__init__.py
+++ b/pyramid/tests/pkgs/forbiddenapp/__init__.py
@@ -1,5 +1,6 @@
 from webob import Response
 from pyramid.httpexceptions import HTTPForbidden
+from pyramid.compat import bytes_
 
 def x_view(request): # pragma: no cover
      return Response('this is private!')
@@ -9,7 +10,7 @@ def forbidden_view(context, request):
      result = context.result
      message = msg + '\n' + str(result)
      resp = HTTPForbidden()
-     resp.body = message
+     resp.body = bytes_(message)
      return resp
 
 def includeme(config):
diff --git a/pyramid/tests/test_httpexceptions.py b/pyramid/tests/test_httpexceptions.py
index b58145be8..6bc7fbb30 100644
--- a/pyramid/tests/test_httpexceptions.py
+++ b/pyramid/tests/test_httpexceptions.py
@@ -1,4 +1,6 @@
 import unittest
+
+from pyramid.compat import bytes_
 from pyramid.compat import text_
 
 class Test_exception_response(unittest.TestCase):
@@ -277,7 +279,7 @@ class TestRenderAllExceptionsWithoutArguments(unittest.TestCase):
             if exc.empty_body:
                 self.assertEqual(result, '')
             else:
-                self.assertTrue(exc.status in result)
+                self.assertTrue(bytes_(exc.status) in result)
             L.append(result)
         self.assertEqual(len(L), len(status_map))
             
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 3c970e3bc..ca6301105 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -191,7 +191,7 @@ class TestStaticAppNoSubpath(unittest.TestCase):
 
     def _assertBody(self, body, filename):
         self.assertEqual(
-            body.replace('\r', ''),
+            body.replace(r'\r', r''),
             open(filename, 'rb').read()
             )
 
-- 
cgit v1.2.3