diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-09-22 20:35:40 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-09-22 20:35:40 -0400 |
commit | 08a6a8b51916ab1d084a0070bbb07001cabb1c38 (patch) | |
tree | 3c5db3bfafcc18b33d510d246e69db41cb4eb0e0 /lib | |
parent | c3c4b2d23dacc9e7e3b772c8384fa129db7d20d5 (diff) | |
download | sqlalchemy-08a6a8b51916ab1d084a0070bbb07001cabb1c38.tar.gz |
- Removed some now unneeded version checks [ticket:2829] courtesy alex gaynor
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sqlalchemy/exc.py | 4 | ||||
-rw-r--r-- | lib/sqlalchemy/util/queue.py | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py index cfd1e2bc7..7ebdc3983 100644 --- a/lib/sqlalchemy/exc.py +++ b/lib/sqlalchemy/exc.py @@ -187,10 +187,6 @@ class DontWrapMixin(object): raise MyCustomException("invalid!") """ -import sys -if sys.version_info < (2, 5): - class DontWrapMixin: - pass # Moved to orm.exc; compatibility definition installed by orm import until 0.6 UnmappedColumnError = None diff --git a/lib/sqlalchemy/util/queue.py b/lib/sqlalchemy/util/queue.py index 537526bef..b66738aff 100644 --- a/lib/sqlalchemy/util/queue.py +++ b/lib/sqlalchemy/util/queue.py @@ -25,14 +25,7 @@ within QueuePool. from collections import deque from time import time as _time from .compat import threading -import sys -if sys.version_info < (2, 6): - def notify_all(condition): - condition.notify() -else: - def notify_all(condition): - condition.notify_all() __all__ = ['Empty', 'Full', 'Queue', 'SAAbort'] @@ -195,7 +188,7 @@ class Queue: if not self.not_full.acquire(False): return try: - notify_all(self.not_empty) + self.not_empty.notify_all() finally: self.not_full.release() |