refactor Python API to be more pythonic - part 2

python/src/addons/CompletionDictionaryCompiler.pyx

@@ -5,14 +5,14 @@
 
 
     def __setitem__(self, key, value):
-        self.Add(key, value)
+        self.add(key, value)
 
 
     def __exit__(self, type, value, traceback):
-        self.Compile()
+        self.compile()
 
 
-    def Compile(self, *args):
+    def compile(self, *args):
         if not args:
             with nogil:
                 self.inst.get().Compile()
@@ -21,3 +21,15 @@
         cdef void* callback = <void*> args[0]
         with nogil:
             self.inst.get().Compile(progress_compiler_callback, callback)
+
+    def Compile(self, *args):
+        return call_deprecated_method("Compile", "compile", self.compile, *args)
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)

python/src/addons/CompletionDictionaryMerger.pyx

@@ -0,0 +1,12 @@
+
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def Merge(self, *args):
+        return call_deprecated_method("Merge", "merge", self.merge, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+

python/src/addons/FloatVectorDictionaryCompiler.pyx

@@ -5,14 +5,14 @@
 
 
     def __setitem__(self, key, value):
-        self.Add(key, value)
+        self.add(key, value)
 
 
     def __exit__(self, type, value, traceback):
-        self.Compile()
+        self.compile()
 
 
-    def Compile(self, *args):
+    def compile(self, *args):
         if not args:
             with nogil:
                 self.inst.get().Compile()
@@ -22,3 +22,14 @@
         with nogil:
             self.inst.get().Compile(progress_compiler_callback, callback)
 
+    def Compile(self, *args):
+        return call_deprecated_method("Compile", "compile", self.compile, *args)
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)

python/src/addons/ForwardBackwardCompletion.pyx

@@ -0,0 +1,4 @@
+
+
+    def GetCompletions(self, *args):
+        return call_deprecated_method("GetCompletions", "complete", self.complete, *args)

python/src/addons/Index.pyx

@@ -36,7 +36,7 @@
 
         self.inst.get().Delete(key)
 
-    def Get (self, key, default = None):
+    def get (self, key, default = None):
         """Return the value for key if key is in the dictionary, else default."""
         if isinstance(key, unicode):
             key = key.encode('utf-8')
@@ -50,6 +50,9 @@
         py_result.inst = _r
         return py_result
 
+    def Get(self, *args):
+        return call_deprecated_method("Get", "get", self.get, *args)
+
     def __contains__(self, key):
         if isinstance(key, unicode):
             key = key.encode('utf-8')
@@ -72,7 +75,7 @@
         py_result.inst = _r
         return py_result
 
-    def MSet(self, list key_values ):
+    def bulk_set(self, list key_values ):
         assert isinstance(key_values, list), 'arg in_0 wrong type'
         cdef shared_ptr[libcpp_vector[libcpp_pair[libcpp_utf8_string,libcpp_utf8_string]]] cpp_key_values = shared_ptr[libcpp_vector[libcpp_pair[libcpp_utf8_string,libcpp_utf8_string]]](new libcpp_vector[libcpp_pair[libcpp_utf8_string,libcpp_utf8_string]]())
         cdef libcpp_pair[libcpp_utf8_string, libcpp_utf8_string] cpp_kv
@@ -92,3 +95,21 @@
             cpp_key_values.get().push_back(cpp_kv)
 
         self.inst.get().MSet(cpp_key_values)
+
+    def MSet(self, *args):
+        return call_deprecated_method("MSet", "bulk_set", self.bulk_set, *args)
+
+    def Set(self, *args):
+        return call_deprecated_method("Set", "set", self.set, *args)
+
+    def GetNear(self, *args):
+        return call_deprecated_method("GetNear", "get_near", self.get_near, *args)
+
+    def GetFuzzy(self, *args):
+        return call_deprecated_method("GetFuzzy", "get_fuzzy", self.get_fuzzy, *args)
+
+    def Delete(self, *args):
+        return call_deprecated_method("Delete", "delete", self.delete, *args)
+
+    def Flush(self, *args):
+        return call_deprecated_method("Flush", "flush", self.flush, *args)

python/src/addons/IntDictionaryCompiler.pyx

@@ -5,14 +5,14 @@
 
 
     def __setitem__(self, key, value):
-        self.Add(key, value)
+        self.add(key, value)
 
 
     def __exit__(self, type, value, traceback):
-        self.Compile()
+        self.compile()
 
 
-    def Compile(self, *args):
+    def compile(self, *args):
         if not args:
             with nogil:
                 self.inst.get().Compile()
@@ -22,3 +22,15 @@
         with nogil:
             self.inst.get().Compile(progress_compiler_callback, callback)
 
