Same code for python 2.7 and 3.3

pygal/_compat.py

@@ -18,6 +18,23 @@
 # along with pygal. If not, see <http://www.gnu.org/licenses/>.
 import sys
 
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+
+
+def to_str(string):
+    if sys.version_info[0] == 3:
+        base = (str, bytes)
+        coerce = str
+    else:
+        base = basestring
+        coerce = unicode
+    if not isinstance(string, base):
+        return coerce(string)
+    return string
+
 
 def total_seconds(td):
     if sys.version_info[:2] == (2, 6):

pygal/adapters.py

@@ -51,7 +51,7 @@ def int_to_country(x):
         except:
             return x
         if x >= 0 and x < len(COUNTRIES):
-            return COUNTRIES.keys()[x]
+            return list(COUNTRIES.keys())[x]
     return x
 
 

pygal/graph/bar.py

@@ -100,9 +100,9 @@ class Bar(Graph):
             self._box.ymin, self._box.ymax, self.logarithmic, self.order_min
         ) if not self.y_labels else map(float, self.y_labels)
 
-        self._x_labels = self.x_labels and zip(self.x_labels, [
-            (i + .5) / self._len for i in range(self._len)])
-        self._y_labels = zip(map(self._format, y_pos), y_pos)
+        self._x_labels = self.x_labels and list(zip(self.x_labels, [
+            (i + .5) / self._len for i in range(self._len)]))
+        self._y_labels = list(zip(map(self._format, y_pos), y_pos))
 
     def _compute_secondary(self):
         if self.secondary_series:

pygal/graph/base.py

@@ -58,10 +58,10 @@ class BaseGraph(object):
             else:
                 get = lambda x: x
 
-            positive_values = filter(
+            positive_values = list(filter(
                 lambda x: x > 0,
                 [get(val)
-                 for serie in self.series for val in serie.safe_values])
+                 for serie in self.series for val in serie.safe_values]))
 
             self.zero = min(positive_values) if positive_values else 0
         self._draw()

pygal/graph/datey.py

