Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / nominatim.py

diff --git a/nominatim/nominatim.py b/nominatim/nominatim.py
index 14643770a6642662be283b0d21b3d36b556ac407..3e9c2f1644116e1efab46bd0e03c8291f9687ce6 100755 (executable)
--- a/nominatim/nominatim.py
+++ b/nominatim/nominatim.py
@@ -297,14 +297,14 @@ class Indexer(object):
             if command_stat > 100000:
                 for t in self.threads:
                     while not t.is_done():
             if command_stat > 100000:
                 for t in self.threads:
                     while not t.is_done():

-                        wait_select(t.conn)
+                        t.wait()

                     t.connect()
                 command_stat = 0
                 ready = self.threads
             else:
                 ready, _, _ = select.select(self.threads, [], [])
 
                     t.connect()
                 command_stat = 0
                 ready = self.threads
             else:
                 ready, _, _ = select.select(self.threads, [], [])
 

-        assert(False, "Unreachable code")
+        assert False, "Unreachable code"

 
 
 def nominatim_arg_parser():
 
 
 def nominatim_arg_parser():