[Python-modules-commits] [python-netfilter] 01/03: Import python-netfilter_0.6.4.orig.tar.gz

Jeremy Lainé sharky at moszumanska.debian.org
Mon Aug 15 21:47:29 UTC 2016 

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

sharky pushed a commit to branch master
in repository python-netfilter.

commit 7895a05bd25d69ea8193b2e84c774f92a93ec5bd
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Mon Aug 15 23:16:22 2016 +0200

    Import python-netfilter_0.6.4.orig.tar.gz
---
 .addcopyright                 | 4 ++--
 ChangeLog                     | 3 +++
 README.md                     | 2 +-
 netfilter/__init__.py         | 2 +-
 netfilter/firewall.py         | 2 +-
 netfilter/parser.py           | 2 +-
 netfilter/rule.py             | 2 +-
 netfilter/table.py            | 4 +++-
 setup.py                      | 2 +-
 tests/test_netfilter.py       | 2 +-
 tests/test_netfilter_root.off | 2 +-
 11 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.addcopyright b/.addcopyright
index 940ebd6..2b2935f 100644
--- a/.addcopyright
+++ b/.addcopyright
@@ -1,8 +1,8 @@
 {
-'directories': ['netfilter'],
+'directories': ['netfilter', 'tests'],
 'license': """python-netfilter - Python modules for manipulating netfilter rules
 Copyright (C) 2007-2012 Bolloré Telecom
-Copyright (C) 2013-2015 Jeremy Lainé
+Copyright (C) 2013-2016 Jeremy Lainé
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/ChangeLog b/ChangeLog
index 3231d73..e29328a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+python-netfilter 0.6.4 (2016-07-25)
+ * Decode output of subprocess.Popen for python3 compatibility.
+
 python-netfilter 0.6.3 (2015-10-22)
  * Invoke iptables with --wait option if supported.
 
diff --git a/README.md b/README.md
index 67b2553..001cda3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 python-netfilter - Python modules for manipulating netfilter rules  
 Copyright (C) 2007-2012 Bolloré Telecom  
-Copyright (C) 2013-2015 Jeremy Lainé
+Copyright (C) 2013-2016 Jeremy Lainé
 
 About
 =====
diff --git a/netfilter/__init__.py b/netfilter/__init__.py
index 16016fa..f7e8881 100644
--- a/netfilter/__init__.py
+++ b/netfilter/__init__.py
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013-2015 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/netfilter/firewall.py b/netfilter/firewall.py
index e65dfe8..36e8658 100644
--- a/netfilter/firewall.py
+++ b/netfilter/firewall.py
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013-2015 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/netfilter/parser.py b/netfilter/parser.py
index d8c7ca0..5c32d11 100644
--- a/netfilter/parser.py
+++ b/netfilter/parser.py
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013-2015 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/netfilter/rule.py b/netfilter/rule.py
index e3c3ea5..2c02cc8 100644
--- a/netfilter/rule.py
+++ b/netfilter/rule.py
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013-2015 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/netfilter/table.py b/netfilter/table.py
index ee95a42..ad22e83 100644
--- a/netfilter/table.py
+++ b/netfilter/table.py
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013-2015 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -161,6 +161,8 @@ class Table:
             stderr=subprocess.PIPE,
             close_fds=True)
         out, err = p.communicate()
+        out = out.decode('utf8')
+        err = err.decode('utf8')
         status = p.wait()
         # check exit status
         if not os.WIFEXITED(status) or os.WEXITSTATUS(status):
diff --git a/setup.py b/setup.py
index fd7a648..0f67c4f 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='netfilter',
-    version='0.6.3',
+    version='0.6.4',
     description='Python modules for manipulating netfilter rules',
     url='https://github.com/jlaine/python-netfilter',
     author='Jeremy Laine',
diff --git a/tests/test_netfilter.py b/tests/test_netfilter.py
index e00a749..c5a3609 100644
--- a/tests/test_netfilter.py
+++ b/tests/test_netfilter.py
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/test_netfilter_root.off b/tests/test_netfilter_root.off
index d7deffc..7c9a239 100644
--- a/tests/test_netfilter_root.off
+++ b/tests/test_netfilter_root.off
@@ -2,7 +2,7 @@
 #
 # python-netfilter - Python modules for manipulating netfilter rules
 # Copyright (C) 2007-2012 Bolloré Telecom
-# Copyright (C) 2013 Jeremy Lainé
+# Copyright (C) 2013-2016 Jeremy Lainé
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

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

More information about the Python-modules-commits mailing list