diff --git a/gluon/authapi.py b/gluon/authapi.py index 4bc7727f..3347cb68 100644 --- a/gluon/authapi.py +++ b/gluon/authapi.py @@ -115,7 +115,7 @@ class AuthAPI(object): if auth.last_visit and auth.last_visit + delta > now: self.user = auth.user # 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 else: self.user = None diff --git a/gluon/contrib/imageutils.py b/gluon/contrib/imageutils.py index 28cf10e0..a5c24b69 100644 --- a/gluon/contrib/imageutils.py +++ b/gluon/contrib/imageutils.py @@ -45,7 +45,7 @@ class RESIZE(object): background = Image.new('RGBA', (self.nx, self.ny), (255, 255, 255, 0)) background.paste( 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) else: img.save(s, 'JPEG', quality=self.quality) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 59ebbeea..8b1d5c52 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -405,7 +405,7 @@ class RadioWidget(OptionsWidget): cols = attributes.get('cols', 1) totals = len(options) mods = totals % cols - rows = totals / cols + rows = totals // cols if mods: rows += 1 @@ -471,7 +471,7 @@ class CheckboxesWidget(OptionsWidget): cols = attributes.get('cols', 1) totals = len(options) mods = totals % cols - rows = totals / cols + rows = totals // cols if mods: rows += 1 diff --git a/gluon/tools.py b/gluon/tools.py index 0ff96de6..1f54e746 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1762,7 +1762,7 @@ class Auth(AuthAPI): if auth.last_visit and auth.last_visit + delta > now: self.user = auth.user # 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 else: self.user = None @@ -5531,15 +5531,15 @@ def prettydate(d, T=lambda x: x, utc=False): else: suffix = ' ago' 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: return T('1 year' + suffix) 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 return T('1 month' + suffix) 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: return T('1 week' + suffix) elif dt.days > 1: @@ -5547,11 +5547,11 @@ def prettydate(d, T=lambda x: x, utc=False): elif dt.days == 1: return T('1 day' + suffix) 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: return T('1 hour' + suffix) 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: return T('1 minute' + suffix) elif dt.seconds > 1: diff --git a/gluon/utils.py b/gluon/utils.py index 85d7d49f..3b26a51b 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -156,12 +156,12 @@ def get_digest(value): raise ValueError("Invalid digest algorithm: %s" % value) DIGEST_ALG_BY_SIZE = { - 128 / 4: 'md5', - 160 / 4: 'sha1', - 224 / 4: 'sha224', - 256 / 4: 'sha256', - 384 / 4: 'sha384', - 512 / 4: 'sha512', + 128 // 4: 'md5', + 160 // 4: 'sha1', + 224 // 4: 'sha224', + 256 // 4: 'sha256', + 384 // 4: 'sha384', + 512 // 4: 'sha512', }