Merge pull request #375 from tirkarthi/fix-assert

Use six.assertRegex instead of assertRegexpMatches for Python 3.11 compatibility.

Author: acdha

tests/test_client.py

@@ -768,30 +768,17 @@ def test_build_json_doc_matches_xml(self):
         self.assertIsNone(doc_xml.find("*[name='title']"))
 
     def test__build_docs_plain(self):
-        docs = [{
-            "id": "doc_1",
-            "title": "",
-            "price": 12.59,
-            "popularity": 10
-        }]
+        docs = [{"id": "doc_1", "title": "", "price": 12.59, "popularity": 10}]
         solrapi, m, len_message = self.solr._build_docs(docs)
         self.assertEqual(solrapi, "JSON")
 
     def test__build_docs_boost(self):
-        docs = [{
-            "id": "doc_1",
-            "title": "",
-            "price": 12.59,
-            "popularity": 10
-        }]
+        docs = [{"id": "doc_1", "title": "", "price": 12.59, "popularity": 10}]
         solrapi, m, len_message = self.solr._build_docs(docs, boost={"title": 10.0})
         self.assertEqual(solrapi, "XML")
 
     def test__build_docs_field_updates(self):
-        docs = [{
-            "id": "doc_1",
-            "popularity": 10
-        }]
+        docs = [{"id": "doc_1", "popularity": 10}]
         solrapi, m, len_message = self.solr._build_docs(
             docs, fieldUpdates={"popularity": "inc"}
         )

tests/test_cloud.py

@@ -4,6 +4,8 @@
 
 import unittest
 
+import six
+
 from pysolr import SolrCloud, SolrError, ZooKeeper, json
 
 from .test_client import SolrTestCase
@@ -56,16 +58,20 @@ def test_invalid_collection(self):
 
     def test__create_full_url(self):
         # Nada.
-        self.assertRegexpMatches(
-            self.solr._create_full_url(path=""), r"http://localhost:89../solr/core0$"
+        six.assertRegex(
+            self,
+            self.solr._create_full_url(path=""),
+            r"http://localhost:89../solr/core0$",
         )
         # Basic path.
-        self.assertRegexpMatches(
+        six.assertRegex(
+            self,
             self.solr._create_full_url(path="pysolr_tests"),
             r"http://localhost:89../solr/core0/pysolr_tests$",
         )
         # Leading slash (& making sure we don't touch the trailing slash).
-        self.assertRegexpMatches(
+        six.assertRegex(
+            self,
             self.solr._create_full_url(path="/pysolr_tests/select/?whatever=/"),
             r"http://localhost:89../solr/core0/pysolr_tests/select/\?whatever=/",
         )