Changeset 2630

Timestamp:

May 21, 2010 10:47:57 AM (11 years ago)

Author:

wehart

Message:

Restricting the symbols that are exported from coopr.pyomo.base explicitly.
For some reason, the all specifications are not sufficient to eliminate
the symbol names for modules within coopr.pyomo.base.

This fixes #4052

Location:

coopr.pyomo/trunk/coopr/pyomo

Files:

• base/__init__.py (modified) (1 diff)
• io/cpxlp.py (modified) (3 diffs)

coopr.pyomo/trunk/coopr/pyomo/base/__init__.py

@@ -30 +30 @@
 from util import *
 from rangeset import *
+
+#
+# This is a hack to strip out modules, which shouldn't have been included in these imports
+#
+import types
+_locals = locals()
+__all__ = [__name for __name in _locals.keys() if (not __name.startswith('_') and not isinstance(_locals[__name],types.ModuleType)) or __name == '_' ]
+__all__.append('pyomo')

coopr.pyomo/trunk/coopr/pyomo/io/cpxlp.py

@@ -14 +14 @@
 
 from coopr.opt import ProblemFormat
-from coopr.pyomo.base import expr, Var, Constraint, Objective
+from coopr.pyomo.base import expr, Var, Constraint, Objective, NumericConstant
 from coopr.pyomo.base.var import _VarValue, _VarBase
 from coopr.pyomo.base.param import _ParamValue
@@ -180 +180 @@
                    if not isinstance(base,expr._SumExpression):
                        raise ValueError, "Quadratic term base must be a _SumExpression"
-                   if not isinstance(exponent,numvalue.NumericConstant):
+                   if not isinstance(exponent,NumericConstant):
                        raise ValueError, "Quadratic term exponent must be a NumericConstant"
                    variable = base._args[0]
@@ -208 +208 @@
                          print >>OUTPUT, " - " + str(objective_offset) + " ONE_VAR_CONSTANT"
                       
-            elif isinstance(arg,numvalue.NumericConstant):
+            elif isinstance(arg,NumericConstant):
                 # this is the "0.0" element that forms the initial expression - the
                 # quadratic sub-expressions aren't known to the presolve routines.