diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-04-27 19:53:57 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-04-27 19:53:57 -0400 |
commit | 4b614b9b35cd2baddb7ca67c04bee5d70ec6a172 (patch) | |
tree | 7483cd269f5823f903f96709eb864fff9b6d9383 /lib/sqlalchemy/testing/exclusions.py | |
parent | 9716a5c45e6185c5871555722d8495880f0e8c7a (diff) | |
download | sqlalchemy-4b614b9b35cd2baddb7ca67c04bee5d70ec6a172.tar.gz |
- the raw 2to3 run
- went through examples/ and cleaned out excess list() calls
Diffstat (limited to 'lib/sqlalchemy/testing/exclusions.py')
-rw-r--r-- | lib/sqlalchemy/testing/exclusions.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py index 2c0679e1d..93f444eb9 100644 --- a/lib/sqlalchemy/testing/exclusions.py +++ b/lib/sqlalchemy/testing/exclusions.py @@ -1,4 +1,4 @@ -from __future__ import with_statement + import operator from nose import SkipTest @@ -23,10 +23,10 @@ class skip_if(object): def fail_if(self, name='block'): try: yield - except Exception, ex: + except Exception as ex: if self.predicate(): - print ("%s failed as expected (%s): %s " % ( - name, self.predicate, str(ex))) + print(("%s failed as expected (%s): %s " % ( + name, self.predicate, str(ex)))) else: raise else: @@ -92,7 +92,7 @@ class Predicate(object): return OrPredicate([cls.as_predicate(pred) for pred in predicate]) elif isinstance(predicate, tuple): return SpecPredicate(*predicate) - elif isinstance(predicate, basestring): + elif isinstance(predicate, str): return SpecPredicate(predicate, None, None) elif util.callable(predicate): return LambdaPredicate(predicate) |