From e853cc6f255891898dc0c91ddaf757b1e9be29ee Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Mon, 22 Dec 2008 11:08:23 -0500
Subject: [PATCH] Make UCSC build update scripts find elementtree properly

---
 cron/parse_builds.py         | 8 ++++++--
 cron/parse_builds_3_sites.py | 8 ++++++--
 cron/updateucsc.sh.sample    | 4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cron/parse_builds.py b/cron/parse_builds.py
index 4afd94d8167..19c1206164e 100644
--- a/cron/parse_builds.py
+++ b/cron/parse_builds.py
@@ -8,8 +8,12 @@ build   description
 
 import sys
 import urllib
-import pkg_resources; pkg_resources.require( "elementtree" )
-from elementtree import ElementTree
+if sys.version_info[:2] >= ( 2, 5 ):
+    import xml.etree.ElementTree as ElementTree
+else:
+    from galaxy import eggs
+    import pkg_resources; pkg_resources.require( "elementtree" )
+    from elementtree import ElementTree
 
 URL = "http://genome-test.cse.ucsc.edu/cgi-bin/das/dsn"
 
diff --git a/cron/parse_builds_3_sites.py b/cron/parse_builds_3_sites.py
index fba60015420..a7bef94667d 100644
--- a/cron/parse_builds_3_sites.py
+++ b/cron/parse_builds_3_sites.py
@@ -5,8 +5,12 @@ Connects to sites and determines which builds are available at each.
 
 import sys
 import urllib
-import pkg_resources; pkg_resources.require( "elementtree" )
-from elementtree import ElementTree
+if sys.version_info[:2] >= ( 2, 5 ):
+    import xml.etree.ElementTree as ElementTree
+else:
+    from galaxy import eggs
+    import pkg_resources; pkg_resources.require( "elementtree" )
+    from elementtree import ElementTree
 
 sites = ['http://genome.ucsc.edu/cgi-bin/',
         'http://archaea.ucsc.edu/cgi-bin/',
diff --git a/cron/updateucsc.sh.sample b/cron/updateucsc.sh.sample
index ff4350bbf43..31630248517 100644
--- a/cron/updateucsc.sh.sample
+++ b/cron/updateucsc.sh.sample
@@ -6,7 +6,7 @@
 
 # Edit this line to refer to galaxy's path:
 GALAXY=/galaxy/path
-export PYTHONPATH=${GALAXY}/modules:${GALAXY}/eggs:${GALAXY}/lib
+export PYTHONPATH=${GALAXY}/lib
 
 # setup directories
 mkdir ${GALAXY}/tool-data/shared/ucsc/new
@@ -57,4 +57,4 @@ then
     echo "Manual addition was successful."
 else
     echo "Manual addition failed" >&2
-fi
\ No newline at end of file
+fi