Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] From-Import-Removal

Browse Source
This commit is contained in:
Faik Uygur
2007-04-26 19:36:57 +00:00
parent 9bd3820106
commit 45aaee141e
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/pxml/autoxml.py
+26 -26
View File
@@ -25,7 +25,7 @@ import codecs
import types import types
import formatter import formatter
import sys import sys
from StringIO import StringIO import StringIO
import gettext import gettext
__trans = gettext.translation('pisi', fallback=True) __trans = gettext.translation('pisi', fallback=True)
@@ -33,8 +33,8 @@ _ = __trans.ugettext
# PiSi # PiSi
import pisi import pisi
from pisi.pxml.xmlext import * import pisi.pxml.xmlext as xmlext
from pisi.pxml.xmlfile import XmlFile import pisi.pxml.xmlfile as xmlfile
import pisi.context as ctx import pisi.context as ctx
import pisi.util as util import pisi.util as util
import pisi.oo as oo import pisi.oo as oo
@@ -71,15 +71,15 @@ class LocalText(dict):
def decode(self, node, errs, where = ""): def decode(self, node, errs, where = ""):
# flags, tag name, instance attribute # flags, tag name, instance attribute
assert self.tag != '' assert self.tag != ''
nodes = getAllNodes(node, self.tag) nodes = xmlext.getAllNodes(node, self.tag)
if not nodes: if not nodes:
if self.req == mandatory: if self.req == mandatory:
errs.append(where + ': ' + _("At least one '%s' tag should have local text") % errs.append(where + ': ' + _("At least one '%s' tag should have local text") %
self.tag ) self.tag )
else: else:
for node in nodes: for node in nodes:
lang = getNodeAttribute(node, 'xml:lang') lang = xmlext.getNodeAttribute(node, 'xml:lang')
c = getNodeText(node) c = xmlext.getNodeText(node)
if not c: if not c:
errs.append(where + ': ' + _("'%s' language of tag '%s' is empty") % errs.append(where + ': ' + _("'%s' language of tag '%s' is empty") %
(lang, self.tag)) (lang, self.tag))
@@ -91,9 +91,9 @@ class LocalText(dict):
def encode(self, node, errs): def encode(self, node, errs):
assert self.tag != '' assert self.tag != ''
for key in self.iterkeys(): for key in self.iterkeys():
newnode = addNode(node, self.tag) newnode = xmlext.addNode(node, self.tag)
setNodeAttribute(newnode, 'xml:lang', key) xmlext.setNodeAttribute(newnode, 'xml:lang', key)
addText(newnode, '', self[key]) xmlext.addText(newnode, '', self[key])
#FIXME: maybe more appropriate for pisi.util #FIXME: maybe more appropriate for pisi.util
@staticmethod @staticmethod
@@ -249,7 +249,7 @@ class autoxml(oo.autosuper, oo.autoprop):
# standard initialization # standard initialization
super(autoxml, cls).__init__(name, bases, dict) super(autoxml, cls).__init__(name, bases, dict)
xmlfile_support = XmlFile in bases xmlfile_support = xmlfile.XmlFile in bases
cls.autoxml_bases = filter(lambda base: isinstance(base, autoxml), bases) cls.autoxml_bases = filter(lambda base: isinstance(base, autoxml), bases)
@@ -320,9 +320,9 @@ class autoxml(oo.autosuper, oo.autoprop):
**args): **args):
if xmlfile_support: if xmlfile_support:
if args.has_key('tag'): if args.has_key('tag'):
XmlFile.__init__(self, tag = args['tag']) xmlfile.XmlFile.__init__(self, tag = args['tag'])
else: else:
XmlFile.__init__(self, tag = cls.tag) xmlfile.XmlFile.__init__(self, tag = cls.tag)
for base in cls.autoxml_bases: for base in cls.autoxml_bases:
base.__init__(self) base.__init__(self)
for init in inits: for init in inits:
@@ -393,7 +393,7 @@ class autoxml(oo.autosuper, oo.autoprop):
cls.print_text = print_text cls.print_text = print_text
if not dict.has_key('__str__'): if not dict.has_key('__str__'):
def str(self): def str(self):
strfile = StringIO() strfile = StringIO.StringIO()
self.print_text(strfile) self.print_text(strfile)
str = strfile.getvalue() str = strfile.getvalue()
strfile.close() strfile.close()
@@ -489,10 +489,10 @@ class autoxml(oo.autosuper, oo.autoprop):
tag_type = spec[0] tag_type = spec[0]
assert type(tag_type) == type(type) assert type(tag_type) == type(type)
def readtext(node, attr): def readtext(node, attr):
return getNodeAttribute(node, attr) return xmlext.getNodeAttribute(node, attr)
def writetext(node, attr, text): def writetext(node, attr, text):
#print 'write attr', attr, text #print 'write attr', attr, text
setNodeAttribute(node, attr, text) xmlext.setNodeAttribute(node, attr, text)
anonfuns = cls.gen_anon_basic(attr, spec, readtext, writetext) anonfuns = cls.gen_anon_basic(attr, spec, readtext, writetext)
return cls.gen_named_comp(attr, spec, anonfuns) return cls.gen_named_comp(attr, spec, anonfuns)
@@ -510,10 +510,10 @@ class autoxml(oo.autosuper, oo.autoprop):
autoxml.basic_cons_map.has_key(tag_type): autoxml.basic_cons_map.has_key(tag_type):
def readtext(node, tagpath): def readtext(node, tagpath):
#print 'read tag', node, tagpath #print 'read tag', node, tagpath
return getNodeText(node, tagpath) return xmlext.getNodeText(node, tagpath)
def writetext(node, tagpath, text): def writetext(node, tagpath, text):
#print 'write tag', node, tagpath, text #print 'write tag', node, tagpath, text
addText(node, tagpath, text) xmlext.addText(node, tagpath, text)
return cls.gen_anon_basic(tag, spec, readtext, writetext) return cls.gen_anon_basic(tag, spec, readtext, writetext)
elif type(tag_type) is types.ListType: elif type(tag_type) is types.ListType:
return cls.gen_list_tag(tag, spec) return cls.gen_list_tag(tag, spec)
@@ -532,9 +532,9 @@ class autoxml(oo.autosuper, oo.autoprop):
assert type(tag_type) == type(type) assert type(tag_type) == type(type)
def readtext(node, blah): def readtext(node, blah):
#node.normalize() # piksemel doesn't have this #node.normalize() # piksemel doesn't have this
return getNodeText(node) return xmlext.getNodeText(node)
def writetext(node, blah, text): def writetext(node, blah, text):
addText(node, "", text) xmlext.addText(node, "", text)
anonfuns = cls.gen_anon_basic(token, spec, readtext, writetext) anonfuns = cls.gen_anon_basic(token, spec, readtext, writetext)
return cls.gen_named_comp(token, spec, anonfuns) return cls.gen_named_comp(token, spec, anonfuns)
@@ -692,7 +692,7 @@ class autoxml(oo.autosuper, oo.autoprop):
return make_object() return make_object()
def decode(node, errs, where): def decode(node, errs, where):
node = getNode(node, tag) node = xmlext.getNode(node, tag)
if node: if node:
try: try:
obj = make_object() obj = make_object()
@@ -709,9 +709,9 @@ class autoxml(oo.autosuper, oo.autoprop):
if node and obj: if node and obj:
try: try:
#FIXME: this doesn't look pretty #FIXME: this doesn't look pretty
classnode = newNode(node, tag) classnode = xmlext.newNode(node, tag)
obj.encode(classnode, errs) obj.encode(classnode, errs)
addNode(node, '', classnode) xmlext.addNode(node, '', classnode)
except Error: except Error:
if req == mandatory: if req == mandatory:
# note: we can receive an error if obj has no content # note: we can receive an error if obj has no content
@@ -750,14 +750,14 @@ class autoxml(oo.autosuper, oo.autoprop):
def decode(node, errs, where): def decode(node, errs, where):
l = [] l = []
nodes = getAllNodes(node, path) nodes = xmlext.getAllNodes(node, path)
#print node, tag + '/' + comp_tag, nodes #print node, tag + '/' + comp_tag, nodes
if len(nodes)==0 and req==mandatory: if len(nodes)==0 and req==mandatory:
errs.append(where + ': ' + _('Mandatory list "%s" under "%s" node is empty.') % (path, node.name())) errs.append(where + ': ' + _('Mandatory list "%s" under "%s" node is empty.') % (path, node.name()))
ix = 1 ix = 1
for node in nodes: for node in nodes:
dummy = newNode(node, "Dummy") dummy = xmlext.newNode(node, "Dummy")
addNode(dummy, '', node) xmlext.addNode(dummy, '', node)
l.append(decode_item(dummy, errs, where + unicode("[%s]" % ix))) l.append(decode_item(dummy, errs, where + unicode("[%s]" % ix)))
#l.append(decode_item(node, errs, where + unicode("[%s]" % ix))) #l.append(decode_item(node, errs, where + unicode("[%s]" % ix)))
ix += 1 ix += 1
@@ -767,7 +767,7 @@ class autoxml(oo.autosuper, oo.autoprop):
if l and len(l) > 0: if l and len(l) > 0:
for item in l: for item in l:
if list_tagpath: if list_tagpath:
listnode = addNode(node, list_tagpath, branch = False) listnode = xmlext.addNode(node, list_tagpath, branch = False)
else: else:
listnode = node listnode = node
encode_item(listnode, item, errs) encode_item(listnode, item, errs)