Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27335/src/util
Modified Files:
__init__.py fileops.py
Log Message:
do not take care of install.py
Index: fileops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** fileops.py 13 Jun 2004 18:47:46 -0000 1.20
--- fileops.py 13 Jun 2004 18:49:39 -0000 1.21
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.21 2004/06/13 18:49:39 dischi
+ # do not take care of install.py
+ #
# Revision 1.20 2004/06/13 18:47:46 dischi
# expect errors when loading image
***************
*** 56,65 ****
import traceback
!
! if sys.argv[0].find('setup.py') == -1 and sys.argv[0].find('install.py') == -1:
! # don't try to import these when Freevo isn't installed (yet)
! import Image
! import cStringIO
! from mmpython.image import EXIF as exif
--- 59,66 ----
import traceback
! # image stuff
! import Image
! import cStringIO
! from mmpython.image import EXIF as exif
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** __init__.py 13 Mar 2004 22:30:02 -0000 1.16
--- __init__.py 13 Jun 2004 18:49:39 -0000 1.17
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.17 2004/06/13 18:49:39 dischi
+ # do not take care of install.py
+ #
# Revision 1.16 2004/03/13 22:30:02 dischi
# better string transformation
***************
*** 23,47 ****
# fix unicode problem for utf-8
#
- # Revision 1.12 2004/02/23 19:39:59 dischi
- # fix vfs problem in mediainfo
- #
- # Revision 1.11 2004/02/23 19:27:07 dischi
- # fix mmpython init
- #
- # Revision 1.10 2004/02/07 11:53:33 dischi
- # use "ignore" to make unicode->string possible
- #
- # Revision 1.9 2004/02/05 19:26:42 dischi
- # fix unicode handling
- #
- # Revision 1.8 2004/01/02 11:19:40 dischi
- # import popen3
- #
- # Revision 1.7 2003/11/29 11:27:41 dischi
- # move objectcache to util
- #
- # Revision 1.6 2003/11/23 16:57:36 dischi
- # move xml help stuff to new fxdparser
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 26,29 ----
***************
*** 71,75 ****
# with util in only one file
! if sys.argv[0].find('setup.py') == -1 and sys.argv[0].find('install.py') == -1:
import config
import __builtin__
--- 53,57 ----
# with util in only one file
! if sys.argv[0].find('setup.py') == -1:
import config
import __builtin__
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
>From Windows to Linux, servers to mobile, InstallShield X is the
one installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
