Merge branch 'master' into mmerickel-feature.scripting

2 files changed, 8 insertions, 3 deletions

diff --git a/pyramid/tests/test_config.py b/pyramid/tests/test_config.py
index dd5c90bf7..489134f00 100644
--- a/pyramid/tests/test_config.py
+++ b/pyramid/tests/test_config.py
@@ -5489,11 +5489,16 @@ class DummyRegistry(object):
 
 def parse_httpdate(s):
     import datetime
-    return datetime.datetime.strptime(s, "%a, %d %b %Y %H:%M:%S %Z")
+    # cannot use %Z, must use literal GMT; Jython honors timezone
+    # but CPython does not
+    return datetime.datetime.strptime(s, "%a, %d %b %Y %H:%M:%S GMT")
 
 def assert_similar_datetime(one, two):
     for attr in ('year', 'month', 'day', 'hour', 'minute'):
-        assert(getattr(one, attr) == getattr(two, attr))
+        one_attr = getattr(one, attr)
+        two_attr = getattr(two, attr)
+        if not one_attr == two_attr:
+            raise AssertionError('%r != %r in %s' % (one_attr, two_attr, attr))
 
 from pyramid.interfaces import IResponse
 class DummyResponse(object):
diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py
index 6cd86901e..55eed50f5 100644
--- a/pyramid/tests/test_router.py
+++ b/pyramid/tests/test_router.py
@@ -418,7 +418,7 @@ class TestRouter(unittest.TestCase):
             request.response.a = 1
             raise KeyError
         def exc_view(context, request):
-            self.failIf(hasattr(request.response, 'a'))
+            self.assertFalse(hasattr(request.response, 'a'))
             request.response.body = 'OK'
             return request.response
         environ = self._makeEnviron()