[Python-modules-commits] [napalm-base] 05/05: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository napalm-base.

commit 77d67b2e6feee699b084e88ef25ad5bbc4c597e7
Merge: 9d9f40c fd2ab88
Author: Vincent Bernat <bernat at debian.org>
Date:   Wed Nov 2 19:48:48 2016 +0100

    merge patched into master

 debian/.git-dpm                                            | 4 ++--
 debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch | 6 +++---
 napalm_base/helpers.py                                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index c616a51,0000000..1f94ccc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- fe790a74fc94d9e891164d6c47457cd5422bfacf
- fe790a74fc94d9e891164d6c47457cd5422bfacf
++fd2ab88250f3307fd386f8279301183c3640cec3
++fd2ab88250f3307fd386f8279301183c3640cec3
 +b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
 +b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
 +napalm-base_0.18.0.orig.tar.gz
 +56fd8a0bf34f49b9434d73ef72a35346d07b8df3
 +27160
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
index 2c3e334,0000000..f3d53ea
mode 100644,000000..100644
--- a/debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
+++ b/debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
@@@ -1,46 -1,0 +1,46 @@@
- From fe790a74fc94d9e891164d6c47457cd5422bfacf Mon Sep 17 00:00:00 2001
++From fd2ab88250f3307fd386f8279301183c3640cec3 Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Wed, 2 Nov 2016 19:44:23 +0100
 +Subject: Use gtextfsm instead of jtextfsm
 +
 +While gtextfsm is not compatible with Python 3, jtextfsm is not in
 +Debian and tests are failing with Python 2. Since the remaining of the
 +ecosystem is mostly Python 2 and the freeze is soon, let's use the
 +simpler solution.
 +---
 + napalm_base.egg-info/requires.txt | 2 +-
 + napalm_base/helpers.py            | 2 +-
 + requirements.txt                  | 2 +-
 + 3 files changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/napalm_base.egg-info/requires.txt b/napalm_base.egg-info/requires.txt
 +index d8a6f3e5b4e1..695a0d602425 100644
 +--- a/napalm_base.egg-info/requires.txt
 ++++ b/napalm_base.egg-info/requires.txt
 +@@ -1,3 +1,3 @@
 +-jtextfsm
 ++gtextfsm
 + jinja2
 + netaddr
 +diff --git a/napalm_base/helpers.py b/napalm_base/helpers.py
- index 0dc3bfe9ce6b..47c75ac38852 100644
++index 0dc3bfe9ce6b..61726373ee61 100644
 +--- a/napalm_base/helpers.py
 ++++ b/napalm_base/helpers.py
 +@@ -10,7 +10,7 @@ import sys
 + 
 + # third party libs
 + import jinja2
 +-import jtextfsm as textfsm
- +import gtextfsm as textfsm
+++import textfsm
 + from netaddr import EUI
 + from netaddr import mac_unix
 + from netaddr import IPAddress
 +diff --git a/requirements.txt b/requirements.txt
 +index d8a6f3e5b4e1..695a0d602425 100644
 +--- a/requirements.txt
 ++++ b/requirements.txt
 +@@ -1,3 +1,3 @@
 +-jtextfsm
 ++gtextfsm
 + jinja2
 + netaddr

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