[arch-commits] Commit in python-planout/trunk (PKGBUILD py3k-fix.patch)

[Felix Yan]

    Date: Wednesday, November 25, 2015 @ 03:44:38
  Author: fyan
Revision: 147746

upgpkg: python-planout 0.5.20151020-1

Modified:
  python-planout/trunk/PKGBUILD
Deleted:
  python-planout/trunk/py3k-fix.patch

----------------+
 PKGBUILD       |   11 ++++-------
 py3k-fix.patch |   37 -------------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-25 02:37:46 UTC (rev 147745)
+++ PKGBUILD	2015-11-25 02:44:38 UTC (rev 147746)
@@ -3,8 +3,8 @@
 
 pkgbase=python-planout
 pkgname=(python-planout python2-planout)
-pkgver=0.5.20151001
-_commit=82ccf7b212bd5a292e1485c0942b513a52737c78
+pkgver=0.5.20151020
+_commit=9a47b316aa31024588f063426bbadd8867cdab77
 pkgrel=1
 pkgdesc="A framework for online field experimentation"
 arch=('any')
@@ -12,13 +12,10 @@
 license=('custom:BSD')
 makedepends=('python-six' 'python2-six' 'git')
 checkdepends=('python-pytest' 'python2-pytest')
-source=("git+https://github.com/facebook/planout.git#commit=$_commit"
-        py3k-fix.patch)
-sha512sums=('SKIP'
-            '1ec44bf082f73045a39076bed7dcf9ce25b79e1f288c5c06136d67894aac262ad309bad4feb0909b5690d3cd67862f3d15c71f51adfcc97a7cc4cc58bc13d78f')
+source=("git+https://github.com/facebook/planout.git#commit=$_commit")
+sha512sums=('SKIP')
 
 prepare() {
-  (cd planout; patch -p1 -i ../py3k-fix.patch)
   cp -a planout{,-py2}
 }
 

Deleted: py3k-fix.patch
===================================================================
--- py3k-fix.patch	2015-11-25 02:37:46 UTC (rev 147745)
+++ py3k-fix.patch	2015-11-25 02:44:38 UTC (rev 147746)
@@ -1,37 +0,0 @@
-From 7108eaa07bd031630489b41f8e072957fbfed7a8 Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars at archlinux.org>
-Date: Tue, 13 Oct 2015 22:41:23 +0800
-Subject: [PATCH] Fix prints in namespace.py for Python 3.x compatibility
-
----
- python/planout/namespace.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/python/planout/namespace.py b/python/planout/namespace.py
-index b5243fc..31ab927 100644
---- a/python/planout/namespace.py
-+++ b/python/planout/namespace.py
-@@ -116,11 +116,11 @@ def primary_unit(self, value):
-     def add_experiment(self, name, exp_object, segments):
-         num_avail = len(self.available_segments)
-         if num_avail < segments:
--            print 'error: %s segments requested, only %s available.' % \
--                (segments, num_avail)
-+            print('error: %s segments requested, only %s available.' %
-+                  (segments, num_avail))
-             return False
-         if name in self.current_experiments:
--            print 'error: there is already an experiment called %s.' % name
-+            print('error: there is already an experiment called %s.' % name)
-             return False
- 
-         # randomly select the given number of segments from all available
-@@ -140,7 +140,7 @@ def add_experiment(self, name, exp_object, segments):
- 
-     def remove_experiment(self, name):
-         if name not in self.current_experiments:
--            print 'error: there is no experiment called %s.' % name
-+            print('error: there is no experiment called %s.' % name)
-             return False
- 
-         segments_to_free = \