# HG changeset patch # User RĂ©mi Cardona # Date 1442323700 -7200 # Node ID f0006bdd36e93deb4a0e191b8219bd2d2b06ef8f # Parent 9924fd69bcbaad2b41b4f714b40383329907291c [py3k] bytes vs str diff -r 9924fd69bcba -r f0006bdd36e9 schema.py --- a/schema.py Tue Sep 15 15:08:04 2015 +0200 +++ b/schema.py Tue Sep 15 15:28:20 2015 +0200 @@ -995,7 +995,7 @@ etype_name_re = r'[A-Z][A-Za-z0-9]*[a-z]+[A-Za-z0-9]*$' def add_entity_type(self, edef): - edef.name = edef.name.encode() + edef.name = str(edef.name) edef.name = bw_normalize_etype(edef.name) if not re.match(self.etype_name_re, edef.name): raise BadSchemaDefinition( @@ -1020,7 +1020,7 @@ raise BadSchemaDefinition( '%r is not a valid name for a relation type. It should be ' 'lower cased' % rdef.name) - rdef.name = rdef.name.encode() + rdef.name = str(rdef.name) rschema = super(CubicWebSchema, self).add_relation_type(rdef) self._eid_index[rschema.eid] = rschema return rschema