Permalink
Browse files

Clarify that socket/connectTimeoutMS is in milliseconds.

  • Loading branch information...
1 parent ab02402 commit 99c68f2969676be3a8896255f70137a7ca1d57c4 @behackett behackett committed Oct 2, 2012
Showing with 8 additions and 8 deletions.
  1. +4 −4 pymongo/connection.py
  2. +4 −4 pymongo/replica_set_connection.py
View
@@ -152,10 +152,10 @@ def __init__(self, host=None, port=None, max_pool_size=10,
will verify that the replica set it connects to matches this name.
Implies that the hosts specified are a seed list and the driver should
attempt to find all members of the set.
- - `socketTimeoutMS`: How long a send or receive on a socket can take
- before timing out.
- - `connectTimeoutMS`: How long a connection can take to be opened
- before timing out.
+ - `socketTimeoutMS`: How long (in milliseconds) a send or receive on a
+ socket can take before timing out.
+ - `connectTimeoutMS`: How long (in milliseconds) a connection can take
+ to be opened before timing out.
- `ssl`: If True, create the connection to the server using SSL.
- `read_preference`: The read preference for this connection.
See :class:`~pymongo.read_preferences.ReadPreference` for available
@@ -313,10 +313,10 @@ def __init__(self, hosts_or_uri=None, max_pool_size=10,
- `fsync`: Force the database to fsync all files before returning
When used with `j` the server awaits the next group commit before
returning. Implies safe=True.
- - `socketTimeoutMS`: How long a send or receive on a socket can take
- before timing out.
- - `connectTimeoutMS`: How long a connection can take to be opened
- before timing out.
+ - `socketTimeoutMS`: How long (in milliseconds) a send or receive on
+ a socket can take before timing out.
+ - `connectTimeoutMS`: How long (in milliseconds) a connection can take
+ to be opened before timing out.
- `ssl`: If True, create the connection to the servers using SSL.
- `read_preference`: The read preference for this connection.
See :class:`~pymongo.read_preferences.ReadPreference` for available

0 comments on commit 99c68f2

Please sign in to comment.