diff options
| author | Ask Solem <ask@celeryproject.org> | 2014-01-16 15:01:19 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2014-01-16 15:01:19 +0000 |
| commit | 97abf06e054398f22b7bf77aa6349d8a2ccd860b (patch) | |
| tree | d4cabb26972ef44dbd836d3f7d43470654a50bd2 /amqp/method_framing.py | |
| parent | bff6ddb0ea116e7c3b06f6cf2509c6411b3e4803 (diff) | |
| parent | 07a312582d90b1303ff5d675613935392f6a6283 (diff) | |
| download | py-amqp-readwrite.tar.gz | |
Merge branch 'master' into readwritereadwrite
Conflicts:
amqp/transport.py
Diffstat (limited to 'amqp/method_framing.py')
| -rw-r--r-- | amqp/method_framing.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/amqp/method_framing.py b/amqp/method_framing.py index 85fbfba..b454524 100644 --- a/amqp/method_framing.py +++ b/amqp/method_framing.py @@ -19,12 +19,6 @@ from __future__ import absolute_import from collections import defaultdict, deque from struct import pack, unpack -try: - bytes -except NameError: - # Python 2.5 and lower - bytes = str - from .basic_message import Message from .exceptions import AMQPError, UnexpectedFrame from .five import range, string |