File tree Expand file tree Collapse file tree 1 file changed +16
-12
lines changed Expand file tree Collapse file tree 1 file changed +16
-12
lines changed Original file line number Diff line number Diff line change @@ -204,21 +204,26 @@ def __convert(self, data):
204
204
return data
205
205
206
206
def get_data (self ):
207
- original = dict ([(key .encode ('ASCII' ), value )
208
- for key , value
209
- in self .__raw_data .iteritems ()])
207
+ original = {
208
+ key .encode ('utf8' ): value
209
+ for key , value
210
+ in self .__raw_data .iteritems ()
211
+ }
210
212
211
- distilled = self .__info
213
+ distilled = self .__info
212
214
213
- extra = dict ([(key , getattr (self , key ))
214
- for key
215
- in self .__properties_extra ])
215
+ extra = {
216
+ key : getattr (self , key )
217
+ for key
218
+ in self .__properties_extra
219
+ }
216
220
217
- data_dict = {'original' : original ,
218
- #'distilled': distilled,
219
- 'extra' : extra }
221
+ data_dict = {
222
+ 'original' : original ,
223
+ 'extra' : extra ,
224
+ }
220
225
221
- return data_dict
226
+ return data_dict
222
227
223
228
@property
224
229
def xattr_data (self ):
@@ -227,7 +232,6 @@ def xattr_data(self):
227
232
228
233
attrs = {}
229
234
for a_type , a_dict in data_dict .iteritems ():
230
- # self.__log.debug("Setting [%s]." % (a_type))
231
235
for key , value in a_dict .iteritems ():
232
236
fqkey = ('user.%s.%s' % (a_type , key ))
233
237
attrs [fqkey ] = self .__convert (value )
You can’t perform that action at this time.
0 commit comments