@@ -36,10 +36,10 @@ graph.add("graph1",list(zip(x,y))+[None,None])
 graph.render_in_browser()
 """
 
+from pygal._compat import total_seconds
 from pygal.adapters import date
 from pygal.util import compute_scale
 from pygal.graph.xy import XY
-from pygal.compat import total_seconds
 import datetime
 
 

pygal/graph/dot.py

@@ -39,7 +39,7 @@ class Dot(Graph):
 
     def dot(self, serie_node, serie, r_max):
         """Draw a dot line"""
-        view_values = map(self.view, serie.points)
+        view_values = list(map(self.view, serie.points))
         for i, value in safe_enumerate(serie.values):
             x, y = view_values[i]
             size = r_max * value
@@ -69,8 +69,9 @@ class Dot(Graph):
                 (x_pos[i], y_pos[j])
                 for i in range(x_len)]
 
-        self._x_labels = self.x_labels and zip(self.x_labels, x_pos)
-        self._y_labels = zip(self.y_labels or cut(self.series, 'title'), y_pos)
+        self._x_labels = self.x_labels and list(zip(self.x_labels, x_pos))
+        self._y_labels = list(zip(
+            self.y_labels or cut(self.series, 'title'), y_pos))
 
     def _plot(self):
         r_max = min(

pygal/graph/funnel.py

@@ -87,9 +87,10 @@ class Funnel(Graph):
             self._box.ymin, self._box.ymax, self.logarithmic, self.order_min
         ) if not self.y_labels else map(float, self.y_labels)
 
-        self._x_labels = zip(cut(self.series, 'title'),
-                             map(lambda x: x - 1 / (2 * self._order), x_pos))
-        self._y_labels = zip(map(self._format, y_pos), y_pos)
+        self._x_labels = list(
+            zip(cut(self.series, 'title'),
+                map(lambda x: x - 1 / (2 * self._order), x_pos)))
+        self._y_labels = list(zip(map(self._format, y_pos), y_pos))
 
     def _plot(self):
         for index, serie in enumerate(self.series):

pygal/graph/gauge.py

@@ -112,7 +112,7 @@ class Gauge(Graph):
         x_pos = compute_scale(
             self.min_, self.max_, self.logarithmic, self.order_min
         )
-        self._x_labels = zip(map(self._format, x_pos), x_pos)
+        self._x_labels = list(zip(map(self._format, x_pos), x_pos))
 
     def _plot(self):
         for index, serie in enumerate(self.series):

pygal/graph/graph.py

@@ -28,7 +28,7 @@ from pygal.view import View, LogView, XYLogView
 from pygal.util import (
     is_major, truncate, reverse_text_len, get_texts_box, cut, rad)
 from math import isnan, pi, sqrt, ceil, cos
-from itertools import repeat, izip, chain
+from itertools import repeat, chain
 
 
 class Graph(BaseGraph):
@@ -296,13 +296,13 @@ class Graph(BaseGraph):
             # l - label
             # tf - whether it is secondary label
             gen = enumerate(enumerate(chain(
-                izip(self._legends, repeat(False)),
-                izip(self._secondary_legends, repeat(True)))))
+                zip(self._legends, repeat(False)),
+                zip(self._secondary_legends, repeat(True)))))
             secondary_legends = legends  # svg node is the same
         else:
             gen = enumerate(chain(
-                enumerate(izip(self._legends, repeat(False))),
-                enumerate(izip(self._secondary_legends, repeat(True)))))
+                enumerate(zip(self._legends, repeat(False))),
+                enumerate(zip(self._secondary_legends, repeat(True)))))
 
             # draw secondary axis on right
             x = self.margin.left + self.view.width + 10

pygal/graph/line.py

@@ -65,7 +65,7 @@ class Line(Graph):
                 for x, y in serie.points]
         else:
             points = serie.points
-        view_values = map(self.view, points)
+        view_values = list(map(self.view, points))
         if self.show_dots:
             for i, (x, y) in enumerate(view_values):
                 if None in (x, y):
@@ -95,7 +95,7 @@ class Line(Graph):
 
         if self.stroke:
             if self.interpolate:
-                view_values = map(self.view, serie.interpolated)
+                view_values = list(map(self.view, serie.interpolated))
             if self.fill:
                 view_values = self._fill(view_values)
             self.svg.line(
@@ -111,7 +111,7 @@ class Line(Graph):
         self._points(x_pos)
 
         if self.x_labels:
-            self._x_labels = zip(self.x_labels, x_pos)
+            self._x_labels = list(zip(self.x_labels, x_pos))
         else:
             self._x_labels = None
 
@@ -127,7 +127,7 @@ class Line(Graph):
             self._box.ymin, self._box.ymax, self.logarithmic, self.order_min
         ) if not self.y_labels else map(float, self.y_labels)
 
-        self._y_labels = zip(map(self._format, y_pos), y_pos)
+        self._y_labels = list(zip(map(self._format, y_pos), y_pos))
 
     def _plot(self):
         for index, serie in enumerate(self.series):

pygal/graph/radar.py

@@ -166,8 +166,8 @@ class Radar(Line):
             max_scale=8
         ) if not self.y_labels else map(int, self.y_labels)
 
-        self._x_labels = self.x_labels and zip(self.x_labels, x_pos)
-        self._y_labels = zip(map(self._format, y_pos), y_pos)
+        self._x_labels = self.x_labels and list(zip(self.x_labels, x_pos))
+        self._y_labels = list(zip(map(self._format, y_pos), y_pos))
 
         self.x_pos = x_pos
         self._self_close = True

pygal/graph/stackedbar.py

@@ -55,8 +55,8 @@ class StackedBar(Bar):
         self._compute_box(positive_vals, negative_vals)
 
         if self.logarithmic:
-            positive_vals = filter(lambda x: x > 0, positive_vals)
-            negative_vals = filter(lambda x: x > 0, negative_vals)
+            positive_vals = list(filter(lambda x: x > 0, positive_vals))
+            negative_vals = list(filter(lambda x: x > 0, negative_vals))
 
         positive_vals = positive_vals or [self.zero]
         negative_vals = negative_vals or [self.zero]
@@ -71,9 +71,9 @@ class StackedBar(Bar):
         ) if not self.y_labels else map(float, self.y_labels)
         self._x_ranges = zip(x_pos, x_pos[1:])
 
-        self._x_labels = self.x_labels and zip(self.x_labels, [
-            sum(x_range) / 2 for x_range in self._x_ranges])
-        self._y_labels = zip(map(self._format, y_pos), y_pos)
+        self._x_labels = self.x_labels and list(zip(self.x_labels, [
+            sum(x_range) / 2 for x_range in self._x_ranges]))
+        self._y_labels = list(zip(map(self._format, y_pos), y_pos))
 
         self.negative_cumulation = [0] * self._len
         self.positive_cumulation = [0] * self._len

pygal/graph/stackedline.py

@@ -46,7 +46,7 @@ class StackedLine(Line):
         for series_group in (self.series, self.secondary_series):
             accumulation = [0] * self._len
             for serie in series_group:
-                accumulation = map(sum, zip(accumulation, serie.values))
+                accumulation = list(map(sum, zip(accumulation, serie.values)))
                 serie.points = [
                     (x_pos[i], v)
                     for i, v in enumerate(accumulation)]

pygal/graph/verticalpyramid.py

@@ -43,11 +43,11 @@ class VerticalPyramid(StackedBar):
         negative_vals = zip(*[serie.safe_values
                               for index, serie in enumerate(series)
                               if not index % 2])
-        return positive_vals, negative_vals
+        return list(positive_vals), list(negative_vals)
 
     def _compute_box(self, positive_vals, negative_vals):
-        positive_sum = map(sum, positive_vals) or [self.zero]
-        negative_sum = map(sum, negative_vals) or [self.zero]
+        positive_sum = list(map(sum, positive_vals)) or [self.zero]
+        negative_sum = list(map(sum, negative_vals)) or [self.zero]
         self._box.ymax = max(max(positive_sum), max(negative_sum))
         self._box.ymin = - self._box.ymax
 

pygal/graph/worldmap.py

@@ -38,7 +38,7 @@ with open(os.path.join(
 class Worldmap(Graph):
     """Worldmap graph"""
     _dual = True
-    x_labels = COUNTRIES.keys()
+    x_labels = list(COUNTRIES.keys())
     country_names = COUNTRIES
     _adapters = [int_to_country]
 
@@ -63,7 +63,8 @@ class Worldmap(Graph):
         map.set('height', str(self.view.height))
 
         for i, serie in enumerate(self.series):
-            safe_vals = filter(lambda x: x is not None, cut(serie.values, 1))
+            safe_vals = list(filter(
+                lambda x: x is not None, cut(serie.values, 1)))
             if not safe_vals:
                 continue
             min_ = min(safe_vals)

pygal/graph/xy.py

@@ -72,9 +72,9 @@ class XY(Line):
         for serie in self.all_series:
             serie.points = serie.values
             if self.interpolate and xrng:
-                vals = zip(*sorted(
+                vals = list(zip(*sorted(
                     filter(lambda t: None not in t,
-                           serie.points), key=lambda x: x[0]))
+                           serie.points), key=lambda x: x[0])))
                 serie.interpolated = self._interpolate(
                     vals[1], vals[0], xy=True, xy_xmin=xmin, xy_rng=xrng)
 
@@ -102,5 +102,5 @@ class XY(Line):
         y_pos = compute_scale(
             self._box.ymin, self._box.ymax, self.logarithmic, self.order_min)
 
-        self._x_labels = zip(map(self._format, x_pos), x_pos)
-        self._y_labels = zip(map(self._format, y_pos), y_pos)
+        self._x_labels = list(zip(map(self._format, x_pos), x_pos))
+        self._y_labels = list(zip(map(self._format, y_pos), y_pos))

pygal/interpolate.py

@@ -39,7 +39,7 @@ def interpolation(x, y, kind):
     if len(y) < len(x):
         x = x[:len(y)]
 
-    pack = zip(*filter(lambda t: None not in t, zip(x, y)))
+    pack = list(zip(*filter(lambda t: None not in t, zip(x, y))))
     if len(pack) == 0:
         return ident
     x, y = pack

pygal/serie.py

@@ -32,7 +32,7 @@ class Serie(object):
 
     @cached_property
     def safe_values(self):
-        return filter(lambda x: x is not None, self.values)
+        return list(filter(lambda x: x is not None, self.values))
 
 
 class Label(object):

pygal/svg.py

@@ -22,6 +22,7 @@ Svg helper
 """
 
 from __future__ import division
