mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-23 18:52:10 +01:00
Code

- use get/set when working with an "Element" instance (instead of using the "attrib" dict)

Browse Source
This commit is contained in:
Marcus Huewe 2011-02-22 17:52:12 +01:00
parent 3f54237a7c
commit f06b39fb40
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -1798,7 +1798,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if not opts.message: if not opts.message:
opts.message = edit_message() opts.message = edit_message()
r = http_POST(url, data=opts.message) r = http_POST(url, data=opts.message)
print ET.parse(r).getroot().attrib['code'] print ET.parse(r).getroot().get('code')
# list and approvenew # list and approvenew
elif cmd == 'list' or cmd == 'approvenew': elif cmd == 'list' or cmd == 'approvenew':

15
osc/core.py
View File

@ -547,7 +547,7 @@ class Project:
if node == None: if node == None:
self.new_package_entry(pac, state) self.new_package_entry(pac, state)
else: else:
node.attrib['state'] = state node.set('state', state)
def get_package_node(self, pac): def get_package_node(self, pac):
for node in self.pac_root.findall('package'): for node in self.pac_root.findall('package'):
@ -3526,7 +3526,7 @@ def change_review_state(apiurl, reqid, newstate, by_user='', by_group='', by_pro
u = makeurl(apiurl, ['request', reqid], query=query) u = makeurl(apiurl, ['request', reqid], query=query)
f = http_POST(u, data=message) f = http_POST(u, data=message)
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
return root.attrib['code'] return root.get('code')
def change_request_state(apiurl, reqid, newstate, message='', supersed=None, force=False): def change_request_state(apiurl, reqid, newstate, message='', supersed=None, force=False):
query={'cmd': 'changestate', 'newstate': newstate } query={'cmd': 'changestate', 'newstate': newstate }
@ -4151,8 +4151,7 @@ def link_pac(src_project, src_package, dst_project, dst_package, force, rev='',
template_args=None, template_args=None,
create_new=False, apiurl=apiurl) create_new=False, apiurl=apiurl)
root = ET.fromstring(''.join(dst_meta)) root = ET.fromstring(''.join(dst_meta))
print root.attrib['project'] if root.get('project') != dst_project:
if root.attrib['project'] != dst_project:
# The source comes from a different project via a project link, we need to create this instance # The source comes from a different project via a project link, we need to create this instance
meta_change = True meta_change = True
except: except:
@ -5593,14 +5592,14 @@ def setDevelProject(apiurl, prj, pac, dprj, dpkg=None):
ET.SubElement(root, 'devel') ET.SubElement(root, 'devel')
elem = root.find('devel') elem = root.find('devel')
if dprj: if dprj:
elem.attrib['project'] = dprj elem.set('project', dprj)
else: else:
if elem.attrib.has_key('project'): if 'project' in elem.keys():
del elem.attrib['project'] del elem.attrib['project']
if dpkg: if dpkg:
elem.attrib['package'] = dpkg elem.set('package', dpkg)
else: else:
if elem.attrib.has_key('package'): if 'package' in elem.keys():
del elem.attrib['package'] del elem.attrib['package']
edit_meta(metatype='pkg', edit_meta(metatype='pkg',
path_args=path, path_args=path,