mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Version bump

Browse Source
This commit is contained in:
Krateng 2021-01-15 18:45:42 +01:00
parent bcd62c16fa
commit 5006ad2bf1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maloja/__pkginfo__.py
View File

@ -5,7 +5,7 @@ author = {
"email":"maloja@krateng.dev", "email":"maloja@krateng.dev",
"github": "krateng" "github": "krateng"
} }
version = 2,12,1 version = 2,12,2
versionstr = ".".join(str(n) for n in version) versionstr = ".".join(str(n) for n in version)
links = { links = {
"pypi":"malojaserver", "pypi":"malojaserver",

9
maloja/malojatime.py
View File

@ -204,17 +204,16 @@ class MTime(MRangeDescriptor):
# a range that is exactly one christian week (starting on sunday) # a range that is exactly one christian week (starting on sunday)
class MTimeWeek(MRangeDescriptor): class MTimeWeek(MRangeDescriptor):
def __init__(self,year=None,week=None): def __init__(self,year=None,week=None):
self.year = year
self.week = week
thisisoyear_firstday = datetime.date.fromisocalendar(year,1,1) - datetime.timedelta(days=1) thisisoyear_firstday = datetime.date.fromisocalendar(year,1,1) - datetime.timedelta(days=1) #sunday instead of monday
self.firstday = thisisoyear_firstday + datetime.timedelta(days=7*(week-1)) self.firstday = thisisoyear_firstday + datetime.timedelta(days=7*(week-1))
# do this so we can construct the week with overflow (eg 2020/-3)
self.lastday = self.firstday + datetime.timedelta(days=6) self.lastday = self.firstday + datetime.timedelta(days=6)
# now check if we're still in the same year # now get the actual year and week number (in case of overflow)
y,w,_ = self.firstday.chrcalendar() y,w,_ = self.firstday.chrcalendar()
self.year,self.week = y,w self.year,self.week,_ = self.firstday.chrcalendar()