merge from trunk.
This commit is contained in:
@@ -268,8 +268,12 @@ class autoxml(oo.autosuper, oo.autoprop):
|
|||||||
errorss = []
|
errorss = []
|
||||||
formatters = []
|
formatters = []
|
||||||
|
|
||||||
|
# FIXME: What is this? Remove this crap and try to fix autoxml, if can not be fixed then
|
||||||
|
# really throw whole autoxml to junk. But not this.
|
||||||
|
|
||||||
# read declaration order from source
|
# read declaration order from source
|
||||||
# code contributed by bahadir kandemir
|
# code contributed by bahadir kandemir
|
||||||
|
try:
|
||||||
from inspect import getsourcelines
|
from inspect import getsourcelines
|
||||||
from itertools import ifilter
|
from itertools import ifilter
|
||||||
import re
|
import re
|
||||||
@@ -278,6 +282,8 @@ class autoxml(oo.autosuper, oo.autoprop):
|
|||||||
|
|
||||||
lines = filter(fn, getsourcelines(cls)[0])
|
lines = filter(fn, getsourcelines(cls)[0])
|
||||||
decl_order = map(lambda x:x.split()[0], lines)
|
decl_order = map(lambda x:x.split()[0], lines)
|
||||||
|
except IOError:
|
||||||
|
decl_order = dict.keys()
|
||||||
|
|
||||||
# there should be at most one str member, and it should be
|
# there should be at most one str member, and it should be
|
||||||
# the first to process
|
# the first to process
|
||||||
|
|||||||
Reference in New Issue
Block a user