+    def Compile(self, *args):
+        return call_deprecated_method("Compile", "compile", self.compile, *args)
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)
+

python/src/addons/IntDictionaryMerger.pyx

@@ -0,0 +1,12 @@
+
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def Merge(self, *args):
+        return call_deprecated_method("Merge", "merge", self.merge, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+

python/src/addons/JsonDictionaryCompiler.pyx

@@ -5,14 +5,14 @@
 
 
     def __setitem__(self, key, value):
-        self.Add(key, value)
+        self.add(key, value)
 
 
     def __exit__(self, type, value, traceback):
-        self.Compile()
+        self.compile()
 
 
-    def Compile(self, *args):
+    def compile(self, *args):
         if not args:
             with nogil:
                 self.inst.get().Compile()
@@ -22,3 +22,15 @@
         with nogil:
             self.inst.get().Compile(progress_compiler_callback, callback)
 
+    def Compile(self, *args):
+        return call_deprecated_method("Compile", "compile", self.compile, *args)
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)
+

python/src/addons/JsonDictionaryMerger.pyx

@@ -0,0 +1,12 @@
+
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def Merge(self, *args):
+        return call_deprecated_method("Merge", "merge", self.merge, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+

python/src/addons/JsonVector.pyx

@@ -1,8 +1,17 @@
 
 
-    def Get(self,  index ):
+    def __getitem__(self,  index ):
         assert isinstance(index, (int, long)), 'arg index wrong type'
 
         cdef libcpp_utf8_string _r = self.inst.get().Get((<size_t>index))
         py_result = json.loads(_r.decode('utf-8'))
         return py_result
+
+    def Get(self, *args):
+        return call_deprecated_method("Get", "__getitem__", self.__getitem__, *args)
+
+    def Size(self, *args):
+        return call_deprecated_method("Size", "__len__", self.__len__, *args)
+
+    def Manifest(self, *args):
+        return call_deprecated_method("Manifest", "manifest", self.manifest, *args)

python/src/addons/JsonVectorGenerator.pyx

@@ -1,5 +1,14 @@
 
 
-    def PushBack(self,  in_0 ):
+    def append(self,  in_0 ):
         dumps = json.dumps(in_0).encode('utf-8')
         self.inst.get().PushBack((<libcpp_utf8_string>dumps))
+
+    def PushBack(self, *args):
+        return call_deprecated_method("PushBack", "append", self.append, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)

python/src/addons/KeyOnlyDictionaryCompiler.pyx

@@ -5,14 +5,14 @@
 
 
     def __setitem__(self, key, value):
-        self.Add(key, value)
+        self.add(key, value)
 
 
     def __exit__(self, type, value, traceback):
-        self.Compile()
+        self.compile()
 
 
-    def Compile(self, *args):
+    def compile(self, *args):
         if not args:
             with nogil:
                 self.inst.get().Compile()
@@ -22,3 +22,14 @@
         with nogil:
             self.inst.get().Compile(progress_compiler_callback, callback)
 
+    def Compile(self, *args):
+        return call_deprecated_method("Compile", "compile", self.compile, *args)
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)

python/src/addons/KeyOnlyDictionaryGenerator.pyx

@@ -0,0 +1,10 @@
+
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def CloseFeeding(self, *args):
+        return call_deprecated_method("CloseFeeding", "close_feeding", self.close_feeding, *args)
+
+    def WriteToFile(self, *args):
+        return call_deprecated_method("WriteToFile", "write_to_file", self.write_to_file, *args)

python/src/addons/KeyOnlyDictionaryMerger.pyx

@@ -0,0 +1,12 @@
+
+
+    def Add(self, *args):
+        return call_deprecated_method("Add", "add", self.add, *args)
+
+    def Merge(self, *args):
+        return call_deprecated_method("Merge", "merge", self.merge, *args)
+
+    def SetManifest(self, *args):
+        return call_deprecated_method("SetManifest", "set_manifest", self.set_manifest, *args)
+
+

python/src/addons/MultiWordCompletion.pyx

@@ -0,0 +1,4 @@
+
+
+    def GetCompletions(self, *args):
+        return call_deprecated_method("GetCompletions", "complete", self.complete, *args)

python/src/addons/PrefixCompletion.pyx

@@ -0,0 +1,7 @@
+
+
+    def GetCompletions(self, *args):
+        return call_deprecated_method("GetCompletions", "complete", self.complete, *args)
+
+    def GetFuzzyCompletions(self, *args):
+        return call_deprecated_method("GetFuzzyCompletions", "complete_fuzzy", self.complete_fuzzy, *args)