Commitf393e0e

committed

fix py2/3 compatible, request by vaneoooo

1 parente996030 commitf393e0eCopy full SHA for f393e0e

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#coding=utf-8`
`2`	`2`	`fromuliwebimportexpose,functions,models,UliwebError`
`3`	`3`	`fromuliweb.ormimportModelNotFound`
	`4`	`+fromuliweb.utils._compatimportstring_types`
`4`	`5`	`fromsqlalchemy.sqlimportand_,or_,not_`
`5`	`6`	`fromjsonimportloads`
`6`	`7`	`fromcollectionsimportOrderedDict`
`@@ -224,7 +225,7 @@ def _get_filter_condition(self,model,model_param,item,expr=False):`
`224`	`225`	`returnself._expr(model,model_param,model_expr=item)`
`225`	`226`	`else:`
`226`	`227`	`raiseUliwebError("item can be array only in @expr: '%s'"%(item))`
`227`		`-ifnotisinstance(item,str):`
	`228`	`+ifnotisinstance(item,string_types):`
`228`	`229`	`raiseUliwebError("item should be array or string: '%s'"%(item))`
`229`	`230`	`n=item`
`230`	`231`	`ifn[0]=="@":`

Comments

(0)