imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Renamed the parameter period_spec to spec in the period parser.

Browse Source
This commit is contained in:
依瑪貓 2020-07-08 08:13:47 +08:00
parent 39d65e1381
commit 56ae1bb29a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mia_core/period.py
View File

@ -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(