From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 1 May 2013 14:10:09 +0000 (-0400)
Subject: merge default
X-Git-Tag: rel_0_9_0b1~304^2~13^2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6825ff019f48b2bdea87942a8ad21e7a0357d95;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge default
---

a6825ff019f48b2bdea87942a8ad21e7a0357d95
diff --cc test/ext/test_serializer.py
index 47edbdaaab,74e033b4f5..0c7298a8b3
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@@ -121,8 -122,9 +122,9 @@@ class SerializeTest(fixtures.MappedTest
          q2 = serializer.loads(serializer.dumps(q, -1), users.metadata,
                                Session)
          eq_(q2.all(), [User(name='fred')])
 -        eq_(list(q2.values(User.id, User.name)), [(9, u'fred')])
 +        eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
  
+     @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
      def test_query_three(self):
          ua = aliased(User)
          q = \
@@@ -134,8 -136,9 +136,9 @@@
  
          # try to pull out the aliased entity here...
          ua_2 = q2._entities[0].entity_zero.entity
 -        eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, u'fred')])
 +        eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, 'fred')])
  
+     @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
      def test_orm_join(self):
          from sqlalchemy.orm.util import join