Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / dummy_tokenizer.py

diff --git a/test/python/dummy_tokenizer.py b/test/python/dummy_tokenizer.py
index d3f006deb3b029ffe05db5b9b6d7f13ba3d20b91..69202bc322ffd88e103f60f8ced809bfa8e82fd3 100644 (file)
--- a/test/python/dummy_tokenizer.py
+++ b/test/python/dummy_tokenizer.py
@@ -17,15 +17,20 @@ class DummyTokenizer:
 
 
     def init_new_db(self, *args, **kwargs):
 
 
     def init_new_db(self, *args, **kwargs):

-        assert self.init_state == None
+        assert self.init_state is None

         self.init_state = "new"
 
 
     def init_from_project(self):
         self.init_state = "new"
 
 
     def init_from_project(self):

-        assert self.init_state == None
+        assert self.init_state is None

         self.init_state = "loaded"
 
 
         self.init_state = "loaded"
 
 

+    @staticmethod
+    def finalize_import(_):
+        pass
+
+

     def name_analyzer(self):
         return DummyNameAnalyzer(self.analyser_cache)
 
     def name_analyzer(self):
         return DummyNameAnalyzer(self.analyser_cache)
 


@@ -47,14 +52,20 @@ class DummyNameAnalyzer:
     def close(self):
         pass
 
     def close(self):
         pass
 

-    def add_postcodes_from_db(self):
+    @staticmethod
+    def normalize_postcode(postcode):
+        return postcode
+
+    @staticmethod
+    def update_postcodes_from_db():

         pass
 
         pass
 

-    def update_special_phrases(self, phrases):
+    def update_special_phrases(self, phrases, should_replace):

         self.analyser_cache['special_phrases'] = phrases
 
     def add_country_names(self, code, names):
         self.analyser_cache['countries'].append((code, names))
 
         self.analyser_cache['special_phrases'] = phrases
 
     def add_country_names(self, code, names):
         self.analyser_cache['countries'].append((code, names))
 

-    def process_place(self, place):
+    @staticmethod
+    def process_place(place):

         return {}
         return {}