Author: duncan
Date: Thu Oct 18 09:29:34 2007
New Revision: 9997
Log:
Changed importing of cPickle to import as pickle
Fixed some of the cPickle calls
Modified:
branches/rel-1/freevo/src/config.py
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/rssperiodic.py
branches/rel-1/freevo/src/util/fileops.py
Modified: branches/rel-1/freevo/src/config.py
==============================================================================
--- branches/rel-1/freevo/src/config.py (original)
+++ branches/rel-1/freevo/src/config.py Thu Oct 18 09:29:34 2007
@@ -834,7 +834,10 @@
Auto detect a list of possible channels in the xmltv file
"""
import codecs
- import cPickle, pickle
+ try:
+ import cPickle as pickle
+ except ImportError:
+ import pickle
file = XMLTV_FILE
path = FREEVO_CACHEDIR
@@ -856,10 +859,7 @@
os.path.getmtime(file)):
try:
f = open(pname, 'r')
- try:
- data = cPickle.load(f)
- except:
- data = pickle.load(f)
+ data = pickle.load(f)
f.close()
return data
except:
@@ -907,7 +907,7 @@
if os.path.isfile(pname):
os.unlink(pname)
f = open(pname, 'w')
- cPickle.dump(chanlist, f, 1)
+ pickle.dump(chanlist, f, 1)
f.close()
except IOError:
print 'Error: unable to save to cachefile %s' % pname
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Thu Oct 18 09:29:34 2007
@@ -27,7 +27,10 @@
import sys, string, random, time, os, re, pwd, stat, threading, md5, datetime,
copy
-import cPickle, pickle
+try:
+ import cPickle as pickle
+except ImportError:
+ import pickle
import logging
import __builtin__
import config
@@ -329,13 +332,10 @@
cacheFile = config.FREEVO_CACHEDIR + "/previouslyRecorded.pickle"
try:
- self.previouslyRecordedShows = cPickle.load(open(cacheFile, "r"))
- except:
- try:
- self.previouslyRecordedShows = pickle.load(open(cacheFile,
"r"))
- except IOError:
- self.previouslyRecordedShows = {}
- pass
+ self.previouslyRecordedShows = pickle.load(open(cacheFile, "r"))
+ except IOError:
+ self.previouslyRecordedShows = {}
+ pass
def savePreviouslyRecordedShows(self):
''' Save the set of recorded shows '''
@@ -343,10 +343,7 @@
return
cacheFile=config.FREEVO_CACHEDIR+"/previouslyRecorded.pickle"
- try:
- cPickle.dump(self.previouslyRecordedShows, open(cacheFile, "w"))
- except:
- pickle.dump(self.previouslyRecordedShows, open(cacheFile, "w"))
+ pickle.dump(self.previouslyRecordedShows, open(cacheFile, "w"))
def newEpisode(self, prog=None):
''' Return true if this is a new episode of 'prog' '''
Modified: branches/rel-1/freevo/src/rssperiodic.py
==============================================================================
--- branches/rel-1/freevo/src/rssperiodic.py (original)
+++ branches/rel-1/freevo/src/rssperiodic.py Thu Oct 18 09:29:34 2007
@@ -30,7 +30,10 @@
import re,os,sys,glob,urllib,datetime,time,shutil
from subprocess import Popen
-import cPickle, pickle
+try:
+ import cPickle as pickle
+except ImportError:
+ import pickle
import config
import rssfeed
import kaa.metadata as metadata
@@ -123,10 +126,7 @@
def checkForDup(string):
cacheFile=config.FREEVO_CACHEDIR+"/rss.pickle"
try:
- try:
- downloadedUrls=cPickle.load(open(cacheFile,"r"))
- except:
- downloadedUrls=pickle.load(open(cacheFile,"r"))
+ downloadedUrls=pickle.load(open(cacheFile,"r"))
except IOError:
return False
except EOFError:
@@ -141,34 +141,22 @@
cacheFile=config.FREEVO_CACHEDIR+"/rss.pickle"
downloadedUrls=[]
try:
- try:
- downloadedUrls = cPickle.load(open(cacheFile,"r"))
- except:
- downloadedUrls = pickle.load(open(cacheFile,"r"))
+ downloadedUrls = pickle.load(open(cacheFile,"r"))
except IOError:
pass
downloadedUrls.append(string)
- try:
- cPickle.dump(downloadedUrls, open(cacheFile,"w"))
- except:
- pickle.dump(downloadedUrls, open(cacheFile,"w"))
+ pickle.dump(downloadedUrls, open(cacheFile,"w"))
def addFileToExpiration(string,goodUntil):
''' the new file gets added with the expiration date to the expiration
file '''
cacheFile=config.FREEVO_CACHEDIR+"/rss.expiration"
downloadedFiles=[]
try:
- try:
- downloadedFiles = cPickle.load(open(cacheFile,"r"))
- except:
- downloadedFiles = pickle.load(open(cacheFile,"r"))
+ downloadedFiles = pickle.load(open(cacheFile,"r"))
except IOError:
pass
downloadedFiles.append(string + ";" + goodUntil.__str__())
- try:
- cPickle.dump(downloadedFiles, open(cacheFile,"w"))
- except:
- pickle.dump(downloadedFiles, open(cacheFile,"w"))
+ pickle.dump(downloadedFiles, open(cacheFile,"w"))
def checkForExpiration():
''' checking for expired files by reading the rss.expiration file the file
@@ -176,10 +164,7 @@
deleted at the end the file gets removed from the rss.expiration file '''
cacheFile=config.FREEVO_CACHEDIR+"/rss.expiration"
try:
- try:
- downloadedFiles=cPickle.load(open(cacheFile,"r"))
- except:
- downloadedFiles=pickle.load(open(cacheFile,"r"))
+ downloadedFiles=pickle.load(open(cacheFile,"r"))
except IOError:
return
deletedItems = []
@@ -203,14 +188,11 @@
except OSError:
_debug_("removing the file %s failed" % (filename))
for line in deletedItems:
-# try:
+ #try:
downloadedFiles.remove(line)
-# except ValueError:
-# _debug_("removing the line %s failed" % (line))
- try:
- cPickle.dump(downloadedFiles, open(cacheFile,"w"))
- except:
- pickle.dump(downloadedFiles, open(cacheFile,"w"))
+ #except ValueError:
+ # _debug_("removing the line %s failed" % (line))
+ pickle.dump(downloadedFiles, open(cacheFile,"w"))
def createFxd(item, filename):
ofile = os.path.splitext(filename)[0]+'.fxd'
Modified: branches/rel-1/freevo/src/util/fileops.py
==============================================================================
--- branches/rel-1/freevo/src/util/fileops.py (original)
+++ branches/rel-1/freevo/src/util/fileops.py Thu Oct 18 09:29:34 2007
@@ -35,7 +35,10 @@
import statvfs
import string
import copy
-import cPickle, pickle
+try:
+ import cPickle as pickle
+except ImportError:
+ import pickle
import fnmatch
import traceback
@@ -447,10 +450,7 @@
"""
try:
f = vfs.open(file, 'r')
- try:
- data = cPickle.load(f)
- except:
- data = pickle.load(f)
+ data = pickle.load(f)
f.close()
return data
except:
@@ -465,7 +465,7 @@
if vfs.isfile(file):
vfs.unlink(file)
f = vfs.open(file, 'w')
- cPickle.dump(data, f, PICKLE_PROTOCOL)
+ pickle.dump(data, f, PICKLE_PROTOCOL)
f.close()
except IOError:
print 'unable to save to cachefile %s' % file
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
