Simplify DateUnit

Author: Mauko Quiroga

openfisca_core/data_storage/in_memory_storage.py

@@ -15,7 +15,7 @@ def __init__(self, is_eternal = False):
 
     def get(self, period):
         if self.is_eternal:
-            period = periods.period(DateUnit.Eternity)
+            period = periods.period(DateUnit.ETERNITY)
         period = periods.period(period)
 
         values = self._arrays.get(period)
@@ -25,7 +25,7 @@ def get(self, period):
 
     def put(self, value, period):
         if self.is_eternal:
-            period = periods.period(DateUnit.Eternity)
+            period = periods.period(DateUnit.ETERNITY)
         period = periods.period(period)
 
         self._arrays[period] = value
@@ -36,7 +36,7 @@ def delete(self, period = None):
             return
 
         if self.is_eternal:
-            period = periods.period(DateUnit.Eternity)
+            period = periods.period(DateUnit.ETERNITY)
         period = periods.period(period)
 
         self._arrays = {

openfisca_core/data_storage/on_disk_storage.py

@@ -29,7 +29,7 @@ def _decode_file(self, file):
 
     def get(self, period):
         if self.is_eternal:
-            period = periods.period(DateUnit.Eternity)
+            period = periods.period(DateUnit.ETERNITY)
         period = periods.period(period)
 
         values = self._files.get(period)
@@ -39,7 +39,7 @@ def get(self, period):
 
     def put(self, value, period):
         if self.is_eternal:
-            period = periods.period(DateUnit.Eternity)
+            period = periods.period(DateUnit.ETERNITY)
         period = periods.period(period)
 
         filename = str(period)
@@ -56,7 +56,7 @@ def delete(self, period = None):
             return
 
         if self.is_eternal:
-            period = periods.period(DateUnit.Eternity)
+            period = periods.period(DateUnit.ETERNITY)
         period = periods.period(period)
 
         if period is not None:

openfisca_core/holders/helpers.py

@@ -20,10 +20,10 @@ def set_input_dispatch_by_period(holder, period, array):
     period_size = period.size
     period_unit = period.unit
 
-    if holder.variable.definition_period == DateUnit.Month:
-        cached_period_unit = DateUnit.Month
-    elif holder.variable.definition_period == DateUnit.Year:
-        cached_period_unit = DateUnit.Year
+    if holder.variable.definition_period == DateUnit.MONTH:
+        cached_period_unit = DateUnit.MONTH
+    elif holder.variable.definition_period == DateUnit.YEAR:
+        cached_period_unit = DateUnit.YEAR
     else:
         raise ValueError('set_input_dispatch_by_period can be used only for yearly or monthly variables.')
 
@@ -55,10 +55,10 @@ def set_input_divide_by_period(holder, period, array):
     period_size = period.size
     period_unit = period.unit
 
-    if holder.variable.definition_period == DateUnit.Month:
-        cached_period_unit = DateUnit.Month
-    elif holder.variable.definition_period == DateUnit.Year:
-        cached_period_unit = DateUnit.Year
+    if holder.variable.definition_period == DateUnit.MONTH:
+        cached_period_unit = DateUnit.MONTH
+    elif holder.variable.definition_period == DateUnit.YEAR:
+        cached_period_unit = DateUnit.YEAR
     else:
         raise ValueError('set_input_divide_by_period can be used only for yearly or monthly variables.')
 

openfisca_core/holders/holder.py

@@ -20,7 +20,7 @@ def __init__(self, variable, population):
         self.population = population
         self.variable = variable
         self.simulation = population.simulation
-        self._memory_storage = InMemoryStorage(is_eternal = (self.variable.definition_period == DateUnit.Eternity))
+        self._memory_storage = InMemoryStorage(is_eternal = (self.variable.definition_period == DateUnit.ETERNITY))
 
         # By default, do not activate on-disk storage, or variable dropping
         self._disk_storage = None
@@ -57,7 +57,7 @@ def create_disk_storage(self, directory = None, preserve = False):
             os.mkdir(storage_dir)
         return OnDiskStorage(
             storage_dir,
-            is_eternal = (self.variable.definition_period == DateUnit.Eternity),
+            is_eternal = (self.variable.definition_period == DateUnit.ETERNITY),
             preserve_storage_dir = preserve
             )
 
@@ -149,13 +149,13 @@ def set_input(self, period, array):
         """
 
         period = periods.period(period)
-        if period.unit == DateUnit.Eternity and self.variable.definition_period != DateUnit.Eternity:
+        if period.unit == DateUnit.ETERNITY and self.variable.definition_period != DateUnit.ETERNITY:
             error_message = os.linesep.join([
                 'Unable to set a value for variable {0} for {1}.',
                 '{0} is only defined for {2}s. Please adapt your input.',
                 ]).format(
                     self.variable.name,
-                    DateUnit.Eternity,
+                    DateUnit.ETERNITY,
                     self.variable.definition_period,
                 )
             raise PeriodMismatchError(
@@ -199,9 +199,9 @@ def _to_array(self, value):
 
     def _set(self, period, value):
         value = self._to_array(value)
-        if self.variable.definition_period != DateUnit.Eternity:
+        if self.variable.definition_period != DateUnit.ETERNITY:
             if period is None:
-                raise ValueError(f'A period must be specified to set values, except for variables with {DateUnit.Eternity} as as period_definition.')
+                raise ValueError(f'A period must be specified to set values, except for variables with {DateUnit.ETERNITY} as as period_definition.')
             if (self.variable.definition_period != period.unit or period.size > 1):
                 name = self.variable.name
                 period_size_adj = f'{period.unit}' if (period.size == 1) else f'{period.size}-{period.unit}s'

openfisca_core/periods/__init__.py

@@ -41,7 +41,7 @@
 from .helpers import unit_weight, unit_weights  # noqa: F401
 
 for item in DateUnit:
-    globals()[item.name.upper()] = item.key
+    globals()[item.name] = item.value
 
 str_by_instant_cache: Dict[Any, Any] = {}
 """Cache to store :obj:`str` reprentations of :obj:`.Instant`.