[arch-commits] Commit in python-pygal/trunk (PKGBUILD python-3.5.patch)

[Felix Yan]

    Date: Tuesday, November 3, 2015 @ 15:27:45
  Author: fyan
Revision: 145793

upgpkg: python-pygal 1:2.0.9-1

Modified:
  python-pygal/trunk/PKGBUILD
Deleted:
  python-pygal/trunk/python-3.5.patch

------------------+
 PKGBUILD         |   11 +++--------
 python-3.5.patch |   37 -------------------------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-03 14:27:04 UTC (rev 145792)
+++ PKGBUILD	2015-11-03 14:27:45 UTC (rev 145793)
@@ -5,7 +5,7 @@
 pkgbase=python-pygal
 pkgname=('python-pygal' 'python2-pygal')
 epoch=1
-pkgver=2.0.8
+pkgver=2.0.9
 pkgrel=1
 pkgdesc='A Python SVG graph plotting library'
 arch=('any')
@@ -15,15 +15,10 @@
 checkdepends=('python-pytest' 'python2-pytest' 'python-lxml' 'python2-lxml'
               'python-pyquery' 'python2-pyquery' 'python-cairosvg' 'python2-cairosvg'
               'python-flask' 'python2-flask')
-source=("git+https://github.com/Kozea/pygal.git#tag=$pkgver"
-        python-3.5.patch)
-md5sums=('SKIP'
-         '184addfb9698e8e8d67cfdc50c898866')
+source=("git+https://github.com/Kozea/pygal.git#tag=$pkgver")
+md5sums=('SKIP')
 
 prepare() {
-  # https://github.com/Kozea/pygal/pull/278
-  (cd pygal; patch -p1 -i ../python-3.5.patch)
-
   cp -a "${srcdir}/pygal"{,-py2}
 }
 

Deleted: python-3.5.patch
===================================================================
--- python-3.5.patch	2015-11-03 14:27:04 UTC (rev 145792)
+++ python-3.5.patch	2015-11-03 14:27:45 UTC (rev 145793)
@@ -1,37 +0,0 @@
-From 3f44ab8e181ce12c9e55f361b1131699d1c97d05 Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars at archlinux.org>
-Date: Fri, 30 Oct 2015 15:50:28 +0800
-Subject: [PATCH] Fix unparse_color for python 3.5+ compatibility
-
----
- pygal/colors.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pygal/colors.py b/pygal/colors.py
-index bc8ea55..7997b38 100644
---- a/pygal/colors.py
-+++ b/pygal/colors.py
-@@ -126,19 +126,20 @@ def unparse_color(r, g, b, a, type):
-     if type == '#rgb':
-         # Don't lose precision on rgb shortcut
-         if r % 17 == 0 and g % 17 == 0 and b % 17 == 0:
--            return '#%x%x%x' % (r / 17, g / 17, b / 17)
-+            return '#%x%x%x' % (int(r / 17), int(g / 17), int(b / 17))
-         type = '#rrggbb'
- 
-     if type == '#rgba':
-         if r % 17 == 0 and g % 17 == 0 and b % 17 == 0:
--            return '#%x%x%x%x' % (r / 17, g / 17, b / 17, a * 15)
-+            return '#%x%x%x%x' % (int(r / 17), int(g / 17), int(b / 17),
-+                                  int(a * 15))
-         type = '#rrggbbaa'
- 
-     if type == '#rrggbb':
-         return '#%02x%02x%02x' % (r, g, b)
- 
-     if type == '#rrggbbaa':
--        return '#%02x%02x%02x%02x' % (r, g, b, a * 255)
-+        return '#%02x%02x%02x%02x' % (r, g, b, int(a * 255))
- 
-     if type == 'rgb':
-         return 'rgb(%d, %d, %d)' % (r, g, b)