[PATCH 1 of 2 jqplot] [six] Fix iteritems py2/py3

Simon Chabot simon.chabot at logilab.fr
Thu Mar 5 16:10:14 CET 2020


# HG changeset patch
# User Simon Chabot <simon.chabot at logilab.fr>
# Date 1583408410 -3600
#      Thu Mar 05 12:40:10 2020 +0100
# Node ID 0a6237db984009f601a4126efadadd62d382c960
# Parent  0e517d15ace1674d952a286688954abad5aad58b
# Available At https://hg.logilab.org/review/cubes/jqplot/
#              hg pull https://hg.logilab.org/review/cubes/jqplot/ -r 0a6237db9840
[six] Fix iteritems py2/py3

diff -r 0e517d15ace1 -r 0a6237db9840 cubicweb_jqplot/__pkginfo__.py
--- a/cubicweb_jqplot/__pkginfo__.py	Thu Jul 18 13:35:25 2019 +0200
+++ b/cubicweb_jqplot/__pkginfo__.py	Thu Mar 05 12:40:10 2020 +0100
@@ -14,7 +14,7 @@
 description = 'views wrapping jqPlot graphic library'
 web = 'http://www.cubicweb.org/project/%s' % distname
 
-__depends__ = {'cubicweb': '>= 3.24.0'}
+__depends__ = {'cubicweb': '>= 3.24.0', 'six': None}
 __recommends__ = {}
 
 classifiers = [
diff -r 0e517d15ace1 -r 0a6237db9840 cubicweb_jqplot/views.py
--- a/cubicweb_jqplot/views.py	Thu Jul 18 13:35:25 2019 +0200
+++ b/cubicweb_jqplot/views.py	Thu Mar 05 12:40:10 2020 +0100
@@ -26,6 +26,7 @@
 from logilab.mtconverter import xml_escape
 from logilab.common.date import datetime2ticks
 from cubicweb import _
+import six
 
 
 def filterout_nulls(abscissa, plot):
@@ -182,7 +183,7 @@
                 highlighter_.update(highlighter)
             highlighter = highlighter_
         axes = axes.copy()
-        for axis, options in axes.iteritems():
+        for axis, options in six.iteritems(axes):
             if 'renderer' in options:
                 options = options.copy()
                 options['renderer'] = self.renderer(self.axis_renderers,



More information about the cubicweb-devel mailing list