Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flakes

This commit is contained in:
Ask Solem 2013-02-07 15:46:42 +00:00
parent 1f89f5e5de
commit ad87abca0a
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kombu/tests/test_pools.py
View File

@ -1,3 +1,4 @@
from __future__ import absolute_import
from __future__ import with_statement from __future__ import with_statement
from kombu import Connection, Producer from kombu import Connection, Producer

6
pavement.py
View File

@ -91,15 +91,9 @@ def readme(options):
]) ])
def bump(options): def bump(options):
s = "-- '%s'" % (options.custom, ) \ s = "-- '%s'" % (options.custom, ) \
<<<<<<< HEAD
if getattr(options, 'custom', None) else '' if getattr(options, 'custom', None) else ''
sh('extra/release/bump_version.py \ sh('extra/release/bump_version.py \
kombu/__init__.py README.rst %s' % (s, )) kombu/__init__.py README.rst %s' % (s, ))
=======
if getattr(options, "custom", None) else ""
sh("extra/release/bump_version.py \
kombu/__init__.py README.rst %s" % (s, ))
>>>>>>> 2.5
@task @task