+from pygal._compat import urlparse, to_str
 import io
 import os
 import json
@@ -29,7 +30,6 @@ from datetime import date
 from numbers import Number
 from lxml import etree
 from math import cos, sin, pi
-from urlparse import urlparse
 from pygal.util import template, coord_format, minify_css
 from pygal import __version__
 
@@ -109,12 +109,12 @@ class Svg(object):
                 if in_attrib_and_number(pos):
                     attrib[pos] = attrib[pos] - attrib[dim]
 
-        for key, value in attrib.items():
+        for key, value in dict(attrib).items():
             if value is None:
                 del attrib[key]
-            elif not isinstance(value, basestring):
-                attrib[key] = str(value)
-            elif key.endswith('_'):
+
+            attrib[key] = to_str(value)
+            if key.endswith('_'):
                 attrib[key.rstrip('_')] = attrib[key]
                 del attrib[key]
             elif key == 'href':

pygal/test/test_config.py

@@ -190,12 +190,12 @@ def test_human_readable():
     line = Line()
     line.add('_', [10 ** 4, 10 ** 5, 23 * 10 ** 4])
     q = line.render_pyquery()
-    assert q(".axis.y text").map(texts) == map(
-        str, map(float, range(20000, 240000, 20000)))
+    assert q(".axis.y text").map(texts) == list(map(
+        str, map(float, range(20000, 240000, 20000))))
     line.human_readable = True
     q = line.render_pyquery()
