Index: leahi_dialin/common/dd_defs_proxy.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b
--- leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b)
@@ -14,50 +14,50 @@
 #
 ############################################################################
 
-from .dd_defs import *
+from . import dd_defs
 
 
 class DD_Defs():
 
-    DDOpModes = DDOpModes
-    DDFaultStates = DDFaultStates
-    DDFaultNVDataStates = DDFaultNVDataStates
-    DDServiceStates = DDServiceStates
-    DDInitStates = DDInitStates
-    DDStandbyStates = DDStandbyStates
-    DDPreGenDialysateStates = DDPreGenDialysateStates
-    DDGenDialysateModeStates = DDGenDialysateModeStates
-    DDPostGenDialysateStates = DDPostGenDialysateStates
-    DDHeatDisinfectStates = DDHeatDisinfectStates
-    DDHeaterCoolingStates = DDHeaterCoolingStates
-    DDROPermeateStates = DDROPermeateStates
-    DDNotLegalStates = DDNotLegalStates
+    DDOpModes                       = dd_defs.DDOpModes
+    DDFaultStates                   = dd_defs.DDFaultStates
+    DDFaultNVDataStates             = dd_defs.DDFaultNVDataStates
+    DDServiceStates                 = dd_defs.DDServiceStates
+    DDInitStates                    = dd_defs.DDInitStates
+    DDStandbyStates                 = dd_defs.DDStandbyStates
+    DDPreGenDialysateStates         = dd_defs.DDPreGenDialysateStates
+    DDGenDialysateModeStates        = dd_defs.DDGenDialysateModeStates
+    DDPostGenDialysateStates        = dd_defs.DDPostGenDialysateStates
+    DDHeatDisinfectStates           = dd_defs.DDHeatDisinfectStates
+    DDHeaterCoolingStates           = dd_defs.DDHeaterCoolingStates
+    DDROPermeateStates              = dd_defs.DDROPermeateStates
+    DDNotLegalStates                = dd_defs.DDNotLegalStates
 
-    DDEventList = DDEventList
-    DDEventDataTypes = DDEventDataTypes
+    DDEventList                     = dd_defs.DDEventList
+    DDEventDataTypes                = dd_defs.DDEventDataTypes
 
-    DDConcentratePumpNames = DDConcentratePumpNames
-    DDConductivitySensorNames = DDConductivitySensorNames
-    DDDialysatePumpNames = DDDialysatePumpNames
-    DDHeaterNames = DDHeaterNames
-    DDLevelSensorNames = DDLevelSensorNames
-    DDPistonPumpNames = DDPistonPumpNames
-    DDPressureSensorNames = DDPressureSensorNames
-    DDTemperatureSensorNames = DDTemperatureSensorNames
-    DDValveNames = DDValveNames
-    DDMonitoredVoltages = DDMonitoredVoltages
+    DDConcentratePumpNames          = dd_defs.DDConcentratePumpNames
+    DDConductivitySensorNames       = dd_defs.DDConductivitySensorNames
+    DDDialysatePumpNames            = dd_defs.DDDialysatePumpNames
+    DDHeaterNames                   = dd_defs.DDHeaterNames
+    DDLevelSensorNames              = dd_defs.DDLevelSensorNames
+    DDPistonPumpNames               = dd_defs.DDPistonPumpNames
+    DDPressureSensorNames           = dd_defs.DDPressureSensorNames
+    DDTemperatureSensorNames        = dd_defs.DDTemperatureSensorNames
+    DDValveNames                    = dd_defs.DDValveNames
+    DDMonitoredVoltages             = dd_defs.DDMonitoredVoltages
 
-    DDBalancingChamberStates = DDBalancingChamberStates
-    DDBalancingChamberSwitchStates = DDBalancingChamberSwitchStates
-    DDBloodLeakStates = DDBloodLeakStates
-    DDConcentratePumpAttributes = DDConcentratePumpAttributes
-    DDConcentratePumpStates = DDConcentratePumpStates
-    DDDialysatePumpAttributes = DDDialysatePumpAttributes
-    DDDialysatePumpsStates =DDDialysatePumpsStates
-    DDHeaterStartStop = DDHeaterStartStop
-    DDHeaterAttributes = DDHeaterAttributes
-    DDHeaterExecState = DDHeaterExecState
-    DDPistonPumpAttributes = DDPistonPumpAttributes
-    DDValveStates = DDValveStates
+    DDBalancingChamberStates        = dd_defs.DDBalancingChamberStates
+    DDBalancingChamberSwitchStates  = dd_defs.DDBalancingChamberSwitchStates
+    DDBloodLeakStates               = dd_defs.DDBloodLeakStates
+    DDConcentratePumpAttributes     = dd_defs.DDConcentratePumpAttributes
+    DDConcentratePumpStates         = dd_defs.DDConcentratePumpStates
+    DDDialysatePumpAttributes       = dd_defs.DDDialysatePumpAttributes
+    DDDialysatePumpsStates          = dd_defs.DDDialysatePumpsStates
+    DDHeaterStartStop               = dd_defs.DDHeaterStartStop
+    DDHeaterAttributes              = dd_defs.DDHeaterAttributes
+    DDHeaterExecState               = dd_defs.DDHeaterExecState
+    DDPistonPumpAttributes          = dd_defs.DDPistonPumpAttributes
+    DDValveStates                   = dd_defs.DDValveStates
 
 dd_enum_repository = DD_Defs()