[gedit] Use ElementTree from python 2.5

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 2444313995d60433142f376c52be629a3a72bb09
Author: Jesse van den Kieboom <jesse icecrew nl>
Date:   Sat Nov 14 18:22:23 2009 +0100

    Use ElementTree from python 2.5

 plugins/externaltools/tools/ElementTree.py | 1254 ----------------------------
 plugins/externaltools/tools/Makefile.am    |    1 -
 plugins/externaltools/tools/library.py     |    2 +-
 plugins/snippets/snippets/ElementTree.py   | 1254 ----------------------------
 plugins/snippets/snippets/Exporter.py      |    2 +-
 plugins/snippets/snippets/Helper.py        |    2 +-
 plugins/snippets/snippets/Library.py       |    2 +-
 plugins/snippets/snippets/Makefile.am      |    1 -
 8 files changed, 4 insertions(+), 2514 deletions(-)
---
diff --git a/plugins/externaltools/tools/Makefile.am b/plugins/externaltools/tools/Makefile.am
index c580814..7ca5498 100644
--- a/plugins/externaltools/tools/Makefile.am
+++ b/plugins/externaltools/tools/Makefile.am
@@ -4,7 +4,6 @@ plugindir = $(GEDIT_PLUGINS_LIBS_DIR)/externaltools
 plugin_PYTHON =		\
 	__init__.py	\
 	capture.py	\
-	ElementTree.py	\
 	library.py	\
 	functions.py	\
 	manager.py	\
diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py
index 16a2018..618200f 100644
--- a/plugins/externaltools/tools/library.py
+++ b/plugins/externaltools/tools/library.py
@@ -71,7 +71,7 @@ class ToolLibrary(Singleton):
     # created. It imports eventual tools that have been saved in the old XML
     # storage file.
     def import_old_xml_store(self):
-        import ElementTree as et
+        import xml.etree.ElementTree as et
         filename = os.path.expanduser('~/.gnome2/gedit/gedit-tools.xml')
         if not os.path.isfile(filename):
             return
diff --git a/plugins/snippets/snippets/Exporter.py b/plugins/snippets/snippets/Exporter.py
index d2c4e23..fddfff4 100644
--- a/plugins/snippets/snippets/Exporter.py
+++ b/plugins/snippets/snippets/Exporter.py
@@ -4,7 +4,7 @@ import sys
 import shutil
 
 from snippets.Library import *
-import ElementTree as et
+import xml.etree.ElementTree as et
 from Helper import *
 
 class Exporter:
diff --git a/plugins/snippets/snippets/Helper.py b/plugins/snippets/snippets/Helper.py
index 7e35e4b..de36336 100644
--- a/plugins/snippets/snippets/Helper.py
+++ b/plugins/snippets/snippets/Helper.py
@@ -17,7 +17,7 @@
 
 import string
 from xml.sax import saxutils
-from ElementTree import *
+from xml.etree.ElementTree import *
 import re
 
 import gtk
diff --git a/plugins/snippets/snippets/Library.py b/plugins/snippets/snippets/Library.py
index 6f1abac..b147625 100644
--- a/plugins/snippets/snippets/Library.py
+++ b/plugins/snippets/snippets/Library.py
@@ -23,7 +23,7 @@ import re
 
 import gtk
 
-import ElementTree as et
+import xml.etree.ElementTree as et
 from Helper import *
 
 class NamespacedId:
diff --git a/plugins/snippets/snippets/Makefile.am b/plugins/snippets/snippets/Makefile.am
index 8f218cb..7a05b56 100644
--- a/plugins/snippets/snippets/Makefile.am
+++ b/plugins/snippets/snippets/Makefile.am
@@ -6,7 +6,6 @@ plugin_PYTHON = \
 	WindowHelper.py \
 	Document.py \
 	Library.py \
-	ElementTree.py \
 	Snippet.py \
 	Parser.py \
 	Placeholder.py \