Author: duncan
Date: Tue Sep 25 15:34:10 2007
New Revision: 9905
Log:
Moved all of element tree to weatherdata.py
Modified:
branches/rel-1/freevo/src/plugins/oneclick.py
branches/rel-1/freevo/src/plugins/weatherdata.py
Modified: branches/rel-1/freevo/src/plugins/oneclick.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/oneclick.py (original)
+++ branches/rel-1/freevo/src/plugins/oneclick.py Tue Sep 25 15:34:10 2007
@@ -53,14 +53,6 @@
from xml.dom.ext.reader import Sax2
import urllib, urllib2
-if sys.hexversion >= 0x2050000:
- import xml.etree.cElementTree as ET
-else:
- try:
- import cElementTree as ET
- except ImportError:
- import elementtree.ElementTree as ET
-
#freevo modules
import config, menu, rc, plugin, skin, osd, util
from gui.PopupBox import PopupBox
@@ -650,9 +642,9 @@
#print self.elocationData
#print self.currentData
#print self.forecastData
- elocation = WeatherData(ET.XML(self.elocationData))
- current = WeatherData(ET.XML(self.currentData))
- forecast = WeatherData(ET.XML(self.forecastData))
+ elocation = WeatherData(self.elocationData)
+ current = WeatherData(self.currentData)
+ forecast = WeatherData(self.forecastData)
if not self.name:
self.name = elocation.loc.dnam
Modified: branches/rel-1/freevo/src/plugins/weatherdata.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/weatherdata.py (original)
+++ branches/rel-1/freevo/src/plugins/weatherdata.py Tue Sep 25 15:34:10 2007
@@ -16,8 +16,9 @@
class WeatherData:
"""Main weather data class
"""
- def __init__(self, tree):
- self.tree = tree
+ def __init__(self, xml):
+ self.xml = xml
+ self.tree = ET.XML(xml)
self.head = None
self.loc = None
self.eloc = None
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
