From 51d5ff0ad3135542e47b53b3e8c5ae843c7a478f Mon Sep 17 00:00:00 2001 From: elie Date: Thu, 4 Jun 2015 05:48:30 +0000 Subject: use MibBuilder.loadTexts flag for initializing pysmi's genTexts one --- pysnmp/smi/builder.py | 2 +- pysnmp/smi/compiler.py | 3 ++- 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) -- cgit v1.2.1