Author: duncan
Date: Tue Mar 27 19:49:19 2007
New Revision: 9400
Modified:
branches/rel-1/freevo/src/item.py
branches/rel-1/freevo/src/plugins/mediamenu.py
branches/rel-1/freevo/src/video/videoitem.py
Log:
Changed __str_ and __repr__ functions
Modified: branches/rel-1/freevo/src/item.py
==============================================================================
--- branches/rel-1/freevo/src/item.py (original)
+++ branches/rel-1/freevo/src/item.py Tue Mar 27 19:49:19 2007
@@ -32,6 +32,7 @@
import os
import gettext
import shutil
+from pprint import pformat
import config
from event import *
@@ -53,24 +54,15 @@
def __str__(self):
- s = '\nitem:FileInformation:s:'
- s += ' files=%r' % self.files
- s += ' fxd_file=%r' % self.fxd_file
- s += ' edl_file=%r' % self.edl_file
- s += ' image=%r' % self.image
- s += ' read_only=%r' % self.read_only
- s += ' dir(self)=%r' % dir(self)
+ s = pformat(self, depth=2)
return s
def __repr__(self):
- s = '\nitem:FileInformation:r:'
- s += ' files=%r' % self.files
- s += ' fxd_file=%r' % self.fxd_file
- s += ' edl_file=%r' % self.edl_file
- s += ' image=%r' % self.image
- s += ' read_only=%r' % self.read_only
- #s += ' dir(self)=%r' % dir(self)
+ if hasattr(self, 'name'):
+ s = '%s: %r' % (self.name, self.__class__)
+ else:
+ s = '%r' % (self.__class__)
return s
@@ -202,22 +194,15 @@
def __str__(self):
- s = '\nitem:Item:s:'
- s += ' name=%r' % self.name
- s += ' info=%r' % self.info
- if hasattr(self, 'image'): s += ' image=%r' % self.image
- if hasattr(self, 'arg'): s += ' arg=%r' % (self.arg,)
- else: s += ' self.__dict__=%r' % self.__dict__
+ s = pformat(self, depth=2)
return s
def __repr__(self):
- s = '\nitem:Item:r:'
- s += ' name=%r' % self.name
- s += ' info=%r' % self.info
- if hasattr(self, 'image'): s += ' image=%r' % self.image
- if hasattr(self, 'arg'): s += ' arg=%r' % (self.arg,)
- #else: s += ' self.__dict__=%r' % self.__dict__
+ if hasattr(self, 'name'):
+ s = '%s: %r' % (self.name, self.__class__)
+ else:
+ s = '%r' % (self.__class__)
return s
Modified: branches/rel-1/freevo/src/plugins/mediamenu.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/mediamenu.py (original)
+++ branches/rel-1/freevo/src/plugins/mediamenu.py Tue Mar 27 19:49:19 2007
@@ -32,6 +32,7 @@
import os
import traceback
import copy
+from pprint import pformat
import config
import menu
@@ -75,13 +76,18 @@
self.type = 'mediamenu'
def __str__(self):
- s = '\nplugins:mediamenu:MediaMenu:s'
+ s = pformat(self, depth=2)
return s
+
def __repr__(self):
- s = '\nplugins:mediamenu:MediaMenu:r'
+ if hasattr(self, 'name'):
+ s = '%s: %r' % (self.name, self.__class__)
+ else:
+ s = '%r' % (self.__class__)
return s
+
def main_menu_generate(self):
"""
generate the items for the main menu. This is needed when first
generating
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Tue Mar 27 19:49:19 2007
@@ -35,6 +35,7 @@
import md5
import time
import copy
+from pprint import pformat
import config
import util
@@ -125,18 +126,15 @@
def __str__(self):
- s = '\nvideo:videoitem:VideoItem:Info:s:'
- s += ' name=%r' % self.name
- s += ' filename=%r' % self.filename
- s += ' dir(self)=%r' % dir(self)
+ s = pformat(self, depth=2)
return s
def __repr__(self):
- s = '\nvideo:videoitem:VideoItem:Info:r:'
- s += ' name=%r' % self.name
- s += ' filename=%r' % self.filename
- #s += ' dir(self)=%r' % dir(self)
+ if hasattr(self, 'name'):
+ s = '%s: %r' % (self.name, self.__class__)
+ else:
+ s = '%r' % (self.__class__)
return s
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
