9 files changed, 18 insertions, 18 deletions

diff --git a/glucometerutils/drivers/accuchek_reports.py b/glucometerutils/drivers/accuchek_reports.py
index 2ae41ba..03eeddd 100644
--- a/glucometerutils/drivers/accuchek_reports.py
+++ b/glucometerutils/drivers/accuchek_reports.py
@@ -26,8 +26,8 @@ from glucometerutils import common
 from glucometerutils import exceptions
 
 _UNIT_MAP = {
-  'mmol/l': common.UNIT_MMOLL,
-  'mg/dl': common.UNIT_MGDL,
+  'mmol/l': common.Unit.MMOL_L,
+  'mg/dl': common.Unit.MG_DL,
 }
 
 _DATE_CSV_KEY = 'Date'
diff --git a/glucometerutils/drivers/fsinsulinx.py b/glucometerutils/drivers/fsinsulinx.py
index 90abc7e..15bc131 100644
--- a/glucometerutils/drivers/fsinsulinx.py
+++ b/glucometerutils/drivers/fsinsulinx.py
@@ -57,7 +57,7 @@ class Device(freestyle.FreeStyleHidDevice):
 
     def get_glucose_unit(self):
         """Returns the glucose unit of the device."""
-        return common.UNIT_MGDL
+        return common.Unit.MG_DL
 
     def get_readings(self):
         """Iterate through the reading records in the device."""
diff --git a/glucometerutils/drivers/fslibre.py b/glucometerutils/drivers/fslibre.py
index a0f0517..52632b3 100644
--- a/glucometerutils/drivers/fslibre.py
+++ b/glucometerutils/drivers/fslibre.py
@@ -209,7 +209,7 @@ class Device(freestyle.FreeStyleHidDevice):
         """Returns the glucose unit of the device."""
         # TODO(Flameeyes): figure out how to identify the actual unit on the
         # device.
-        return common.UNIT_MGDL
+        return common.Unit.MG_DL
 
     def get_readings(self):
 
diff --git a/glucometerutils/drivers/fsoptium.py b/glucometerutils/drivers/fsoptium.py
index 121d8d6..5c57ae3 100644
--- a/glucometerutils/drivers/fsoptium.py
+++ b/glucometerutils/drivers/fsoptium.py
@@ -119,9 +119,9 @@ class Device(serial.SerialDevice):
       elif parsed_line[0] == 'Ver:':
         self.device_version_ = parsed_line[1]
         if parsed_line[2] == 'MMOL':
-          self.device_glucose_unit_ = common.UNIT_MMOLL
+          self.device_glucose_unit_ = common.Unit.MMOL_L
         else:  # I only have a mmol/l device, so I can't be sure.
-          self.device_glucose_unit_ = common.UNIT_MGDL
+          self.device_glucose_unit_ = common.Unit.MG_DL
       # There are more entries: Clock, Market, ROM and Usage, but we don't care
       # for those here.
       elif parsed_line[0] == 'CMD OK':
@@ -164,8 +164,8 @@ class Device(serial.SerialDevice):
     """Returns a constant representing the unit displayed by the meter.
 
     Returns:
-      common.UNIT_MGDL: if the glucometer displays in mg/dL
-      common.UNIT_MMOLL: if the glucometer displays in mmol/L
+      common.Unit.MG_DL: if the glucometer displays in mg/dL
+      common.Unit.MMOL_L: if the glucometer displays in mmol/L
     """
     return self.device_glucose_unit_
 
diff --git a/glucometerutils/drivers/fsprecisionneo.py b/glucometerutils/drivers/fsprecisionneo.py
index 6fd07c2..cb58263 100644
--- a/glucometerutils/drivers/fsprecisionneo.py
+++ b/glucometerutils/drivers/fsprecisionneo.py
@@ -66,7 +66,7 @@ class Device(freestyle.FreeStyleHidDevice):
 
     def get_glucose_unit(self):
         """Returns the glucose unit of the device."""
-        return common.UNIT_MGDL
+        return common.Unit.MG_DL
 
     def get_readings(self):
         """Iterate through the reading records in the device."""
diff --git a/glucometerutils/drivers/otultra2.py b/glucometerutils/drivers/otultra2.py
index e9f60bb..f44bc15 100644
--- a/glucometerutils/drivers/otultra2.py
+++ b/glucometerutils/drivers/otultra2.py
@@ -262,8 +262,8 @@ class Device(serial.SerialDevice):
     """Returns a constant representing the unit displayed by the meter.
 
     Returns:
-      common.UNIT_MGDL: if the glucometer displays in mg/dL
-      common.UNIT_MMOLL: if the glucometer displays in mmol/L
+      common.Unit.MG_DL: if the glucometer displays in mg/dL
+      common.Unit.MMOL_L: if the glucometer displays in mmol/L
 
     Raises:
       exceptions.InvalidGlucoseUnit: if the unit is not recognized
@@ -279,9 +279,9 @@ class Device(serial.SerialDevice):
     unit = match.group(1)
 
     if unit == 'MG/DL ':
-      return common.UNIT_MGDL
+      return common.Unit.MG_DL
     elif unit == 'MMOL/L':
-      return common.UNIT_MMOLL
+      return common.Unit.MMOL_L
     else:
       raise exceptions.InvalidGlucoseUnit(string)
 
diff --git a/glucometerutils/drivers/otultraeasy.py b/glucometerutils/drivers/otultraeasy.py
index 461de26..0538dac 100644
--- a/glucometerutils/drivers/otultraeasy.py
+++ b/glucometerutils/drivers/otultraeasy.py
@@ -295,9 +295,9 @@ class Device(serial.SerialDevice):
     response = self._read_response()
 
     if response.data[2] == 0:
-      return common.UNIT_MGDL
+      return common.Unit.MG_DL
     elif response.data[2] == 1:
-      return common.UNIT_MMOLL
+      return common.Unit.MMOL_L
     else:
       raise lifescan.MalformedCommand(
         'at position PM1 invalid value %02x for unit' % response.data[2])
diff --git a/glucometerutils/drivers/otverio2015.py b/glucometerutils/drivers/otverio2015.py
index 9dc9393..c416678 100644
--- a/glucometerutils/drivers/otverio2015.py
+++ b/glucometerutils/drivers/otverio2015.py
@@ -243,9 +243,9 @@ class Device(object):
   def get_glucose_unit(self):
     unit_value = self._read_parameter(_PARAMETER_KEY_UNIT)
     if unit_value == b'\x00\x00\x00\x00':
-      return common.UNIT_MGDL
+      return common.Unit.MG_DL
     elif unit_value == b'\x01\x00\x00\x00':
-      return common.UNIT_MMOLL
+      return common.Unit.MMOL_L
     else:
       raise exceptions.InvalidGlucoseUnit('%r' % unit_value)
 
diff --git a/glucometerutils/drivers/sdcodefree.py b/glucometerutils/drivers/sdcodefree.py
index 8b07ab5..4939361 100644
--- a/glucometerutils/drivers/sdcodefree.py
+++ b/glucometerutils/drivers/sdcodefree.py
@@ -164,7 +164,7 @@ class Device(serial.SerialDevice):
 
     def get_glucose_unit(self):
         # Device does not provide information on glucose unit.
-        return common.UNIT_MGDL
+        return common.Unit.MG_DL
 
     def get_datetime(self):
         raise NotImplementedError