From ba83408d05ba04a401278f081b8befc4350cc9ce Mon Sep 17 00:00:00 2001 From: statguyjames Date: Sun, 24 Mar 2013 02:48:54 -0700 Subject: [PATCH 1/4] dependency change to use custom pymongo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 34e151c23f..ee53dc5973 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from distutils.errors import DistutilsPlatformError, DistutilsExecError from distutils.core import Extension -version = "2.5+" +version = "2.5.1" f = open("README.rst") try: From 55490866c813d594f11cfc3f416f3b325377a4ba Mon Sep 17 00:00:00 2001 From: statguyjames Date: Sun, 24 Mar 2013 03:02:02 -0700 Subject: [PATCH 2/4] changing to 2.6 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ee53dc5973..25b8e2454d 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from distutils.errors import DistutilsPlatformError, DistutilsExecError from distutils.core import Extension -version = "2.5.1" +version = "2.6" f = open("README.rst") try: From 0d6c8e5cc9890fe673ced74d2da4acf5854485af Mon Sep 17 00:00:00 2001 From: statguyjames Date: Sun, 24 Mar 2013 03:37:25 -0700 Subject: [PATCH 3/4] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 25b8e2454d..67bdae6ff3 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from distutils.errors import DistutilsPlatformError, DistutilsExecError from distutils.core import Extension -version = "2.6" +version = "2.7" f = open("README.rst") try: From a0acfb218aaeb4629abb3087f3d11f49682908c3 Mon Sep 17 00:00:00 2001 From: James Oey Date: Sun, 24 Mar 2013 04:32:42 -0700 Subject: [PATCH 4/4] changing port to int for django-nonrel 1.3.1 compatibiliaty --- pymongo/mongo_client.py | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pymongo/mongo_client.py b/pymongo/mongo_client.py index 554fa1b902..3ab77b7afd 100644 --- a/pymongo/mongo_client.py +++ b/pymongo/mongo_client.py @@ -217,6 +217,7 @@ def __init__(self, host=None, port=None, max_pool_size=10, host = [host] if port is None: port = self.PORT + port = int(port) if not isinstance(port, int): raise TypeError("port must be an instance of int") diff --git a/setup.py b/setup.py index 67bdae6ff3..ee53dc5973 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from distutils.errors import DistutilsPlatformError, DistutilsExecError from distutils.core import Extension -version = "2.7" +version = "2.5.1" f = open("README.rst") try: