fix to MIB data reading routine to make it working with possible Windows

end-of-line's

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 8c3b4e9..7a9c885 100644
--- a/CHANGES
+++ b/CHANGES
@@ -76,6 +76,7 @@ Revision 4.2.3
 - The notificationType parameter of AsynNotificationOriginator.sendNotification
   made defaulted to reflect its optional nature.
 - Built-in debugger now supports negating debugging categories.
+- Fix to MIB data reading routine to make it working with possible Windows end-of-line's.
 - Fix to CommandGenerator's SNMPv3 engine autodiscovery algorithm
   when retryCount is administratively set to 0.
 - Fix to Notification Originator to make it communicating a single
diff --git a/pysnmp/smi/builder.py b/pysnmp/smi/builder.py
index 3108d22..fd61d87 100644
--- a/pysnmp/smi/builder.py
+++ b/pysnmp/smi/builder.py
@@ -139,7 +139,7 @@ class ZipMibSource(__AbstractMibSource):
             raise IOError('No file in ZIP: %s' % p)
         
     def _getData(self, f, mode=None):
-        return self.__loader.get_data(os.path.join(self._srcName, f))
+        return self.__loader.get_data(os.path.join(self._srcName, f)).replace('\r\n', '\n')
 
 class DirMibSource(__AbstractMibSource):
     def _init(self):
@@ -158,7 +158,7 @@ class DirMibSource(__AbstractMibSource):
     def _getData(self, f, mode):
         try:
             if f in os.listdir(self._srcName): # make FS case-sensitive
-                return open(os.path.join(self._srcName, f), mode).read()
+                return open(os.path.join(self._srcName, f), mode).read().replace('\r\n', '\n')
         except OSError:
             pass
         raise IOError  # pretend there's no such file