diff options
author | elie <elie> | 2012-10-14 20:41:26 +0000 |
---|---|---|
committer | elie <elie> | 2012-10-14 20:41:26 +0000 |
commit | bed1afa89bcf4047658ff1ffa4dc452eb3c8892a (patch) | |
tree | 18e286f18a3792561909871e0c95c62ed5da2190 /pysnmp/smi | |
parent | 269e6270851b23567edb55969935d5c2d739adfb (diff) | |
download | pysnmp-bed1afa89bcf4047658ff1ffa4dc452eb3c8892a.tar.gz |
Attempt to convert Windows style EOL into UNIX ones in MIB source
modules appeared to be unnecessary and even destructive to modules
data in some cases. So the convertion code removed altogether.
Diffstat (limited to 'pysnmp/smi')
-rw-r--r-- | pysnmp/smi/builder.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pysnmp/smi/builder.py b/pysnmp/smi/builder.py index 8890120..53ea337 100644 --- a/pysnmp/smi/builder.py +++ b/pysnmp/smi/builder.py @@ -137,10 +137,7 @@ class ZipMibSource(__AbstractMibSource): raise IOError('No file in ZIP: %s' % p) def _getData(self, f, mode=None): - data = self.__loader.get_data(os.path.join(self._srcName, f)) - if sys.version_info[0] <= 2: - data = data.replace('\r\n', '\n') - return data + return self.__loader.get_data(os.path.join(self._srcName, f)) class DirMibSource(__AbstractMibSource): def _init(self): @@ -159,10 +156,7 @@ class DirMibSource(__AbstractMibSource): def _getData(self, f, mode): 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: - data = data.replace('\r\n', '\n') - return data + return open(os.path.join(self._srcName, f), mode).read() except OSError: pass raise IOError # pretend there's no such file |