[Python-modules-commits] [celery] 10/11: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun Apr 17 10:23:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository celery.
commit bd99a210ce314a48912abfd836a04c814d22fb90
Merge: ad4b39b 0026d00
Author: Brian May <bam at debian.org>
Date: Sun Apr 17 19:16:30 2016 +1000
merge patched into master
Changelog | 137 +++++++++++++++++----
PKG-INFO | 4 +-
README.rst | 2 +-
celery.egg-info/PKG-INFO | 4 +-
celery.egg-info/entry_points.txt | 2 +-
celery.egg-info/requires.txt | 70 +++++------
celery/__init__.py | 2 +-
celery/app/amqp.py | 10 ++
celery/app/control.py | 2 +-
celery/apps/worker.py | 5 +-
celery/backends/amqp.py | 5 +-
celery/backends/base.py | 23 +++-
celery/backends/cache.py | 10 ++
celery/backends/cassandra.py | 3 +
celery/backends/couchbase.py | 14 +--
celery/backends/database/__init__.py | 8 +-
celery/backends/mongodb.py | 39 ++++--
celery/backends/rpc.py | 3 +
celery/bin/celery.py | 35 +++++-
celery/bin/celeryd_detach.py | 12 +-
celery/concurrency/asynpool.py | 62 +++++++---
celery/concurrency/eventlet.py | 4 +-
celery/concurrency/gevent.py | 2 +-
celery/concurrency/prefork.py | 2 +
celery/contrib/batches.py | 2 +-
celery/datastructures.py | 2 +-
celery/tests/app/test_control.py | 18 +--
celery/tests/backends/test_base.py | 18 +++
celery/tests/backends/test_cache.py | 33 ++++-
celery/tests/backends/test_mongodb.py | 62 +++++-----
celery/tests/bin/test_celeryd_detach.py | 13 +-
celery/tests/bin/test_worker.py | 23 +---
celery/tests/case.py | 16 ++-
celery/tests/utils/test_datastructures.py | 2 +
celery/tests/worker/test_control.py | 6 +-
celery/tests/worker/test_heartbeat.py | 4 +-
celery/utils/__init__.py | 12 +-
celery/worker/consumer.py | 4 +-
celery/worker/pidbox.py | 2 +-
celery/worker/state.py | 8 ++
debian/.git-dpm | 6 +-
.../0006-ci-Tests-passing-on-Python-3.5.patch | 2 +-
debian/patches/disable_unstable_tests.patch | 2 +-
debian/patches/drop_downgrade.patch | 2 +-
debian/patches/intersphinx.patch | 2 +-
debian/patches/lsb-init.patch | 2 +-
debian/patches/privacy.patch | 2 +-
docs/changelog.rst | 137 +++++++++++++++++----
docs/configuration.rst | 7 +-
docs/includes/introduction.txt | 2 +-
docs/userguide/extending.rst | 16 +--
docs/userguide/optimizing.rst | 25 +++-
docs/userguide/workers.rst | 4 +-
docs/whatsnew-3.1.rst | 16 +--
requirements/default.txt | 4 +-
setup.cfg | 4 +-
56 files changed, 649 insertions(+), 269 deletions(-)
diff --cc debian/.git-dpm
index 2136719,0000000..cba4d92
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- e258f66fe312131d1340560ab536144af892baef
- e258f66fe312131d1340560ab536144af892baef
- a66f315a9d1843ac5042bea629ac8c3d1a366d4f
++0026d0040dada5f52ab66d37baee8baf4e4d2e99
++0026d0040dada5f52ab66d37baee8baf4e4d2e99
++6753277798b7b79fec667e858b4cbf459c1c277c
+6753277798b7b79fec667e858b4cbf459c1c277c
+celery_3.1.23.orig.tar.gz
+4c51da2190dee77e723b658a939809fd74f4da96
+1310624
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
index ab2820c,0000000..9461e61
mode 100644,000000..100644
--- a/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
+++ b/debian/patches/0006-ci-Tests-passing-on-Python-3.5.patch
@@@ -1,114 -1,0 +1,114 @@@
- From e258f66fe312131d1340560ab536144af892baef Mon Sep 17 00:00:00 2001
++From 0026d0040dada5f52ab66d37baee8baf4e4d2e99 Mon Sep 17 00:00:00 2001
+From: Ask Solem <ask at celeryproject.org>
+Date: Mon, 28 Sep 2015 13:05:44 -0700
+Subject: [ci] Tests passing on Python 3.5
+
+---
+ celery/tests/utils/test_functional.py | 5 ++++-
+ celery/utils/functional.py | 21 ++++++++++-----------
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/celery/tests/utils/test_functional.py b/celery/tests/utils/test_functional.py
+index 73f0d1d..ce112ac 100644
+--- a/celery/tests/utils/test_functional.py
++++ b/celery/tests/utils/test_functional.py
+@@ -1,6 +1,7 @@
+ from __future__ import absolute_import
+
+ import pickle
++import sys
+
+ from kombu.utils.functional import lazy
+
+@@ -14,7 +15,7 @@ from celery.utils.functional import (
+ maybe_list,
+ )
+
+-from celery.tests.case import Case
++from celery.tests.case import Case, SkipTest
+
+
+ class test_LRUCache(Case):
+@@ -68,6 +69,8 @@ class test_LRUCache(Case):
+ self.assertEqual(list(x.keys()), [98, 99])
+
+ def assertSafeIter(self, method, interval=0.01, size=10000):
++ if sys.version_info >= (3,5):
++ raise SkipTest('Fails on Py3.5')
+ from threading import Thread, Event
+ from time import sleep
+ x = LRUCache(size)
+diff --git a/celery/utils/functional.py b/celery/utils/functional.py
+index 944a095..6d383e0 100644
+--- a/celery/utils/functional.py
++++ b/celery/utils/functional.py
+@@ -24,7 +24,7 @@ __all__ = ['LRUCache', 'is_list', 'maybe_list', 'memoize', 'mlazy', 'noop',
+ 'first', 'firstmethod', 'chunks', 'padlist', 'mattrgetter', 'uniq',
+ 'regen', 'dictfilter', 'lazy', 'maybe_evaluate']
+
+-IS_PYPY = hasattr(sys, 'pypy_version_info')
++IS_PY3 = sys.version_info[0] == 3
+
+ KEYWORD_MARK = object()
+
+@@ -56,7 +56,7 @@ class LRUCache(UserDict):
+ def __getitem__(self, key):
+ with self.mutex:
+ value = self[key] = self.data.pop(key)
+- return value
++ return value
+
+ def update(self, *args, **kwargs):
+ with self.mutex:
+@@ -67,9 +67,7 @@ class LRUCache(UserDict):
+ for _ in range(len(data) - limit):
+ data.popitem(last=False)
+
+- def popitem(self, last=True, _needs_lock=IS_PYPY):
+- if not _needs_lock:
+- return self.data.popitem(last)
++ def popitem(self, last=True):
+ with self.mutex:
+ return self.data.popitem(last)
+
+@@ -83,8 +81,8 @@ class LRUCache(UserDict):
+ def __iter__(self):
+ return iter(self.data)
+
+- def _iterate_items(self, _need_lock=IS_PYPY):
+- with self.mutex if _need_lock else DummyContext():
++ def _iterate_items(self):
++ with self.mutex:
+ for k in self:
+ try:
+ yield (k, self.data[k])
+@@ -92,8 +90,8 @@ class LRUCache(UserDict):
+ pass
+ iteritems = _iterate_items
+
+- def _iterate_values(self, _need_lock=IS_PYPY):
+- with self.mutex if _need_lock else DummyContext():
++ def _iterate_values(self):
++ with self.mutex:
+ for k in self:
+ try:
+ yield self.data[k]
+@@ -104,7 +102,8 @@ class LRUCache(UserDict):
+
+ def _iterate_keys(self):
+ # userdict.keys in py3k calls __getitem__
+- return keys(self.data)
++ with self.mutex:
++ return keys(self.data)
+ iterkeys = _iterate_keys
+
+ def incr(self, key, delta=1):
+@@ -113,7 +112,7 @@ class LRUCache(UserDict):
+ # integer as long as it exists and we can cast it
+ newval = int(self.data.pop(key)) + delta
+ self[key] = str(newval)
+- return newval
++ return newval
+
+ def __getstate__(self):
+ d = dict(vars(self))
diff --cc debian/patches/disable_unstable_tests.patch
index 34d3a9d,0000000..88f12ab
mode 100644,000000..100644
--- a/debian/patches/disable_unstable_tests.patch
+++ b/debian/patches/disable_unstable_tests.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 9e0bb57caff60fc7775d89159f1a72fd028a6221 Mon Sep 17 00:00:00 2001
++From 472b1f1fbf39b6bfb688636cd0eda7bba28cd708 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:04 -0700
+Subject: Disable time-sensitive test
+
+ Upstream has admited that this single test
+ (test_receieve_message_eta_isoformat) fails randomly. Disabling it by raising
+ a SkipTest exception.
+Forwarded: no
+Bug: https://github.com/celery/celery/issues/1450
+
+Patch-Name: disable_unstable_tests.patch
+---
+ celery/tests/worker/test_worker.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/celery/tests/worker/test_worker.py b/celery/tests/worker/test_worker.py
+index b700a6c..27451d0 100644
+--- a/celery/tests/worker/test_worker.py
++++ b/celery/tests/worker/test_worker.py
+@@ -416,6 +416,7 @@ class test_Consumer(AppCase):
+ self.assertIs(self.buffer.get_nowait(), task)
+
+ def test_receieve_message_eta_isoformat(self):
++ raise SkipTest('broken test, may fail at random')
+ l = _MyKombuConsumer(self.buffer.put, timer=self.timer, app=self.app)
+ l.blueprint.state = RUN
+ l.steps.pop()
+@@ -516,6 +517,7 @@ class test_Consumer(AppCase):
+ self.assertTrue(logger.critical.call_count)
+
+ def test_receive_message_eta(self):
++ raise SkipTest('broken test, may fail at random')
+ import sys
+ from functools import partial
+ if os.environ.get('C_DEBUG_TEST'):
diff --cc debian/patches/drop_downgrade.patch
index f94e689,0000000..7224bb8
mode 100644,000000..100644
--- a/debian/patches/drop_downgrade.patch
+++ b/debian/patches/drop_downgrade.patch
@@@ -1,58 -1,0 +1,58 @@@
- From fbb16a4857d2e0939588ec311b9c61a0ad7ccf3e Mon Sep 17 00:00:00 2001
++From 77606317078a5e1029eff0f522581b0250d6b38f Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:01 -0700
+Subject: Remove upstream detection of installed celery
+
+ Upstream tries to detect already installed versions of celery.app in order to
+ remove the whole directory. This leads to ImportErrors during the tests.
+Last-Update: 2013-09-03
+Forwarded: no
+
+Patch-Name: drop_downgrade.patch
+---
+ setup.py | 32 --------------------------------
+ 1 file changed, 32 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4ba98eb..a4c2729 100644
+--- a/setup.py
++++ b/setup.py
+@@ -23,38 +23,6 @@ CELERY_COMPAT_PROGRAMS = int(os.environ.get('CELERY_COMPAT_PROGRAMS', 1))
+ if sys.version_info < (2, 6):
+ raise Exception('Celery 3.1 requires Python 2.6 or higher.')
+
+-downgrade_packages = [
+- 'celery.app.task',
+-]
+-orig_path = sys.path[:]
+-for path in (os.path.curdir, os.getcwd()):
+- if path in sys.path:
+- sys.path.remove(path)
+-try:
+- import imp
+- import shutil
+- for pkg in downgrade_packages:
+- try:
+- parent, module = pkg.rsplit('.', 1)
+- print('- Trying to upgrade %r in %r' % (module, parent))
+- parent_mod = __import__(parent, None, None, [parent])
+- _, mod_path, _ = imp.find_module(module, parent_mod.__path__)
+- if mod_path.endswith('/' + module):
+- print('- force upgrading previous installation')
+- print(' - removing {0!r} package...'.format(mod_path))
+- try:
+- shutil.rmtree(os.path.abspath(mod_path))
+- except Exception:
+- sys.stderr.write('Could not remove {0!r}: {1!r}\n'.format(
+- mod_path, sys.exc_info[1]))
+- except ImportError:
+- print('- upgrade %s: no old version found.' % module)
+-except:
+- pass
+-finally:
+- sys.path[:] = orig_path
+-
+-
+ NAME = 'celery'
+ entrypoints = {}
+ extra = {}
diff --cc debian/patches/intersphinx.patch
index 7ce3c33,0000000..e810cc0
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,52 -1,0 +1,52 @@@
- From b13bd8cb18d8d8054009307e8e6d7226c2e5777a Mon Sep 17 00:00:00 2001
++From fa042fe5c3a65d6d2eee7270d7c5c3cb413ef2ed Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:03 -0700
+Subject: use local objects.inv where possible
+
+ Upstream uses intersphinx mappings that fetch the objects.inv for python,
+ kombu and django-celery by HTTP from a remote host. Using the local
+ objects.inv from python and kombu enables the package to build without
+ network connection.
+Forwarded: not-needed
+Last-Update: 2011-12-27
+
+Patch-Name: intersphinx.patch
+---
+ docs/conf.py | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 551e7a6..b2722d8 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -75,13 +75,23 @@ unused_docs = [
+ # If true, '()' will be appended to :func: etc. cross-reference text.
+ add_function_parentheses = True
+
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/dev', None),
+- 'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
+- 'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+- 'cyme': ('http://cyme.readthedocs.org/en/latest', None),
+- 'amqp': ('http://amqp.readthedocs.org/en/latest', None),
+-}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('kombu',
++ 'http://kombu.readthedocs.org/en/latest/',
++ '/usr/share/doc/python-kombu-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('amqp',
++ 'http://amqp.readthedocs.org/en/latest/',
++ '/usr/share/doc/python-amqp-doc/html/objects.inv'))
+
+ # The name of the Pygments (syntax highlighting) style to use.
+ pygments_style = 'colorful'
diff --cc debian/patches/lsb-init.patch
index b3ce466,0000000..905c086
mode 100644,000000..100644
--- a/debian/patches/lsb-init.patch
+++ b/debian/patches/lsb-init.patch
@@@ -1,102 -1,0 +1,102 @@@
- From b20e08492a1c65069ee7d1282321931c3bd9506c Mon Sep 17 00:00:00 2001
++From d7b31c98abd087532b40df2eb9e4b81c0b13feb9 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:02 -0700
+Subject: LSB compliant headers, status actions and ENABLED variable
+
+ Upstream ships it's own init scripts but they lack some LSB header and
+ the (optional) "status" action. This patch fixes this and also adds a
+ variable called ENABLED in /etc/default/celeryd.
+Last-Update: 2013-09-03
+Forwarded: no
+
+Patch-Name: lsb-init.patch
+---
+ extra/generic-init.d/celerybeat | 12 ++++++++++++
+ extra/generic-init.d/celeryd | 11 +++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
+index 2db4e9a..b6287ad 100755
+--- a/extra/generic-init.d/celerybeat
++++ b/extra/generic-init.d/celerybeat
+@@ -15,11 +15,15 @@
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Short-Description: celery periodic task scheduler
++# Description: Controls the Celery periodic task scheduler.
+ ### END INIT INFO
+
+ # Cannot use set -e/bash -e since the kill -0 command will abort
+ # abnormally in the absence of a valid process ID.
+ #set -e
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+
+@@ -85,6 +89,7 @@ _config_sanity() {
+
+ scripts=""
+
++
+ if test -f /etc/default/celeryd; then
+ scripts="/etc/default/celeryd"
+ _config_sanity /etc/default/celeryd
+@@ -106,6 +111,13 @@ DEFAULT_PID_FILE="/var/run/celery/beat.pid"
+ DEFAULT_LOG_FILE="/var/log/celery/beat.log"
+ DEFAULT_LOG_LEVEL="INFO"
+ DEFAULT_CELERYBEAT="$CELERY_BIN beat"
++DEFAULT_ENABLED="false"
++
++ENABLED=${ENABLED:-$DEFAULT_ENABLED}
++if [ "$ENABLED" != "true" ]; then
++ echo "celerybeat daemon disabled - see $scripts."
++ exit 0
++fi
+
+ CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
+ CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
+diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
+index 362383d..6c2f866 100755
+--- a/extra/generic-init.d/celeryd
++++ b/extra/generic-init.d/celeryd
+@@ -16,6 +16,7 @@
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Short-Description: celery task worker daemon
++# Description: Controls a celery task worker daemon instance
+ ### END INIT INFO
+ #
+ #
+@@ -28,6 +29,9 @@
+ #
+ # You can then configure this by manipulating /etc/default/little-worker.
+ #
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+ if [ $(id -u) -ne 0 ]; then
+@@ -52,6 +56,7 @@ DEFAULT_LOG_FILE="/var/log/celery/%n.log"
+ DEFAULT_LOG_LEVEL="INFO"
+ DEFAULT_NODES="celery"
+ DEFAULT_CELERYD="-m celery worker --detach"
++DEFAULT_ENABLED="false"
+
+ CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
+
+@@ -104,6 +109,12 @@ if [ -f "$CELERY_DEFAULTS" ]; then
+ . "$CELERY_DEFAULTS"
+ fi
+
++ENABLED=${ENABLED:-$DEFAULT_ENABLED}
++if [ "$ENABLED" != "true" ]; then
++ echo "celery daemon disabled - see $CELERY_DEFAULTS"
++ exit 0
++fi
++
+ # Sets --app argument for CELERY_BIN
+ CELERY_APP_ARG=""
+ if [ ! -z "$CELERY_APP" ]; then
diff --cc debian/patches/privacy.patch
index d81cfd7,0000000..43b879e
mode 100644,000000..100644
--- a/debian/patches/privacy.patch
+++ b/debian/patches/privacy.patch
@@@ -1,57 -1,0 +1,57 @@@
- From a0bdb9c7be9fd011f9d1b19cbe362a80b0812177 Mon Sep 17 00:00:00 2001
++From 77b58826e579af69989e924dfc5d3cd63a6effde Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:37:05 -0700
+Subject: Remove external assets from documentation.
+
+ Upstream incldues a PayPal donation form in it's sphinx templates for which the
+ submit button used an external image and which was replaced by a simple
+ <button/> element. Also a gittip button is loaded inside an <iframe/> which is
+ removed. The logo image was loaded from the project website and is replaced
+ with the local image file.
+Last-Update: 2014-02-11
+Forwarded: not-needed
+
+Patch-Name: privacy.patch
+---
+ docs/.templates/sidebarintro.html | 12 +-----------
+ docs/.templates/sidebarlogo.html | 12 +-----------
+ 2 files changed, 2 insertions(+), 22 deletions(-)
+
+diff --git a/docs/.templates/sidebarintro.html b/docs/.templates/sidebarintro.html
+index cc68b8f..f1e739c 100644
+--- a/docs/.templates/sidebarintro.html
++++ b/docs/.templates/sidebarintro.html
+@@ -1,13 +1,3 @@
+ <p class="logo"><a href="{{ pathto(master_doc) }}">
+- <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
++ <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
+ </a></p>
+-<div id="donate">
+- <b>Donations welcome:</b>
+- <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+- <input type="hidden" name="cmd" value="_s-xclick">
+- <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHTwYJKoZIhvcNAQcEoIIHQDCCBzwCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYA2+c723xlntHKQYQR9yn9BEtUhDoUUlnOqhniqvNMWB4k2R0JpVkrNSu5JCbdjNOqDXKHoRfIWe3HXJJMPZBJKFMD5Izprb6xEZlTGaWnlrGXFfkdBaILQQgWYqV0DnuNmtDXCvfYmyu0p1K04 [...]
+- ">
+- <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+- <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+- </form>
+-</div>
+diff --git a/docs/.templates/sidebarlogo.html b/docs/.templates/sidebarlogo.html
+index cc68b8f..f1e739c 100644
+--- a/docs/.templates/sidebarlogo.html
++++ b/docs/.templates/sidebarlogo.html
+@@ -1,13 +1,3 @@
+ <p class="logo"><a href="{{ pathto(master_doc) }}">
+- <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
++ <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
+ </a></p>
+-<div id="donate">
+- <b>Donations welcome:</b>
+- <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+- <input type="hidden" name="cmd" value="_s-xclick">
+- <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHTwYJKoZIhvcNAQcEoIIHQDCCBzwCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYA2+c723xlntHKQYQR9yn9BEtUhDoUUlnOqhniqvNMWB4k2R0JpVkrNSu5JCbdjNOqDXKHoRfIWe3HXJJMPZBJKFMD5Izprb6xEZlTGaWnlrGXFfkdBaILQQgWYqV0DnuNmtDXCvfYmyu0p1K04 [...]
+- ">
+- <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+- <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+- </form>
+-</div>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery.git
More information about the Python-modules-commits
mailing list