dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1680

Browse Source
This commit is contained in:
Leonel Câmara
2017-07-14 20:17:30 +01:00
parent 113df51ef9
commit b7b8a009f2
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/authapi.py
+1 -1
View File
@@ -115,7 +115,7 @@ class AuthAPI(object):
if auth.last_visit and auth.last_visit + delta > now: if auth.last_visit and auth.last_visit + delta > now:
self.user = auth.user self.user = auth.user
# this is a trick to speed up sessions to avoid many writes # this is a trick to speed up sessions to avoid many writes
if (now - auth.last_visit).seconds > (auth.expiration / 10): if (now - auth.last_visit).seconds > (auth.expiration // 10):
auth.last_visit = now auth.last_visit = now
else: else:
self.user = None self.user = None
gluon/contrib/imageutils.py
+1 -1
View File
@@ -45,7 +45,7 @@ class RESIZE(object):
background = Image.new('RGBA', (self.nx, self.ny), (255, 255, 255, 0)) background = Image.new('RGBA', (self.nx, self.ny), (255, 255, 255, 0))
background.paste( background.paste(
img, img,
((self.nx - img.size[0]) / 2, (self.ny - img.size[1]) / 2)) ((self.nx - img.size[0]) // 2, (self.ny - img.size[1]) // 2))
background.save(s, 'JPEG', quality=self.quality) background.save(s, 'JPEG', quality=self.quality)
else: else:
img.save(s, 'JPEG', quality=self.quality) img.save(s, 'JPEG', quality=self.quality)
gluon/sqlhtml.py
+2 -2
View File
@@ -405,7 +405,7 @@ class RadioWidget(OptionsWidget):
cols = attributes.get('cols', 1) cols = attributes.get('cols', 1)
totals = len(options) totals = len(options)
mods = totals % cols mods = totals % cols
rows = totals / cols rows = totals // cols
if mods: if mods:
rows += 1 rows += 1
@@ -471,7 +471,7 @@ class CheckboxesWidget(OptionsWidget):
cols = attributes.get('cols', 1) cols = attributes.get('cols', 1)
totals = len(options) totals = len(options)
mods = totals % cols mods = totals % cols
rows = totals / cols rows = totals // cols
if mods: if mods:
rows += 1 rows += 1
gluon/tools.py
+6 -6
View File
@@ -1762,7 +1762,7 @@ class Auth(AuthAPI):
if auth.last_visit and auth.last_visit + delta > now: if auth.last_visit and auth.last_visit + delta > now:
self.user = auth.user self.user = auth.user
# this is a trick to speed up sessions to avoid many writes # this is a trick to speed up sessions to avoid many writes
if (now - auth.last_visit).seconds > (auth.expiration / 10): if (now - auth.last_visit).seconds > (auth.expiration // 10):
auth.last_visit = now auth.last_visit = now
else: else:
self.user = None self.user = None
@@ -5531,15 +5531,15 @@ def prettydate(d, T=lambda x: x, utc=False):
else: else:
suffix = ' ago' suffix = ' ago'
if dt.days >= 2 * 365: if dt.days >= 2 * 365:
return T('%d years' + suffix) % int(dt.days / 365) return T('%d years' + suffix) % int(dt.days // 365)
elif dt.days >= 365: elif dt.days >= 365:
return T('1 year' + suffix) return T('1 year' + suffix)
elif dt.days >= 60: elif dt.days >= 60:
return T('%d months' + suffix) % int(dt.days / 30) return T('%d months' + suffix) % int(dt.days // 30)
elif dt.days >= 27: # 4 weeks ugly elif dt.days >= 27: # 4 weeks ugly
return T('1 month' + suffix) return T('1 month' + suffix)
elif dt.days >= 14: elif dt.days >= 14:
return T('%d weeks' + suffix) % int(dt.days / 7) return T('%d weeks' + suffix) % int(dt.days // 7)
elif dt.days >= 7: elif dt.days >= 7:
return T('1 week' + suffix) return T('1 week' + suffix)
elif dt.days > 1: elif dt.days > 1:
@@ -5547,11 +5547,11 @@ def prettydate(d, T=lambda x: x, utc=False):
elif dt.days == 1: elif dt.days == 1:
return T('1 day' + suffix) return T('1 day' + suffix)
elif dt.seconds >= 2 * 60 * 60: elif dt.seconds >= 2 * 60 * 60:
return T('%d hours' + suffix) % int(dt.seconds / 3600) return T('%d hours' + suffix) % int(dt.seconds // 3600)
elif dt.seconds >= 60 * 60: elif dt.seconds >= 60 * 60:
return T('1 hour' + suffix) return T('1 hour' + suffix)
elif dt.seconds >= 2 * 60: elif dt.seconds >= 2 * 60:
return T('%d minutes' + suffix) % int(dt.seconds / 60) return T('%d minutes' + suffix) % int(dt.seconds // 60)
elif dt.seconds >= 60: elif dt.seconds >= 60:
return T('1 minute' + suffix) return T('1 minute' + suffix)
elif dt.seconds > 1: elif dt.seconds > 1:
gluon/utils.py
+6 -6
View File
@@ -156,12 +156,12 @@ def get_digest(value):
raise ValueError("Invalid digest algorithm: %s" % value) raise ValueError("Invalid digest algorithm: %s" % value)
DIGEST_ALG_BY_SIZE = { DIGEST_ALG_BY_SIZE = {
128 / 4: 'md5', 128 // 4: 'md5',
160 / 4: 'sha1', 160 // 4: 'sha1',
224 / 4: 'sha224', 224 // 4: 'sha224',
256 / 4: 'sha256', 256 // 4: 'sha256',
384 / 4: 'sha384', 384 // 4: 'sha384',
512 / 4: 'sha512', 512 // 4: 'sha512',
} }