[arch-commits] Commit in python-cherrypy/trunk (PKGBUILD cherrypy-python33.patch)

[Jelle van der Waa]

    Date: Tuesday, October 14, 2014 @ 20:07:09
  Author: jelle
Revision: 120669

upgpkg: python-cherrypy 3.6.0-1

Modified:
  python-cherrypy/trunk/PKGBUILD
Deleted:
  python-cherrypy/trunk/cherrypy-python33.patch

-------------------------+
 PKGBUILD                |    4 +--
 cherrypy-python33.patch |   50 ----------------------------------------------
 2 files changed, 2 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-14 17:58:36 UTC (rev 120668)
+++ PKGBUILD	2014-10-14 18:07:09 UTC (rev 120669)
@@ -5,7 +5,7 @@
 # Contributor: Armando M. Baratti <amblistas at ajato.com.br>
 # Contributor: Florian Richter <Florian_Richter at gmx.de>
 pkgname=('python-cherrypy' 'python2-cherrypy')
-pkgver=3.3.0
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="A pythonic, object-oriented web development framework"
 arch=('any')
@@ -13,7 +13,7 @@
 license=('BSD')
 makedepends=('python' 'python2')
 source=("https://pypi.python.org/packages/source/C/CherryPy/CherryPy-${pkgver}.tar.gz")
-md5sums=('4ac4af5ac21a893f07221cbd7ec4be11')
+md5sums=('9772dbee426d656f01a13881e2b139d8')
 
 build() {
   cp -r CherryPy-${pkgver} CherryPy2-${pkgver}

Deleted: cherrypy-python33.patch
===================================================================
--- cherrypy-python33.patch	2014-10-14 17:58:36 UTC (rev 120668)
+++ cherrypy-python33.patch	2014-10-14 18:07:09 UTC (rev 120669)
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User Jason R. Coombs <jaraco at jaraco.com>
-# Date 1349660887 14400
-# Branch cherrypy-3.2.x
-# Node ID 01b6adcb3849b2ff4fa31e3298b494f6b136369e
-# Parent  9820107d4ffb8058fd507888f90e28c695f6b4c0
-Timer class was renamed from _Timer to Timer in Python 3.3. This change adds a compatibility shim to detect this change and reference the base class accordingly. Fixes #1163.
-
-diff -r 9820107d4ffb8058fd507888f90e28c695f6b4c0 -r 01b6adcb3849b2ff4fa31e3298b494f6b136369e cherrypy/_cpcompat.py
---- a/cherrypy/_cpcompat.py	Wed Oct 03 08:02:12 2012 -0400
-+++ b/cherrypy/_cpcompat.py	Sun Oct 07 21:48:07 2012 -0400
-@@ -18,6 +18,7 @@
- import os
- import re
- import sys
-+import threading
- 
- if sys.version_info >= (3, 0):
-     py3k = True
-@@ -325,3 +326,9 @@
-     # Python 2
-     def next(i):
-         return i.next()
-+
-+if sys.version_info >= (3,3):
-+    Timer = threading.Timer
-+else:
-+    # Python 3.2 and earlier
-+    Timer = threading._Timer
-diff -r 9820107d4ffb8058fd507888f90e28c695f6b4c0 -r 01b6adcb3849b2ff4fa31e3298b494f6b136369e cherrypy/process/plugins.py
---- a/cherrypy/process/plugins.py	Wed Oct 03 08:02:12 2012 -0400
-+++ b/cherrypy/process/plugins.py	Sun Oct 07 21:48:07 2012 -0400
-@@ -7,7 +7,7 @@
- import time
- import threading
- 
--from cherrypy._cpcompat import basestring, get_daemon, get_thread_ident, ntob, set
-+from cherrypy._cpcompat import basestring, get_daemon, get_thread_ident, ntob, set, Timer
- 
- # _module__file__base is used by Autoreload to make
- # absolute any filenames retrieved from sys.modules which are not
-@@ -421,7 +421,7 @@
-             pass
- 
- 
--class PerpetualTimer(threading._Timer):
-+class PerpetualTimer(Timer):
-     """A responsive subclass of threading._Timer whose run() method repeats.
- 
-     Use this timer only when you really need a very interruptible timer;