Skip to content

Commit 8bcfd23

Browse files
committed
Merge pull request #207 from Nobatek/dev_JL_remove_clone
Drop MongoEngine 0.7 support
2 parents 13cf24e + eea5727 commit 8bcfd23

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ python:
1010
- pypy3
1111

1212
env:
13-
- MONGOENGINE=0.7
1413
- MONGOENGINE=0.8
1514
- MONGOENGINE=0.9
1615
- MONGOENGINE=0.10.0

flask_mongoengine/pagination.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def prev(self, error_out=False):
4747
if isinstance(iterable, QuerySet):
4848
iterable._skip = None
4949
iterable._limit = None
50-
iterable = iterable.clone()
5150
return self.__class__(iterable, self.page - 1, self.per_page)
5251

5352
@property
@@ -68,7 +67,6 @@ def next(self, error_out=False):
6867
if isinstance(iterable, QuerySet):
6968
iterable._skip = None
7069
iterable._limit = None
71-
iterable = iterable.clone()
7270
return self.__class__(iterable, self.page + 1, self.per_page)
7371

7472
@property
@@ -148,9 +146,9 @@ def __init__(self, queryset, doc_id, field_name, page, per_page,
148146
field_attrs = {field_name: {"$slice": [start_index, per_page]}}
149147

150148
# Clone for mongoengine 0.7
151-
qs = queryset.clone().filter(pk=doc_id)
152-
self.items = getattr(qs.clone().fields(**field_attrs).first(), field_name)
153-
self.total = total or len(getattr(qs.clone().fields(**{field_name: 1}).first(),
149+
qs = queryset(pk=doc_id)
150+
self.items = getattr(qs.fields(**field_attrs).first(), field_name)
151+
self.total = total or len(getattr(qs.fields(**{field_name: 1}).first(),
154152
field_name))
155153

156154
if not self.items and page != 1:

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask>=0.8
22
Flask-DebugToolbar>=0.8
33
Flask-WTF>=0.8.3
4-
mongoengine>=0.7.10
4+
mongoengine>=0.8.0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def load_module(module_name, script_file):
5151
platforms='any',
5252
install_requires=[
5353
'Flask>=0.8',
54-
'mongoengine>=0.7.10',
54+
'mongoengine>=0.8.0',
5555
'flask-wtf',
5656
],
5757
packages=['flask_mongoengine',

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{me07,me08,me09,medev,me0100}
2+
envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{me08,me09,medev,me0100}
33

44
[testenv]
55
commands =

0 commit comments

Comments
 (0)