[Python-modules-commits] [gmplot] 02/04: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository gmplot.

commit deb9ca153d903c6d70db4732cc11925fd2b76d95
Merge: fb4a466 1b1248e
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Feb 1 22:34:13 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/0002-Updated-itermitems-to-items.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 gmplot/gmplot.py                                   |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 67ca3f3,0000000..675c096
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 5fd31ca1a4b83fa64f5f5383625fdda8be36ba54
- 5fd31ca1a4b83fa64f5f5383625fdda8be36ba54
++1b1248e91ce6aa71d14217c193b05bb1331a8d72
++1b1248e91ce6aa71d14217c193b05bb1331a8d72
 +11bf4305066feabdbba5d16467943aed2a172572
 +11bf4305066feabdbba5d16467943aed2a172572
 +gmplot_1.1.0.orig.tar.gz
 +86702a5730dacf0d26a4ee7ebc5a0d5318954e94
 +115273
diff --cc debian/patches/0002-Updated-itermitems-to-items.patch
index 0000000,0000000..78833b4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Updated-itermitems-to-items.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 1b1248e91ce6aa71d14217c193b05bb1331a8d72 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Mon, 1 Feb 2016 22:32:44 +0000
++Subject: Updated itermitems() to items()
++
++Iteritems() was breaking when using with Python 3+. items() in 3+ has the same
++functionality as iteritems() in 2+
++
++https://github.com/vgm64/gmplot/commit/50c0367cbf1e1ff3aedcf5f36a1cbcf237b820ed
++---
++ gmplot/gmplot.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/gmplot/gmplot.py b/gmplot/gmplot.py
++index a911c7d..ae601f9 100644
++--- a/gmplot/gmplot.py
+++++ b/gmplot/gmplot.py
++@@ -102,7 +102,7 @@ class GoogleMapPlotter(object):
++                             settings["face_color"]
++ 
++         # Need to replace "plum" with "#DDA0DD" and "c" with "#00FFFF" (cyan).
++-        for key, color in settings.iteritems():
+++        for key, color in settings.items():
++             if 'color' in key:
++                 color = self.color_dict.get(color, color)
++                 color = self.html_color_codes.get(color, color)
diff --cc debian/patches/series
index d2ab32d,0000000..b5d69fd
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-use-relative-imports.patch
++0002-Updated-itermitems-to-items.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gmplot.git