From 108302ff9b2ed4fd0ec12fff325b4714e5314a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= Date: Wed, 8 Mar 2017 11:48:12 +0800 Subject: [PATCH] remove dependency on future function no need six or future if there is only one function. --- cps/web.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cps/web.py b/cps/web.py index 07d7fb63..137b945b 100755 --- a/cps/web.py +++ b/cps/web.py @@ -50,13 +50,12 @@ from tornado import version as tornadoVersion try: from urllib.parse import quote from imp import reload - from past.builtins import xrange except ImportError as e: from urllib import quote try: from flask_login import __version__ as flask_loginVersion -except ImportError, e: +except ImportError as e: from flask_login.__about__ import __version__ as flask_loginVersion try: @@ -260,6 +259,10 @@ class Pagination(object): def iter_pages(self, left_edge=2, left_current=2, right_current=5, right_edge=2): last = 0 + if 'xrange' not in globals():#no xrange in Python3 + global xrange + xrange = range + for num in xrange(1, self.pages + 1): # ToDo: can be simplified if num <= left_edge or (num > self.page - left_current - 1 and num < self.page + right_current) \ or num > self.pages - right_edge: