PYTHON-1482 Fix monotonic time import for Python 2

Add changelog for 3.6.1

Author: ShaneHarvey

doc/changelog.rst

@@ -1,6 +1,29 @@
 Changelog
 =========
 
+Changes in Version 3.6.1
+------------------------
+
+Version 3.6.1 fixes bugs reported since the release of 3.6.0:
+
+- Fix regression in PyMongo 3.5.0 that causes idle sockets to be closed every
+  second when ``maxIdleTimeMS`` is set. Idle sockets are now closed after
+  ``maxIdleTimeMS`` milliseconds.
+- :attr:`pymongo.mongo_client.MongoClient.max_idle_time_ms` returns
+  milliseconds instead of seconds.
+- Properly import and use the
+  `monotonic <https://pypi.python.org/pypi/monotonic>`_
+  library for monotonic time when it is installed.
+
+Issues Resolved
+...............
+
+See the `PyMongo 3.6.1 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 3.6.1 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=19438
+
+
 Changes in Version 3.6.0
 ------------------------
 

pymongo/monotonic.py

@@ -15,6 +15,8 @@
 """Time. Monotonic if possible.
 """
 
+from __future__ import absolute_import
+
 __all__ = ['time']
 
 try:
@@ -25,11 +27,11 @@
     pass
 
 try:
-    # From https://pypi.python.org/pypi/monotinic.
+    # From https://pypi.python.org/pypi/monotonic.
     from monotonic import monotonic as time
 except ImportError:
     try:
-        # Monotime or Python 3.3+.
+        # Monotime or Python 3.
         from time import monotonic as time
     except ImportError:
         # Not monotonic.

test/test_monotonic.py

@@ -0,0 +1,41 @@
+# Copyright 2018-present MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Test the monotonic module."""
+
+import sys
+
+sys.path[0:0] = [""]
+
+from pymongo.monotonic import time as pymongo_time
+
+from test import unittest
+
+
+class TestMonotonic(unittest.TestCase):
+    def test_monotonic_time(self):
+        try:
+            from monotonic import monotonic
+            self.assertIs(monotonic, pymongo_time)
+        except ImportError:
+            if sys.version_info[:2] >= (3, 3):
+                from time import monotonic
+                self.assertIs(monotonic, pymongo_time)
+            else:
+                from time import time
+                self.assertIs(time, pymongo_time)
+
+
+if __name__ == "__main__":
+    unittest.main()