Author: duncan Date: Tue Sep 25 15:30:44 2007 New Revision: 9904 Log: Corrected element tree imports for Python-2.5
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:30:44 2007 @@ -53,7 +53,13 @@ from xml.dom.ext.reader import Sax2 import urllib, urllib2 -import cElementTree as ET +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 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:30:44 2007 @@ -4,9 +4,13 @@ # wget 'http://ff.1click.weather.com/weather/local/SZXX0033?dayf=5&unit=m' # wget 'http://ff.1click.weather.com/weather/local/SZXX0033?cc=*&unit=m' -import cElementTree as ET -import cPickle, pickle -from pprint import pprint +if sys.hexversion >= 0x2050000: + import xml.etree.cElementTree as ET +else: + try: + import cElementTree as ET + except ImportError: + import elementtree.ElementTree as ET class WeatherData: @@ -434,12 +438,6 @@ print dir(forecast) for i in dir(forecast): item = eval('forecast.%s' % (i)) - #print i, type(item), item - #pprint(forecast) - f = open('forecast.pickle', 'w') - #pickle.dump(forecast, f, pickle.HIGHEST_PROTOCOL) - #pickle.dump(forecast_tree, f, pickle.HIGHEST_PROTOCOL) - f.close() print dir(forecast.loc) print forecast.loc.id ------------------------------------------------------------------------- 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
