@@ -266,20 +266,6 @@ def load_complex(self, cnf):
266
266
raise ConfigurationError ("No attribute converters, something is wrong!!" )
267
267
self .setattr ("" , "attribute_converters" , acs )
268
268
269
- def unicode_convert (self , item ):
270
- try :
271
- return six .text_type (item , "utf-8" )
272
- except TypeError :
273
- _uc = self .unicode_convert
274
- if isinstance (item , dict ):
275
- return dict ([(key , _uc (val )) for key , val in item .items ()])
276
- elif isinstance (item , list ):
277
- return [_uc (v ) for v in item ]
278
- elif isinstance (item , tuple ):
279
- return tuple ([_uc (v ) for v in item ])
280
- else :
281
- return item
282
-
283
269
def load (self , cnf , metadata_construction = False ):
284
270
""" The base load method, loads the configuration
285
271
@@ -288,7 +274,7 @@ def load(self, cnf, metadata_construction=False):
288
274
metadata. If so some things can be left out.
289
275
:return: The Configuration instance
290
276
"""
291
- _uc = self . unicode_convert
277
+
292
278
for arg in COMMON_ARGS :
293
279
if arg == "virtual_organization" :
294
280
if "virtual_organization" in cnf :
@@ -303,7 +289,7 @@ def load(self, cnf, metadata_construction=False):
303
289
self .extension_schema [_mod .NAMESPACE ] = _mod
304
290
305
291
try :
306
- setattr (self , arg , _uc ( cnf [arg ]) )
292
+ setattr (self , arg , cnf [arg ])
307
293
except KeyError :
308
294
pass
309
295
except TypeError : # Something that can't be a string
0 commit comments