remove some excessive TString and TStringBuf cython definitions

ref:135e0306231fe09bc04c8c291314763dc496e57a
noisyboy012 · Feb 6, 2019 · 7be96e8 · 7be96e8
1 parent f0ed429
commit 7be96e8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 41 deletions.
diff --git a/catboost/python-package/catboost/_catboost.pyx b/catboost/python-package/catboost/_catboost.pyx
@@ -32,7 +32,7 @@ from util.generic.array_ref cimport TArrayRef, TConstArrayRef
 from util.generic.hash cimport THashMap
 from util.generic.maybe cimport TMaybe
 from util.generic.ptr cimport THolder
-from util.generic.string cimport TString
+from util.generic.string cimport TString, TStringBuf
 from util.generic.vector cimport TVector
 from util.system.types cimport ui8, ui32, ui64, i64
 from util.string.cast cimport StrToD, TryFromString, ToString
@@ -76,15 +76,6 @@ cdef extern from "util/generic/ptr.h" nogil:
         T* Release()
         void Drop()
 
-# TODO(akhropov): Add necessary methods to util's def
-cdef extern from "util/generic/strbuf.h":
-    cdef cppclass TStringBuf:
-        TStringBuf() except +
-        TStringBuf(const char*) except +
-        TStringBuf(const char*, size_t) except +
-        char* Data()
-        size_t Size()
-
 cdef extern from "catboost/libs/logging/logging.h":
     cdef void SetCustomLoggingFunction(void(*func)(const char*, size_t len) except * with gil, void(*func)(const char*, size_t len) except * with gil)
     cdef void RestoreOriginalLogger()

diff --git a/library/python/runtime/__res.pyx b/library/python/runtime/__res.pyx
@@ -1,18 +1,6 @@
 from libcpp cimport bool
 
-
-cdef extern from "util/generic/string.h":
-    cdef cppclass TString:
-        const char* c_str()
-        size_t length()
-
-
-cdef extern from "util/generic/strbuf.h":
-    cdef cppclass TStringBuf:
-        TStringBuf()
-        TStringBuf(const char* buf, size_t len)
-        const char* Data()
-        size_t Size()
+from util.generic.string cimport TString, TStringBuf
 
 
 cdef extern from "library/resource/resource.h" namespace "NResource":

diff --git a/library/python/runtime_py3/__res.pyx b/library/python/runtime_py3/__res.pyx
@@ -4,19 +4,7 @@ from _codecs import utf_8_decode, utf_8_encode
 
 from libcpp cimport bool
 
-
-cdef extern from "util/generic/string.h":
-    cdef cppclass TString:
-        const char* c_str()
-        size_t length()
-
-
-cdef extern from "util/generic/strbuf.h":
-    cdef cppclass TStringBuf:
-        TStringBuf()
-        TStringBuf(const char* buf, size_t len)
-        const char* Data()
-        size_t Size()
+from util.generic.string cimport TString, TStringBuf
 
 
 cdef extern from "library/resource/resource.h" namespace "NResource":

diff --git a/util/datetime/base.pxd b/util/datetime/base.pxd
@@ -3,11 +3,7 @@ from libc.stdint cimport uint64_t
 from libcpp cimport bool as bool_t
 from posix.types cimport time_t
 
-from util.generic.string cimport TString
-
-cdef extern from "util/generic/strbuf.h" nogil:
-    cdef cppclass TStringBuf:
-        pass
+from util.generic.string cimport TString, TStringBuf
 
 
 cdef extern from "<util/datetime/base.h>" nogil:

diff --git a/util/generic/string.pxd b/util/generic/string.pxd
@@ -5,6 +5,7 @@ cdef extern from "<util/generic/strbuf.h>" nogil:
     cdef cppclass TStringBuf:
         TStringBuf() except +
         TStringBuf(const char*) except +
+        TStringBuf(const char*, size_t) except +
         char* Data()
         size_t Size()