Merge pull request #280 from twisted/py3.11

Support for Python 3.11

Author: IlyaSkriblovsky

setup.py

@@ -10,7 +10,7 @@
     url="https://github.com/twisted/txmongo",
     keywords=["mongo", "mongodb", "pymongo", "gridfs", "txmongo"],
     packages=["txmongo", "txmongo._gridfs"],
-    install_requires=["twisted>=14.0", "pymongo>=3.0"],
+    install_requires=["twisted>=14.0", "pymongo>=3.0, <4.0"],
     extras_require={
         'srv': ['pymongo[srv]>=3.6'],
     },

tests/mongod.py

@@ -18,7 +18,6 @@
 import tempfile
 import shutil
 
-from twisted.python.compat import intToBytes
 from twisted.python.filepath import FilePath
 from twisted.internet import defer, reactor
 from twisted.internet.error import ProcessDone
@@ -61,7 +60,7 @@ def start(self):
         self.__notify_waiting.append(d)
 
         args = [b"mongod",
-                b"--port", intToBytes(self.port),
+                b"--port", (b'%d' % self.port),
                 b"--dbpath", self.__datadir,
                 # MongoDB 4.0 doesn't support nojournal + WiredTiger + ReplicaSet
                 # b"--nojournal",

tests/test_bulk.py

@@ -5,7 +5,7 @@
 from pymongo.results import BulkWriteResult
 from pymongo.write_concern import WriteConcern
 from twisted.internet import defer
-from mock import patch
+from unittest.mock import patch
 
 from tests.utils import SingleCollectionTest
 from txmongo.protocol import Reply

tests/test_cancel.py

@@ -1,6 +1,6 @@
 import struct
 
-from mock import Mock
+from unittest.mock import Mock
 from pymongo.uri_parser import parse_uri
 from twisted.internet import defer
 from twisted.internet import reactor

tests/test_connection.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import, division
-from mock import patch
+from unittest.mock import patch
 from time import time
 from twisted.trial import unittest
 from twisted.internet import defer

tests/test_count.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import, division
-from mock import patch
+from unittest.mock import patch
 from time import time
 from twisted.trial import unittest
 from twisted.internet import defer

tests/test_get_version.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import, division
-from mock import patch
+from unittest.mock import patch
 from time import time
 from twisted.trial import unittest
 from twisted.internet import defer

tests/test_protocol.py

@@ -18,7 +18,6 @@
 from bson import BSON
 from twisted.trial import unittest
 from twisted.internet import defer
-from twisted.python.compat import unicode
 
 from tests.utils import SingleCollectionTest
 
@@ -56,7 +55,7 @@ def __test_encode_decode(self, request):
             # len and request_id are not filled in request object
             if field not in ("len", "request_id"):
                 if isinstance(dec_value, bytes) and \
-                   isinstance(req_value, unicode):
+                   isinstance(req_value, str):
                     dec_value = dec_value.decode()
 
                 self.assertEqual(dec_value, req_value)

tests/test_queries.py

@@ -563,7 +563,6 @@ def test_MapReduce(self):
 
         result = yield self.coll.map_reduce(t_map, t_reduce, out={"inline": 1}, full_response=True)
         self.assertTrue(result["ok"], 1)
-        self.assertTrue("counts" in result)
         self.assertTrue("results" in result)
 
 

tests/test_write_concern.py

@@ -15,7 +15,7 @@
 
 from __future__ import absolute_import, division
 
-from mock import patch
+from unittest.mock import patch
 from pymongo.write_concern import WriteConcern
 from twisted.internet import defer
 from twisted.trial import unittest

txmongo/_gridfs/grid_file.py

@@ -20,7 +20,6 @@
 from io import BytesIO as StringIO
 import math
 import os
-from twisted.python.compat import unicode
 from twisted.internet import defer
 from txmongo._gridfs.errors import CorruptGridFile
 from txmongo.collection import Collection
@@ -224,9 +223,9 @@ def write(self, data):
             read = data.read
         except AttributeError:
             # string
-            if not isinstance(data, (bytes, unicode)):
+            if not isinstance(data, (bytes, str)):
                 raise TypeError("TxMongo: can only write strings or file-like objects.")
-            if isinstance(data, unicode):
+            if isinstance(data, str):
                 try:
                     data = data.encode(self.encoding)
                 except AttributeError:

txmongo/collection.py

@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division
 import io
 import struct
-import collections
+import collections.abc
 import warnings
 from bson import BSON, ObjectId
 from bson.code import Code
@@ -27,7 +27,7 @@
 from txmongo.utils import check_deadline, timeout
 from txmongo import filter as qf
 from twisted.internet import defer
-from twisted.python.compat import unicode, comparable
+from twisted.python.compat import comparable
 
 
 @comparable
@@ -50,8 +50,8 @@ class Collection(object):
     """
 
     def __init__(self, database, name, write_concern=None, codec_options=None):
-        if not isinstance(name, (bytes, unicode)):
-            raise TypeError("TxMongo: name must be an instance of (bytes, unicode).")
+        if not isinstance(name, (bytes, str)):
+            raise TypeError("TxMongo: name must be an instance of (bytes, str).")
 
         if not name or ".." in name:
             raise InvalidName("TxMongo: collection names cannot be empty.")
@@ -66,7 +66,7 @@ def __init__(self, database, name, write_concern=None, codec_options=None):
             raise InvalidName("TxMongo: collection names must not contain the null character.")
 
         self._database = database
-        self._collection_name = unicode(name)
+        self._collection_name = str(name)
         self.__write_concern = write_concern
         self.__codec_options = codec_options
 
@@ -173,7 +173,7 @@ def _normalize_fields_projection(fields):
         # Consider fields as iterable
         as_dict = {}
         for field in fields:
-            if not isinstance(field, (bytes, unicode)):
+            if not isinstance(field, (bytes, str)):
                 raise TypeError("TxMongo: fields must be a list of key names.")
             as_dict[field] = 1
         if not as_dict:
@@ -516,7 +516,7 @@ def group(self, keys, initial, reduce, condition=None, finalize=None, **kwargs):
             "$reduce": Code(reduce),
         }
 
-        if isinstance(keys, (bytes, unicode)):
+        if isinstance(keys, (bytes, str)):
             body["$keyf"] = Code(keys)
         else:
             body["key"] = self._normalize_fields_projection(keys)
@@ -738,7 +738,7 @@ def insert_many(self, documents, ordered=True, _deadline=None):
         """
         inserted_ids = []
         for doc in documents:
-            if isinstance(doc, collections.Mapping):
+            if isinstance(doc, collections.abc.Mapping):
                 inserted_ids.append(doc.setdefault("_id", ObjectId()))
             else:
                 raise TypeError("TxMongo: insert_many takes list of documents.")
@@ -1045,7 +1045,7 @@ def ensure_index(self, sort_fields, _deadline=None, **kwargs):
     @timeout
     def drop_index(self, index_identifier, _deadline=None):
         """drop_index(index_identifier)"""
-        if isinstance(index_identifier, (bytes, unicode)):
+        if isinstance(index_identifier, (bytes, str)):
             name = index_identifier
         elif isinstance(index_identifier, qf.sort):
             name = self._gen_index_name(index_identifier["orderby"])
@@ -1235,7 +1235,7 @@ def find_one_and_update(self, filter, update, projection=None, sort=None,
                                          update=update, _deadline=_deadline)
 
     def bulk_write(self, requests, ordered=True):
-        if not isinstance(requests, collections.Iterable):
+        if not isinstance(requests, collections.abc.Iterable):
             raise TypeError("requests must be iterable")
 
         requests = list(requests)

txmongo/connection.py

@@ -12,7 +12,6 @@
 from twisted.internet import defer, reactor, task
 from twisted.internet.protocol import ReconnectingClientFactory, ClientFactory
 from twisted.python import log
-from twisted.python.compat import StringType
 from txmongo.database import Database
 from txmongo.protocol import MongoProtocol, Query
 from txmongo.utils import timeout, get_err
@@ -245,7 +244,7 @@ class ConnectionPool(object):
 
     def __init__(self, uri="mongodb://127.0.0.1:27017", pool_size=1, ssl_context_factory=None,
                  ping_interval=10, ping_timeout=10, **kwargs):
-        assert isinstance(uri, StringType)
+        assert isinstance(uri, str)
         assert isinstance(pool_size, int)
         assert pool_size >= 1
 
@@ -332,7 +331,7 @@ def get_default_database(self):
             return None
 
     def drop_database(self, name_or_database):
-        if isinstance(name_or_database, (bytes, StringType)):
+        if isinstance(name_or_database, (bytes, str)):
             db = self[name_or_database]
         elif isinstance(name_or_database, Database):
             db = name_or_database

txmongo/database.py

@@ -4,7 +4,6 @@
 
 from bson.son import SON
 from bson.codec_options import DEFAULT_CODEC_OPTIONS
-from twisted.python.compat import unicode
 from txmongo.collection import Collection
 from txmongo.pymongo_internals import _check_command_response
 from txmongo.utils import timeout
@@ -18,7 +17,7 @@ def __init__(self, factory, database_name, write_concern=None,
         self.__factory = factory
         self.__write_concern = write_concern
         self.__codec_options = codec_options
-        self._database_name = unicode(database_name)
+        self._database_name = str(database_name)
 
     def __str__(self):
         return self._database_name
@@ -56,7 +55,7 @@ def codec_options(self):
     def command(self, command, value=1, check=True, allowable_errors=None,
                 codec_options=DEFAULT_CODEC_OPTIONS, _deadline=None, **kwargs):
         """command(command, value=1, check=True, allowable_errors=None, codec_options=DEFAULT_CODEC_OPTIONS)"""
-        if isinstance(command, (bytes, unicode)):
+        if isinstance(command, (bytes, str)):
             command = SON([(command, value)])
         options = kwargs.copy()
         command.update(options)
@@ -96,12 +95,12 @@ def drop_collection(self, name_or_collection, _deadline=None):
         """drop_collection(name_or_collection)"""
         if isinstance(name_or_collection, Collection):
             name = name_or_collection._collection_name
-        elif isinstance(name_or_collection, (bytes, unicode)):
+        elif isinstance(name_or_collection, (bytes, str)):
             name = name_or_collection
         else:
             raise TypeError("TxMongo: name must be an instance of basestring or txmongo.Collection")
 
-        return self.command("drop", unicode(name), allowable_errors=["ns not found"],
+        return self.command("drop", str(name), allowable_errors=["ns not found"],
                             _deadline=_deadline)
 
     @timeout
@@ -121,9 +120,9 @@ def authenticate(self, name, password, mechanism="DEFAULT"):
         Send an authentication command for this database.
         mostly stolen from pymongo
         """
-        if not isinstance(name, (bytes, unicode)):
+        if not isinstance(name, (bytes, str)):
             raise TypeError("TxMongo: name must be an instance of basestring.")
-        if not isinstance(password, (bytes, unicode)):
+        if not isinstance(password, (bytes, str)):
             raise TypeError("TxMongo: password must be an instance of basestring.")
 
         """

txmongo/filter.py

@@ -4,13 +4,12 @@
 
 from __future__ import absolute_import, division
 from collections import defaultdict
-from twisted.python.compat import unicode
 
 """Query filters"""
 
 
 def _direction(keys, direction):
-    if isinstance(keys, (bytes, unicode)):
+    if isinstance(keys, (bytes, str)):
         return (keys, direction),
     elif isinstance(keys, (list, tuple)):
         return tuple([(k, direction) for k in keys])
@@ -78,7 +77,7 @@ def _index_document(self, operation, index_list):
         try:
             assert isinstance(index_list, (list, tuple))
             for key, direction in index_list:
-                if not isinstance(key, (bytes, unicode)):
+                if not isinstance(key, (bytes, str)):
                     raise TypeError("TxMongo: invalid {0}ing key '{1}'"
                                     .format(name, repr(key)))
                 if direction not in self.ALLOWED_DIRECTIONS:

txmongo/protocol.py

@@ -29,7 +29,6 @@
 import struct
 from twisted.internet import defer, protocol, error
 from twisted.python import failure, log
-from twisted.python.compat import unicode
 from txmongo.utils import get_err
 
 
@@ -484,7 +483,7 @@ def authenticate_mongo_cr(self, database_name, username, password):
         nonce = result["nonce"]
 
         auth_cmd = SON(authenticate=1)
-        auth_cmd["user"] = unicode(username)
+        auth_cmd["user"] = str(username)
         auth_cmd["nonce"] = nonce
         auth_cmd["key"] = auth._auth_key(nonce, username, password)
 
@@ -566,8 +565,8 @@ def authenticate_mongo_x509(self,  database_name, username, password):
     @defer.inlineCallbacks
     def authenticate(self, database_name, username, password, mechanism):
         database_name = str(database_name)
-        username = unicode(username)
-        password = unicode(password)
+        username = str(username)
+        password = str(password)
 
         yield self.__auth_lock.acquire()