mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-24 18:47:23 +00:00
Code Issues Releases Wiki Activity

remove dependency on future function

Browse Source 
no need six or future if there is only one function.
This commit is contained in:
林檎 2017-03-08 11:48:12 +08:00
parent a752e62963
commit 108302ff9b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cps/web.py
View File

@ -50,13 +50,12 @@ from tornado import version as tornadoVersion
try: try:
from urllib.parse import quote from urllib.parse import quote
from imp import reload from imp import reload
from past.builtins import xrange
except ImportError as e: except ImportError as e:
from urllib import quote from urllib import quote
try: try:
from flask_login import __version__ as flask_loginVersion from flask_login import __version__ as flask_loginVersion
except ImportError, e: except ImportError as e:
from flask_login.__about__ import __version__ as flask_loginVersion from flask_login.__about__ import __version__ as flask_loginVersion
try: try:
@ -260,6 +259,10 @@ class Pagination(object):
def iter_pages(self, left_edge=2, left_current=2, def iter_pages(self, left_edge=2, left_current=2,
right_current=5, right_edge=2): right_current=5, right_edge=2):
last = 0 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 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) \ if num <= left_edge or (num > self.page - left_current - 1 and num < self.page + right_current) \
or num > self.pages - right_edge: or num > self.pages - right_edge: