Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix merge problem

This commit is contained in:
Matthew Honnibal 2015-10-10 14:22:32 +11:00
parent 6ea8f99a10
commit 30de4135c9
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spacy/strings.pyx
View File

@ -1,9 +1,5 @@
<<<<<<< HEAD
from __future__ import unicode_literals from __future__ import unicode_literals
import codecs
=======
import io import io
>>>>>>> 8caedba42a5255b9996533a732e17eee3f20a2dd
from libc.string cimport memcpy from libc.string cimport memcpy
from murmurhash.mrmr cimport hash64 from murmurhash.mrmr cimport hash64
@ -133,25 +129,15 @@ cdef class StringStore:
def dump(self, loc): def dump(self, loc):
cdef Utf8Str* string cdef Utf8Str* string
<<<<<<< HEAD
cdef unicode py_string cdef unicode py_string
cdef int i cdef int i
with codecs.open(loc, 'w', 'utf8') as file_: with io.open(loc, 'w', 'utf8') as file_:
for i in range(1, self.size): for i in range(1, self.size):
string = &self.c[i] string = &self.c[i]
py_string = _decode(string) py_string = _decode(string)
file_.write(py_string) file_.write(py_string)
if (i+1) != self.size: if (i+1) != self.size:
file_.write(SEPARATOR) file_.write(SEPARATOR)
=======
cdef bytes py_string
for i in range(self.size):
string = &self.strings[i]
py_string = string.chars[:string.length]
strings.append(py_string.decode('utf8'))
with io.open(loc, 'w', encoding='utf8') as file_:
file_.write(SEPARATOR.join(strings))
>>>>>>> 8caedba42a5255b9996533a732e17eee3f20a2dd
def load(self, loc): def load(self, loc):
with io.open(loc, 'r', encoding='utf8') as file_: with io.open(loc, 'r', encoding='utf8') as file_: