@@ -180,9 +180,16 @@ def __str__(self):
180
180
elif self .exrange is not None :
181
181
rv = '{' + str (self .exrange [0 ]) + ' TO ' + str (self .exrange [1 ]) + '}'
182
182
elif self .fuzzy :
183
- rv = '{0!s}~' .format (self .fuzzy [0 ])
183
+ try :
184
+ rv = '{0!s}~' .format (self .fuzzy [0 ])
185
+ except AttributeError :
186
+ rv = '%s~' % self .fuzzy [0 ]
184
187
if self .fuzzy [1 ] is not None :
185
- rv += '{0:.3f}' .format (self .fuzzy [1 ])
188
+ try :
189
+ rv += '{0:.3f}' .format (self .fuzzy [1 ])
190
+ except AttributeError :
191
+ rv += '%.3f' % self .fuzzy [1 ]
192
+
186
193
else :
187
194
rv = ''
188
195
for o in self .must :
@@ -193,7 +200,10 @@ def __str__(self):
193
200
rv += str (o )
194
201
195
202
if self .field is not None :
196
- rv = '{0}:({1})' .format (self .field , rv )
203
+ try :
204
+ rv = '{0}:({1})' .format (self .field , rv )
205
+ except AttributeError :
206
+ rv = '%s:(%s)' % (self .field , rv )
197
207
return rv
198
208
199
209
@@ -214,9 +224,15 @@ def __unicode__(self):
214
224
elif self .exrange is not None :
215
225
rv = u'{' + unicode (self .exrange [0 ]) + u' TO ' + unicode (self .exrange [1 ]) + u'}'
216
226
elif self .fuzzy :
217
- rv = u'{0!s}~' .format (self .fuzzy [0 ])
227
+ try :
228
+ rv = u'{0!s}~' .format (self .fuzzy [0 ])
229
+ except AttributeError :
230
+ rv = u'%s~' % self .fuzzy [0 ]
218
231
if self .fuzzy [1 ] is not None :
219
- rv += u'{0:.3f}' .format (self .fuzzy [1 ])
232
+ try :
233
+ rv += '{0:.3f}' .format (self .fuzzy [1 ])
234
+ except AttributeError :
235
+ rv += '%.3f' % self .fuzzy [1 ]
220
236
else :
221
237
rv = u''
222
238
for o in self .must :
@@ -227,5 +243,8 @@ def __unicode__(self):
227
243
rv += unicode (o )
228
244
229
245
if self .field is not None :
230
- rv = u'{0}:({1})' .format (self .field , rv )
231
- return rv
246
+ try :
247
+ rv = u'{0}:({1})' .format (self .field , rv )
248
+ except AttributeError :
249
+ rv = u'%s:(%s)' % (self .field , rv )
250
+ return rv
0 commit comments