From: Scott Dugas <scott.dugas@foundationdb.com>
Date: Mon, 3 Nov 2014 19:54:51 +0000 (-0500)
Subject: Merge branch 'master' into fdbsql-tests
X-Git-Tag: rel_1_0_0~19^2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b31ab006897d2709442f9745faf0cac6e0de1713;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into fdbsql-tests

Conflicts:
	lib/sqlalchemy/testing/exclusions.py
---

b31ab006897d2709442f9745faf0cac6e0de1713
diff --cc lib/sqlalchemy/testing/exclusions.py
index c9f81c8b99,f94724608a..e3d91300dc
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@@ -132,10 -130,10 +132,10 @@@ class compound(object)
          for fail in self.fails:
              if fail(config):
                  print(("%s failed as expected (%s): %s " % (
 -                    name, fail._as_string(config), str(ex))))
 +                    name, fail._as_string(config), str(exc_value))))
                  break
          else:
-             raise exc_type, exc_value, exc_traceback
+             util.raise_from_cause(ex)
  
      def _expect_success(self, config, name='block'):
          if not self.fails: