[cdec.sa] Explicit feature names in grammar extractor output

+ sparse features in extractor
+ hg.intersect(string)
+ basestring = str|unicode

1 files changed, 2 insertions, 2 deletions

diff --git a/python/src/_cdec.pyx b/python/src/_cdec.pyx
index 5cdf8eb3..6c6c8eee 100644
--- a/python/src/_cdec.pyx
+++ b/python/src/_cdec.pyx
@@ -96,14 +96,14 @@ cdef class Decoder:
 
     def translate(self, sentence, grammar=None):
         cdef bytes input_str
-        if isinstance(sentence, unicode) or isinstance(sentence, str):
+        if isinstance(sentence, basestring):
             input_str = as_str(sentence.strip())
         elif isinstance(sentence, Lattice):
             input_str = str(sentence) # PLF format
         else:
             raise TypeError('Cannot translate input type %s' % type(sentence))
         if grammar:
-            if isinstance(grammar, str) or isinstance(grammar, unicode):
+            if isinstance(grammar, basestring):
                 self.dec.AddSupplementalGrammarFromString(string(as_str(grammar)))
             else:
                 self.dec.AddSupplementalGrammar(TextGrammar(grammar).grammar[0])