[packages/python-pysnmp] Fix handling of compiled (pyc/pyo) mibs

jajcus jajcus at pld-linux.org
Thu Dec 20 12:27:12 CET 2012


commit fe9f4630208c503e3d375d1d424514a99a83e6e4
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Thu Dec 20 12:26:54 2012 +0100

    Fix handling of compiled (pyc/pyo) mibs

 pysnmp-binary_mibs.patch | 21 +++++++++++++++++++++
 python-pysnmp.spec       |  2 ++
 2 files changed, 23 insertions(+)
---
diff --git a/python-pysnmp.spec b/python-pysnmp.spec
index fa543ef..b2f4f49 100644
--- a/python-pysnmp.spec
+++ b/python-pysnmp.spec
@@ -10,6 +10,7 @@ License:	BSD-like
 Group:		Libraries/Python
 Source0:	http://pypi.python.org/packages/source/p/pysnmp/%{module}-%{version}.tar.gz
 # Source0-md5:	c77a5e2e2424cd6691f0bf7e0ec4b233
+Patch0:		%{module}-binary_mibs.patch
 URL:		http://pysnmp.sourceforge.net/
 BuildRequires:	python >= 1:2.5
 BuildRequires:	rpm-pythonprov
@@ -56,6 +57,7 @@ Ten pakiet zawiera przykładowe programy do modułu Pythona pysnmp.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build
diff --git a/pysnmp-binary_mibs.patch b/pysnmp-binary_mibs.patch
new file mode 100644
index 0000000..1b1388e
--- /dev/null
+++ b/pysnmp-binary_mibs.patch
@@ -0,0 +1,21 @@
+diff -dur pysnmp-4.2.3.orig/pysnmp/smi/builder.py pysnmp-4.2.3/pysnmp/smi/builder.py
+--- pysnmp-4.2.3.orig/pysnmp/smi/builder.py	2012-08-29 23:22:35.000000000 +0200
++++ pysnmp-4.2.3/pysnmp/smi/builder.py	2012-12-20 10:49:27.000000000 +0100
+@@ -138,7 +138,7 @@
+         
+     def _getData(self, f, mode=None):
+         data = self.__loader.get_data(os.path.join(self._srcName, f))
+-        if sys.version_info[0] <= 2:
++        if sys.version_info[0] <= 2 and "b" not in mode:
+             data = data.replace('\r\n', '\n')
+         return data
+ 
+@@ -160,7 +160,7 @@
+         try:
+             if f in os.listdir(self._srcName): # make FS case-sensitive
+                 data = open(os.path.join(self._srcName, f), mode).read()
+-                if sys.version_info[0] <= 2:
++                if sys.version_info[0] <= 2 and "b" not in mode:
+                     data = data.replace('\r\n', '\n')
+                 return data
+         except OSError:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pysnmp.git/commitdiff/fe9f4630208c503e3d375d1d424514a99a83e6e4



More information about the pld-cvs-commit mailing list