PYTHON-1087 - Fix __repr__ handling of *TimeoutMS=None

Author: behackett

pymongo/common.py

@@ -415,11 +415,8 @@ def validate_ok_for_update(update):
  'fsync': validate_boolean_or_string,
  'j': validate_boolean_or_string,
  'journal': validate_boolean_or_string,
- 'connecttimeoutms': validate_timeout_or_none,
  'maxpoolsize': validate_positive_integer_or_none,
  'socketkeepalive': validate_boolean_or_string,
- 'sockettimeoutms': validate_timeout_or_none,
- 'waitqueuetimeoutms': validate_timeout_or_none,
  'waitqueuemultiple': validate_non_negative_integer_or_none,
  'ssl': validate_boolean_or_string,
  'ssl_keyfile': validate_readable,
@@ -431,7 +428,6 @@ def validate_ok_for_update(update):
  'readpreference': validate_read_preference_mode,
  'readpreferencetags': validate_read_preference_tags,
  'localthresholdms': validate_positive_float_or_zero,
- 'serverselectiontimeoutms': validate_timeout_or_zero,
  'authmechanism': validate_auth_mechanism,
  'authsource': validate_string,
  'authmechanismproperties': validate_auth_mechanism_properties,
@@ -440,12 +436,20 @@ def validate_ok_for_update(update):
  'connect': validate_boolean_or_string,
 }
 
+TIMEOUT_VALIDATORS = {
+ 'connecttimeoutms': validate_timeout_or_none,
+ 'sockettimeoutms': validate_timeout_or_none,
+ 'waitqueuetimeoutms': validate_timeout_or_none,
+ 'serverselectiontimeoutms': validate_timeout_or_zero,
+}
+
 KW_VALIDATORS = {
  'document_class': validate_document_class,
  'read_preference': validate_read_preference,
  'event_listeners': _validate_event_listeners
 }
 
+URI_VALIDATORS.update(TIMEOUT_VALIDATORS)
 VALIDATORS = URI_VALIDATORS.copy()
 VALIDATORS.update(KW_VALIDATORS)
 

pymongo/mongo_client.py

@@ -839,8 +839,8 @@ def option_repr(option, value):
  else:
  return 'document_class=%s.%s' % (value.__module__,
  value.__name__)
- if "ms" in option:
- return "%s='%s'" % (option, int(value * 1000))
+ if option in common.TIMEOUT_VALIDATORS and value is not None:
+ return "%s=%s" % (option, int(value * 1000))
 
  return '%s=%r' % (option, value)
 

test/test_client.py

@@ -259,7 +259,7 @@ def test_repr(self):
 
  client = MongoClient(
  'mongodb://localhost:27017,localhost:27018/?replicaSet=replset'
- '&connectTimeoutMS=12345',
+ '&connectTimeoutMS=12345&w=1&wtimeoutms=100',
  connect=False, document_class=SON)
 
  the_repr = repr(client)
@@ -269,8 +269,32 @@ def test_repr(self):
  "tz_aware=False, "
  "connect=False, ",
  the_repr)
- self.assertIn("connecttimeoutms='12345'", the_repr)
- self.assertIn("replicaset=", the_repr)
+ self.assertIn("connecttimeoutms=12345", the_repr)
+ self.assertIn("replicaset='replset'", the_repr)
+ self.assertIn("w=1", the_repr)
+ self.assertIn("wtimeoutms=100", the_repr)
+
+ self.assertEqual(eval(the_repr), client)
+
+ client = MongoClient("localhost:27017,localhost:27018",
+ replicaSet='replset',
+ connectTimeoutMS=12345,
+ socketTimeoutMS=None,
+ w=1,
+ wtimeoutms=100,
+ connect=False)
+ the_repr = repr(client)
+ self.assertIn('MongoClient(host=', the_repr)
+ self.assertIn(
+ "document_class=dict, "
+ "tz_aware=False, "
+ "connect=False, ",
+ the_repr)
+ self.assertIn("connecttimeoutms=12345", the_repr)
+ self.assertIn("replicaset='replset'", the_repr)
+ self.assertIn("sockettimeoutms=None", the_repr)
+ self.assertIn("w=1", the_repr)
+ self.assertIn("wtimeoutms=100", the_repr)
 
  self.assertEqual(eval(the_repr), client)