Fixes from merge
This commit is contained in:
@@ -787,7 +787,7 @@ def read_binary_longstring(f):
|
||||
|
||||
|
||||
def read_longstring(f):
|
||||
return read_binary_longstring().decode('utf8')
|
||||
return read_binary_longstring(f).decode('utf8')
|
||||
|
||||
|
||||
def write_longstring(f, s):
|
||||
|
||||
@@ -27,7 +27,8 @@ from cassandra.cqltypes import (BooleanType, lookup_casstype_simple, lookup_cass
|
||||
EmptyValue, _CassandraType, DateType)
|
||||
from cassandra.query import named_tuple_factory
|
||||
from cassandra.decoder import (write_string, read_longstring, write_stringmap, read_stringmap, read_inet,
|
||||
write_inet, cql_quote, read_string, write_longstring)
|
||||
write_inet, read_string, write_longstring)
|
||||
from cassandra.encoder import cql_quote
|
||||
|
||||
|
||||
class TypeTests(unittest.TestCase):
|
||||
|
||||
Reference in New Issue
Block a user