Merge branch 'master' into fdbsql-tests

Conflicts:
	lib/sqlalchemy/testing/exclusions.py

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index c9f81c8b9..e3d91300d 100644
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@ -135,7 +135,7 @@ class compound(object):
                     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:
@@ -180,8 +180,7 @@ class Predicate(object):
     @classmethod
     def as_predicate(cls, predicate, description=None):
         if isinstance(predicate, compound):
-            return cls.as_predicate(predicate.fails.union(predicate.skips))
-
+            return cls.as_predicate(predicate.enabled_for_config, description)
         elif isinstance(predicate, Predicate):
             if description and predicate.description is None:
                 predicate.description = description