From 56ae1bb29a1b28d278d5f13895ecee9b472f0849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 8 Jul 2020 08:13:47 +0800 Subject: [PATCH] Renamed the parameter period_spec to spec in the period parser. --- mia_core/period.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mia_core/period.py b/mia_core/period.py index 55d90ce..6dfe190 100644 --- a/mia_core/period.py +++ b/mia_core/period.py @@ -32,7 +32,7 @@ class PeriodParser: """The period parser. Args: - period_spec (str): The period specification. + spec (str): The period specification. Attributes: spec (str): The currently-using period specification. @@ -48,10 +48,10 @@ class PeriodParser: description = None error = None - def __init__(self, period_spec): - self.spec = period_spec + def __init__(self, spec): + self.spec = spec # A specific month - m = re.match("^([0-9]{4})-([0-9]{2})$", period_spec) + m = re.match("^([0-9]{4})-([0-9]{2})$", spec) if m is not None: year = int(m.group(1)) month = int(m.group(2)) @@ -64,7 +64,7 @@ class PeriodParser: self.description = self.get_month_text(year, month) return # From a specific month - m = re.match("^([0-9]{4})-([0-9]{2})-$", period_spec) + m = re.match("^([0-9]{4})-([0-9]{2})-$", spec) if m is not None: year = int(m.group(1)) month = int(m.group(2)) @@ -78,7 +78,7 @@ class PeriodParser: "Since %s") % self.get_month_text(year, month) return # A specific year - m = re.match("^([0-9]{4})$", period_spec) + m = re.match("^([0-9]{4})$", spec) if m is not None: year = int(m.group(1)) try: @@ -96,14 +96,14 @@ class PeriodParser: self.description = str(year) return # All time - if period_spec == "-": + if spec == "-": self.start = date(2000, 1, 1) self.end = self.get_month_last_day(localdate()) self.description = gettext("All") return # A specific date m = re.match("^([0-9]{4})-([0-9]{2})-([0-9]{2})$", - period_spec) + spec) if m is not None: try: self.start = date( @@ -117,7 +117,7 @@ class PeriodParser: # A specific date period m = re.match(("^([0-9]{4})-([0-9]{2})-([0-9]{2})" "-([0-9]{4})-([0-9]{2})-([0-9]{2})$"), - period_spec) + spec) if m is not None: try: self.start = date(