Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30225/src/util
Modified Files:
__init__.py fileops.py mediainfo.py
Log Message:
replace read_pickle and save_pickle with util.cache functions
Index: mediainfo.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** mediainfo.py 8 Jan 2005 12:53:26 -0000 1.65
--- mediainfo.py 8 Jan 2005 15:09:27 -0000 1.66
***************
*** 130,134 ****
if os.path.isfile(cachefile):
self.current_objects = cache.load(cachefile)
! # maybe the cache file is broken and read_pickle returns None
if not self.current_objects:
self.current_objects = {}
--- 130,134 ----
if os.path.isfile(cachefile):
self.current_objects = cache.load(cachefile)
! # maybe the cache file is broken and cache returns None
if not self.current_objects:
self.current_objects = {}
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** __init__.py 13 Nov 2004 15:56:11 -0000 1.24
--- __init__.py 8 Jan 2005 15:09:27 -0000 1.25
***************
*** 39,40 ****
--- 39,41 ----
import objectcache
import fxdparser
+ import cache
Index: fileops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** fileops.py 30 Nov 2004 14:36:54 -0000 1.32
--- fileops.py 8 Jan 2005 15:09:27 -0000 1.33
***************
*** 8,14 ****
# includes basic functions for removable media handling
#
- # TODO: remove read_pickle and save_pickle, this functions are now in
- # cache.py.
- #
#
-----------------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 8,11 ----
***************
*** 387,400 ****
return media
return None
-
-
-
- # FIXME: remove this!!!
-
- import cache
-
- def read_pickle(file):
- return cache.load(file)
-
- def save_pickle(data, file):
- return cache.save(file, data)
--- 384,385 ----
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
