Resolve deprecation warning raised in rethinkdb#188

gabor-boros · gabor-boros · commit fb5a06470a41 · 2020-05-01T07:58:40.000+02:00
diff --git a/rethinkdb/asyncio_net/net_asyncio.py b/rethinkdb/asyncio_net/net_asyncio.py
@@ -227,7 +227,7 @@ def connect(self, timeout):
                         break
                     # This may happen in the `V1_0` protocol where we send two requests as
                     # an optimization, then need to read each separately
-                    if request is not "":
+                    if request != "":
                         self._streamwriter.write(request)
 
                     response = yield from asyncio.wait_for(
diff --git a/rethinkdb/gevent_net/net_gevent.py b/rethinkdb/gevent_net/net_gevent.py
@@ -134,7 +134,7 @@ def __init__(self, parent):
                     break
                 # This may happen in the `V1_0` protocol where we send two requests as
                 # an optimization, then need to read each separately
-                if request is not "":
+                if request != "":
                     self.sendall(request)
 
                 # The response from the server is a null-terminated string
diff --git a/rethinkdb/net.py b/rethinkdb/net.py
@@ -403,7 +403,7 @@ def __init__(self, parent, timeout):
                     break
                 # This may happen in the `V1_0` protocol where we send two requests as
                 # an optimization, then need to read each separately
-                if request is not "":
+                if request != "":
                     self.sendall(request)
 
                 # The response from the server is a null-terminated string
diff --git a/rethinkdb/tornado_net/net_tornado.py b/rethinkdb/tornado_net/net_tornado.py
@@ -158,7 +158,7 @@ def connect(self, timeout):
                     break
                 # This may happen in the `V1_0` protocol where we send two requests as
                 # an optimization, then need to read each separately
-                if request is not "":
+                if request != "":
                     self._stream.write(request)
 
                 response = yield with_absolute_timeout(
diff --git a/rethinkdb/trio_net/net_trio.py b/rethinkdb/trio_net/net_trio.py
@@ -280,7 +280,7 @@ async def connect(self, timeout):
                     break
                 # This may happen in the `V1_0` protocol where we send two requests as
                 # an optimization, then need to read each separately
-                if request is not "":
+                if request != "":
                     await self._send(request)
                 with _reql_timeout(timeout):
                     response = await self._read_until(b"\0")
diff --git a/scripts/convert_protofile.py b/scripts/convert_protofile.py
@@ -86,9 +86,9 @@ def convertFile(inputFile, outputFile, language):
     assert(outputFile is not None and hasattr(outputFile, 'write'))
     assert(language in languageDefs)
 
-    messageRegex = re.compile('\s*(message|enum) (?P<name>\w+) \{')
-    valueRegex = re.compile('\s*(?P<name>\w+)\s*=\s*(?P<value>\w+)')
-    endRegex = re.compile('\s*\}')
+    messageRegex = re.compile(r'\s*(message|enum) (?P<name>\w+) \{')
+    valueRegex = re.compile(r'\s*(?P<name>\w+)\s*=\s*(?P<value>\w+)')
+    endRegex = re.compile(r'\s*\}')
 
     indentLevel = languageDefs[language]["initialIndentLevel"]
     lastIndentLevel = languageDefs[language]["initialIndentLevel"] - 1
