float('inf') isn't available everywhere, use 1e100000 instead

Author: A. Jesse Jiryu Davis

pymongo/common.py

@@ -93,7 +93,9 @@ def validate_positive_float(option, value):
         value = float(value)
     except (ValueError, TypeError):
         raise err
-    if not 0 < value < float('inf'):
+
+    # float('inf') doesn't work in 2.4 or 2.5 on Windows, but this does
+    if not 0 < value < 1e100000:
         raise err
 
     return value

test/test_uri_parser.py

@@ -16,6 +16,7 @@
 
 import copy
 import unittest
+import sys
 
 from pymongo.uri_parser import (_partition,
                                 _rpartition,
@@ -92,8 +93,16 @@ def test_split_options(self):
         self.assertRaises(ConfigurationError, split_options, 'socketTimeoutMS=0.0')
         self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=foo')
         self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=0.0')
-        self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=inf')
-        self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=-inf')
+        self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=1e100000')
+        self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=-1e100000')
+
+        # On most platforms float('inf') and float('-inf') represent
+        # +/- infinity, although on Python 2.4 and 2.5 on Windows those
+        # expressions are invalid
+        if not (sys.platform == "win32" and sys.version_info <= (2, 5)):
+            self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=inf')
+            self.assertRaises(ConfigurationError, split_options, 'connectTimeoutMS=-inf')
+
         self.assertTrue(split_options('socketTimeoutMS=300'))
         self.assertTrue(split_options('connectTimeoutMS=300'))
         self.assertEqual({'sockettimeoutms': 0.3}, split_options('socketTimeoutMS=300'))