summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2009-12-29 13:33:52 +0100
committerSebastian Pipping <sebastian@pipping.org>2009-12-29 13:33:52 +0100
commit3ef674c91931a22a51bcdeb840897147c35e1db5 (patch)
tree2073c5f271196847118bd6c2dad4351dff3c4da1
parentba638979c483a371e5be70ba4d5fc641089c45ad (diff)
downloadlayman-3ef674c91931a22a51bcdeb840897147c35e1db5.tar.gz
layman-3ef674c91931a22a51bcdeb840897147c35e1db5.tar.bz2
layman-3ef674c91931a22a51bcdeb840897147c35e1db5.zip
Migrate ElementTree imports to Python >=2.5
-rw-r--r--layman/overlays/overlay.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index 6f52df3..aef4fe9 100644
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -49,7 +49,7 @@ class Overlay:
def __init__(self, xml, ignore = 0, quiet = False):
'''
>>> here = os.path.dirname(os.path.realpath(__file__))
- >>> import elementtree.ElementTree as ET
+ >>> import xml.etree.ElementTree as ET # Python 2.5
>>> document = ET.parse(here + '/../tests/testfiles/global-overlays.xml')
>>> overlays = document.findall('overlay') + document.findall('repo')
>>> a = Overlay(overlays[0])
@@ -228,7 +228,7 @@ class Overlay:
def __str__(self):
'''
>>> here = os.path.dirname(os.path.realpath(__file__))
- >>> import elementtree.ElementTree as ET
+ >>> import xml.etree.ElementTree as ET # Python 2.5
>>> document = ET.parse(here + '/../tests/testfiles/global-overlays.xml')
>>> overlays = document.findall('overlay') + document.findall('repo')
>>> a = Overlay(overlays[0])
@@ -276,7 +276,7 @@ class Overlay:
def short_list(self, width = 0):
'''
>>> here = os.path.dirname(os.path.realpath(__file__))
- >>> import elementtree.ElementTree as ET
+ >>> import xml.etree.ElementTree as ET # Python 2.5
>>> document = ET.parse(here + '/../tests/testfiles/global-overlays.xml')
>>> overlays = document.findall('repo') + document.findall('overlay')
>>> a = Overlay(overlays[0])