summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2009-12-29 02:00:17 +0100
committerSebastian Pipping <sebastian@pipping.org>2009-12-29 02:00:17 +0100
commita4499de57c1a71e29beda6320dfeb79286668799 (patch)
tree9de66b193c7fba3b27ce3296382f131f62edfd7a
parente0e15fa5177023b9d82569d9de0e8561bf83f128 (diff)
downloadlayman-a4499de57c1a71e29beda6320dfeb79286668799.tar.gz
layman-a4499de57c1a71e29beda6320dfeb79286668799.tar.bz2
layman-a4499de57c1a71e29beda6320dfeb79286668799.zip
Migrate ElementTree imports to Python >=2.5
-rw-r--r--layman/overlay.py2
-rw-r--r--layman/overlays/overlay.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/layman/overlay.py b/layman/overlay.py
index 6874d98..820c38a 100644
--- a/layman/overlay.py
+++ b/layman/overlay.py
@@ -29,7 +29,7 @@ __version__ = "$Id: overlay.py 273 2006-12-30 15:54:50Z wrobel $"
#-------------------------------------------------------------------------------
import sys, codecs, os, os.path
-import elementtree.ElementTree as ET
+import xml.etree.ElementTree as ET # Python 2.5
from layman.overlays.bzr import BzrOverlay
from layman.overlays.darcs import DarcsOverlay
diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index 58d25bf..6f52df3 100644
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -29,7 +29,7 @@ __version__ = "$Id: overlay.py 273 2006-12-30 15:54:50Z wrobel $"
#-------------------------------------------------------------------------------
import sys, types, re, os, os.path, shutil, subprocess
-import elementtree.ElementTree as ET
+import xml.etree.ElementTree as ET # Python 2.5
from layman.utils import path, ensure_unicode