← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to virtinst/NodeDeviceParser.py

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/NodeDeviceParser.py
76
76
        return None
77
77
 
78
78
    def _parseValueHelper(self, node, value_map):
79
 
        if value_map.has_key(node.name):
 
79
        if node.name in value_map:
80
80
            setattr(self, value_map[node.name], node.content)
81
81
 
82
82
    def _parseHelper(self, main_node, value_map):
108
108
                        "uuid": "hw_uuid"}
109
109
        firmware_map = {"vendor": "fw_vendor",
110
110
                        "version": "fw_version",
111
 
                        "release_date": "fw_date" }
 
111
                        "release_date": "fw_date"}
112
112
        while child:
113
113
            if child.name == "hardware":
114
114
                self._parseHelper(child, hardware_map)