@@ -120,27 +120,28 @@ def safe_encode(x, as_literal=True):
120
120
if x is None :
121
121
value = "Unknown"
122
122
if as_literal :
123
- return pm .Literal (value . decode ( 'utf-8' ) , pm .XSD ['string' ])
123
+ return pm .Literal (value , pm .XSD ['string' ])
124
124
else :
125
125
return value
126
126
try :
127
127
if isinstance (x , (str , string_types )):
128
+ iflogger .info (type (x ))
128
129
if os .path .exists (x ):
129
130
value = 'file://%s%s' % (getfqdn (), x )
130
131
if not as_literal :
131
132
return value
132
133
try :
133
134
return pm .URIRef (value )
134
135
except AttributeError :
135
- return pm .Literal (value . decode ( 'utf-8' ) , pm .XSD ['anyURI' ])
136
+ return pm .Literal (value , pm .XSD ['anyURI' ])
136
137
else :
137
138
if len (x ) > max_text_len :
138
139
value = x [:max_text_len - 13 ] + ['...Clipped...' ]
139
140
else :
140
141
value = x
141
142
if not as_literal :
142
143
return value
143
- return pm .Literal (value . decode ( 'utf-8' ) , pm .XSD ['string' ])
144
+ return pm .Literal (value , pm .XSD ['string' ])
144
145
if isinstance (x , int ):
145
146
if not as_literal :
146
147
return x
@@ -159,7 +160,7 @@ def safe_encode(x, as_literal=True):
159
160
outdict [key ] = encoded_value
160
161
if not as_literal :
161
162
return simplejson .dumps (outdict )
162
- return pm .Literal (simplejson .dumps (outdict ). decode ( 'utf-8' ) , pm .XSD ['string' ])
163
+ return pm .Literal (simplejson .dumps (outdict ), pm .XSD ['string' ])
163
164
if isinstance (x , list ):
164
165
try :
165
166
nptype = np .array (x ).dtype
@@ -177,7 +178,7 @@ def safe_encode(x, as_literal=True):
177
178
outlist = x
178
179
if not as_literal :
179
180
return simplejson .dumps (outlist )
180
- return pm .Literal (simplejson .dumps (outlist ). decode ( 'utf-8' ) , pm .XSD ['string' ])
181
+ return pm .Literal (simplejson .dumps (outlist ), pm .XSD ['string' ])
181
182
if not as_literal :
182
183
return dumps (x )
183
184
return pm .Literal (dumps (x ), nipype_ns ['pickle' ])
@@ -186,7 +187,7 @@ def safe_encode(x, as_literal=True):
186
187
value = "Could not encode: " + str (e )
187
188
if not as_literal :
188
189
return value
189
- return pm .Literal (value . decode ( 'utf-8' ) , pm .XSD ['string' ])
190
+ return pm .Literal (value , pm .XSD ['string' ])
190
191
191
192
192
193
def prov_encode (graph , value , create_container = True ):
0 commit comments