-    assert q(".axis.y text").map(texts) == map(
-        lambda x: '%dk' % x, range(20, 240, 20))
+    assert q(".axis.y text").map(texts) == list(map(
+        lambda x: '%dk' % x, range(20, 240, 20)))
 
 
 def test_show_legend():

pygal/test/test_graph.py

@@ -66,7 +66,7 @@ def test_metadata(Chart):
     chart = Chart()
     v = range(7)
     if Chart == pygal.XY:
-        v = map(lambda x: (x, x + 1), v)
+        v = list(map(lambda x: (x, x + 1), v))
 
     chart.add('Serie with metadata', [
         v[0],

pygal/util.py

@@ -21,10 +21,12 @@ Various utils
 
 """
 from __future__ import division
+from pygal._compat import to_str
 import re
 from decimal import Decimal
 from math import floor, pi, log, log10, ceil
 from itertools import cycle
+from functools import reduce
 from pygal.adapters import not_zero, positive
 ORDERS = u"yzafpnµm kMGTPEZY"
 
@@ -78,7 +80,7 @@ def cut(list_, index=0):
         cut_ = lambda x: x[index]
     else:
         cut_ = lambda x: getattr(x, index)
-    return map(cut_, list_)
+    return list(map(cut_, list_))
 
 
 def rad(degrees):
@@ -213,10 +215,7 @@ def decorate(svg, node, metadata):
         if key == 'xlink' and isinstance(value, dict):
             value = value.get('href', value)
         if value:
-            if isinstance(value, unicode):
-                svg.node(node, 'desc', class_=key).text = value
-            else:
-                svg.node(node, 'desc', class_=key).text = str(value)
+            svg.node(node, 'desc', class_=key).text = to_str(value)
     return node
 
 
@@ -225,7 +224,7 @@ def cycle_fill(short_list, max_len):
     short_list = list(short_list)
     list_cycle = cycle(short_list)
     while len(short_list) < max_len:
-        short_list.append(list_cycle.next())
+        short_list.append(next(list_cycle))
     return short_list
 
 
@@ -305,6 +304,9 @@ def prepare_values(raw, config, cls):
     if config.zero == 0 and issubclass(cls, Worldmap):
         config.zero = 1
 
+    for key in ('x_labels', 'y_labels'):
+        if getattr(config, key):
+            setattr(config, key, list(getattr(config, key)))
     if not raw:
         return
 
@@ -316,6 +318,12 @@ def prepare_values(raw, config, cls):
         adapters = adapters + [positive, not_zero]
     adapter = reduce(compose, adapters) if not config.strict else ident
     series = []
+
+    raw = [(
+        title,
+        list(raw_values) if not isinstance(raw_values, dict) else raw_values
+    ) for title, raw_values in raw]
+
     width = max([len(values) for _, values in raw] +
                 [len(config.x_labels or [])])
 
@@ -324,15 +332,14 @@ def prepare_values(raw, config, cls):
         values = []
         if isinstance(raw_values, dict):
             if issubclass(cls, Worldmap):
-                raw_values = raw_values.items()
+                raw_values = list(raw_values.items())
             else:
                 value_list = [None] * width
                 for k, v in raw_values.items():
                     if k in config.x_labels:
                         value_list[config.x_labels.index(k)] = v
                 raw_values = value_list
-        else:
-            raw_values = list(raw_values)
+
         for index, raw_value in enumerate(
                 raw_values + (
                     (width - len(raw_values)) * [None]  # aligning values
@@ -351,7 +358,7 @@ def prepare_values(raw, config, cls):
                 if issubclass(cls, DateY) or issubclass(cls, Worldmap):
                     value = (adapter(value[0]), value[1])
                 else:
-                    value = map(adapter, value)
+                    value = list(map(adapter, value))
             else:
                 value = adapter(value)
 

setup.py

@@ -42,7 +42,6 @@ setup(
     tests_require=["pytest", "pyquery", "flask", "cairosvg"],
     package_data={'pygal': ['css/*', 'graph/worldmap.svg']},
     install_requires=['lxml'],
-    use_2to3=True,
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",