Skip to content
This repository was archived by the owner on Apr 17, 2021. It is now read-only.

Commit 5fcdf78

Browse files
committed
Merge pull request #26 from miki725/master
python3 compatibility
2 parents 3dae21f + 001d2f6 commit 5fcdf78

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

bootstrap_pagination/templatetags/bootstrap_pagination.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_page_url(page_num, current_app, url_view_name, url_extra_args, url_extra
2828
# This bit of code comes from the default django url tag
2929
try:
3030
url = reverse(url_view_name, args=url_extra_args, kwargs=url_extra_kwargs, current_app=current_app)
31-
except NoReverseMatch, e:
31+
except NoReverseMatch as e:
3232
if settings.SETTINGS_MODULE:
3333
project_name = settings.SETTINGS_MODULE.split('.')[0]
3434
url = reverse(project_name + '.' + url_view_name, args=url_extra_args, kwargs=url_extra_kwargs, current_app=current_app)
@@ -161,8 +161,8 @@ def render(self, context):
161161
range_length = page_count
162162

163163
range_length -= 1
164-
range_min = max(current_page - (range_length / 2), 1)
165-
range_max = min(current_page + (range_length / 2), page_count)
164+
range_min = max(current_page - (range_length // 2), 1)
165+
range_max = min(current_page + (range_length // 2), page_count)
166166
range_diff = range_max - range_min
167167
if range_diff < range_length:
168168
shift = range_length - range_diff

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from distutils.core import setup
33
from setuptools import find_packages
44

5-
readme = open('README.rst', 'r')
6-
readme_text = readme.read()
7-
readme.close()
5+
6+
with open('README.rst', 'rb') as readme:
7+
readme_text = readme.read().decode('utf-8')
88

99
setup(
1010
name='django-bootstrap-pagination',
@@ -16,7 +16,7 @@
1616
url='https://github.com/jmcclell/django-bootstrap-pagination',
1717
license='MIT licence, see LICENCE',
1818
description='Render Django Page objects as Bootstrap 3.x Pagination compatible HTML',
19-
long_description=readme_text.encode('UTF-8'),
19+
long_description=readme_text,
2020
zip_safe=False,
2121
include_package_data=True,
2222
classifiers=[

0 commit comments

Comments
 (0)