Skip to content
This repository was archived by the owner on Jul 14, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
783a67d
Update ez_setup.py to latest version
aquavitae Oct 24, 2013
a8ff721
Update requirements.txt to exclude wgsiref (for py3) and include six
aquavitae Oct 24, 2013
34b2401
Add dependency on six
aquavitae Oct 24, 2013
34f7347
Use future print function
aquavitae Oct 24, 2013
145c411
Better define types, mainly unicode vs bytes in structure and gridfs
aquavitae Oct 25, 2013
4d23e74
Use Python 2.6+ style except statements
aquavitae Oct 25, 2013
00d8b12
Convert to relative imports
aquavitae Oct 25, 2013
eb68a90
Use python 2/3 compatible text types (import from six)
aquavitae Oct 25, 2013
f6edde8
Fix a previously missed relative import
aquavitae Oct 25, 2013
b6f086c
Replace metaclasses
aquavitae Oct 25, 2013
6df324d
Replace long literal
aquavitae Oct 25, 2013
5748ee9
Tidy up string types
aquavitae Oct 25, 2013
6248c5c
Tidy up six usage
aquavitae Oct 25, 2013
85bd726
Use six dict iterators
aquavitae Oct 25, 2013
56b8652
Add missing six imports
aquavitae Oct 25, 2013
01bb67d
Add Python 3 iterator protocol for Cursor
aquavitae Oct 25, 2013
261dda1
Clean up "cleanup" code in register
aquavitae Oct 25, 2013
139e7d6
Fix unicode incompatibilities in auth password functions
aquavitae Oct 26, 2013
d6ff9b2
Fix a couple of broken tests
aquavitae Oct 26, 2013
c4a5e17
Fix failing API tests
aquavitae Oct 26, 2013
1f67619
Fix json tests
aquavitae Oct 26, 2013
0128eb7
Fix typo in previous commit
aquavitae Oct 26, 2013
fb623ef
Fix all remaining failing tests
aquavitae Oct 26, 2013
c302034
Update readme to include Py3 info
aquavitae Oct 28, 2013
9f4028f
Update .travis.yaml for Py3
aquavitae Oct 28, 2013
de65ee3
Merge remote-tracking branch 'remotes/origin/py3'
aquavitae Oct 28, 2013
f631a6e
Remove unittest2 dependency for tests
aquavitae Oct 28, 2013
69725db
Fix a missed relative import
aquavitae Oct 28, 2013
69f147c
Replace all unicode references with str
aquavitae Oct 28, 2013
6e65dd3
Remove all references to six in mongokit (not tests yet)
aquavitae Oct 28, 2013
440234a
Remove all references to six in mongokit (not tests yet)
aquavitae Oct 28, 2013
0a1d432
Merge branch 'master' of https://github.com/aquavitae/mongokit-py3
aquavitae Oct 28, 2013
4296aca
Add CI png
aquavitae Oct 28, 2013
d41279c
Update setup.py
aquavitae Oct 29, 2013
b733a0f
Update version number
aquavitae Oct 29, 2013
8a697ce
Add six to travis (since six is still used in the tests)
aquavitae Oct 29, 2013
1aecab2
Sort out version numbers
aquavitae Oct 29, 2013
5cba886
Merge remote-tracking branch 'upstream/master'
aquavitae Dec 13, 2013
db6bedc
Merge branch 'master' of https://github.com/namlook/mongokit
aquavitae Mar 12, 2014
6ec0620
Update json tests to use json.loads instead of assertJSON
aquavitae Mar 12, 2014
b49b4ef
Fix failing tests:
aquavitae Mar 12, 2014
dbb5736
Fix more broken tests:
aquavitae Mar 12, 2014
97709a6
Update binary type tests
aquavitae Mar 12, 2014
b3a6da2
Update version number
aquavitae Mar 12, 2014
96d1d45
Update broken test
aquavitae Mar 12, 2014
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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: python

python:
- 2.6
- 2.7
- 3.2
- 3.3

before_install:
pip install --use-mirrors nose unittest2 pymongo
pip install --use-mirrors six nose pymongo

install:
- python setup.py install
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## MongoKit-Py3 [![Build Status](https://travis-ci.org/aquavitae/mongokit-py3.png?branch=master)](https://travis-ci.org/aquavitae/mongokit-py3)

This is a fork of [MongoKit](https://github.com/namlook/mongokit) for Python 3. The readme below is taken directly from
that project, and all the documentation can be view there, with the following differences:

* All references to ``unicode`` have been replaced with ``str``.
* ``basestring`` does not exist in Python 3, so it has mostly been replaced with ``bytes``, except for a few cases
where it is obvious from the context that ``str`` was intended instead.
* Data stored in GridFS must be ``bytes``. If a ``str`` is used, it should be encoded to ``bytes`` first.

*--- Original Readme follows ---*

# MongoKit [![Build Status](https://travis-ci.org/namlook/mongokit.png)](https://travis-ci.org/namlook/mongokit.png)

[MongoDB](http://www.mongodb.org/display/DOCS/Home) is a great schema-less document oriented database. It has a lot of drivers for many languages (python, ruby, perl, java, php...).
Expand Down
2 changes: 1 addition & 1 deletion doc/gridfs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ And that's it ! By doing this, MongoKit will open a GridFile,
fill it with the value, and close it.

Note that you have to be careful to the type : attachments
only accept string.
only accept string (Python 2) or bytes (Python 3).

You can read any attachment in a very simple way :

Expand Down
8 changes: 5 additions & 3 deletions doc/structure.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ types::
- bool
- int
- float
- long
- basestring
- unicode
- long # Python 2 only
- basestring # Python 2 only
- bytes # Python 3 only
- unicode # Python 2 only
- str # Python 3 only
- list
- dict
- datetime.datetime
Expand Down
Loading