summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelie <elie>2015-06-04 05:48:30 +0000
committerelie <elie>2015-06-04 05:48:30 +0000
commit51d5ff0ad3135542e47b53b3e8c5ae843c7a478f (patch)
treea712625cd8774ccc567bc0e5a895aa5d17b0a1bf
parent5cc617d3727d773206a67106fca22c146cf2f0aa (diff)
downloadpysnmp-51d5ff0ad3135542e47b53b3e8c5ae843c7a478f.tar.gz
use MibBuilder.loadTexts flag for initializing pysmi's genTexts one
-rw-r--r--pysnmp/smi/builder.py2
-rw-r--r--pysnmp/smi/compiler.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/pysnmp/smi/builder.py b/pysnmp/smi/builder.py
index 22c7776..831ddd2 100644
--- a/pysnmp/smi/builder.py
+++ b/pysnmp/smi/builder.py
@@ -320,7 +320,7 @@ class MibBuilder:
except error.MibNotFoundError:
if self.__mibCompiler:
debug.logger & debug.flagBld and debug.logger('loadModules: calling MIB compiler for %s' % modName)
- status = self.__mibCompiler.compile(modName)
+ status = self.__mibCompiler.compile(modName, genTexts=self.loadTexts)
errs = '; '.join([hasattr(x, 'error') and str(x.error) or x for x in status.values() if x in ('failed', 'missing')])
if errs:
raise error.MibNotFoundError('%s compilation error(s): %s' % (modName, errs))
diff --git a/pysnmp/smi/compiler.py b/pysnmp/smi/compiler.py
index dde6cdc..e8f31dc 100644
--- a/pysnmp/smi/compiler.py
+++ b/pysnmp/smi/compiler.py
@@ -4,6 +4,7 @@
#
import os
import sys
+
try:
from pysmi.reader.url import getReadersFromUrls
from pysmi.searcher.pypackage import PyPackageSearcher
@@ -56,7 +57,7 @@ else:
)
compiler.addBorrowers(
- *[ PyFileBorrower(x) for x in getReadersFromUrls(*borrowers, **dict(originalMatching=False, lowcaseMatching=False)) ]
+ *[ PyFileBorrower(x, genTexts=mibBuilder.loadTexts) for x in getReadersFromUrls(*borrowers, **dict(originalMatching=False, lowcaseMatching=False)) ]
)
mibBuilder.setMibCompiler(compiler, destination)