Skip to content

Make compatible with python 2 and python 3 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Juko wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Make compatible with python 2 and python 3 #44

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6f48603
List all needed dependencies
Oct 24, 2019
fd1db8a
Don't crash if no pymongo wrapper is supplied
Oct 24, 2019
9a82719
Remove reference to removed pushall mongo modifier
Oct 24, 2019
981ab9a
Correctly default to array on upsert
Oct 24, 2019
64e16d2
Remove extra spaces
Oct 24, 2019
2a44caa
Stage 1 of futurize
Oct 27, 2019
d972b79
Use builtins object
Oct 29, 2019
538b938
Use with_metaclass method
Oct 29, 2019
9af04ec
Convert iterX methods to use py3 syntax
Oct 29, 2019
92aecb3
Make iterators behave like python 2 expects
Oct 29, 2019
b6bd4cd
Guard against futures newobject type that wraps object
Oct 29, 2019
3a1f6ba
Import basestring for use in the codebase
Oct 29, 2019
b6d4ffe
Use binascii for generic py2/3 interface in converting to hex
Oct 29, 2019
86e9cc6
Use new definition of range
Oct 29, 2019
b735f5b
Make pickle use compatible syntax
Oct 29, 2019
2db729f
Update range value to use new import
Oct 29, 2019
c6c0d77
Ensure order of sets in test
Oct 29, 2019
94029b3
Use new py3 compatible str
Oct 29, 2019
b6f3dbe
Change tests to be better aligned with what's expected from py3/py2
Oct 29, 2019
3886461
Bump up version number
Oct 29, 2019
92f3f81
Explicitly require future as a requirement
Oct 30, 2019
b9ad574
Ensure documents are truthy
Oct 30, 2019
666a0aa
Default to use python version of str when passing to ObjectId
Oct 30, 2019
1eb0c34
Use a set for intersection
Oct 31, 2019
1db4387
Default to use cPickle
Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use a set for intersection
  • Loading branch information
Paul Jukic committed Oct 31, 2019
commit 1eb0c34da90fbb4e91f7026197d598fa8cbf6712
2 changes: 1 addition & 1 deletion mongorm/queryset/Q.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def __or__( self, other ):
return self.do_merge( other, '$or' )

def __and__( self, other ):
if len( set( self.query.keys() ).intersection( list(other.query.keys()) ) ) > 0:
if len( set( self.query.keys() ).intersection( set( other.query.keys() ) ) ) > 0:
# if the 2 queries have overlapping keys, we need to use a $and to join them.
return self.do_merge( other, '$and' )
else:
Expand Down