- Revision
- 11237
- Author
- john
- Date
- 2006-07-22 10:15:03 -0700 (Sat, 22 Jul 2006)
Log Message
Remove more displayNames and a lingering print
Modified Paths
- trunk/chandler/application/Utility.py
- trunk/chandler/parcels/osaf/pim/calendar/Calendar.py
- trunk/chandler/parcels/osaf/pim/mail.py
- trunk/chandler/parcels/osaf/pim/tests/TestCollections.py
- trunk/chandler/parcels/osaf/servlets/xmlrpc.py
- trunk/chandler/parcels/osaf/sharing/Sharing.py
- trunk/chandler/parcels/osaf/sharing/tests/TestModifiableAttributes.py
- trunk/chandler/parcels/osaf/views/repositoryviewer/Repository.py
- trunk/chandler/parcels/osaf/webserver.py
- trunk/chandler/parcels/photos/Photos.py
- trunk/chandler/projects/Chandler-FeedsPlugin/feeds/tests/TestFeedIndexing.py
- trunk/chandler/samples/skeleton/__init__.py
Diff
Modified: trunk/chandler/application/Utility.py (11236 => 11237)
--- trunk/chandler/application/Utility.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/application/Utility.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -33,7 +33,7 @@ # with your name (and some helpful text). The comment's really there just to # cause Subversion to warn you of a conflict when you update, in case someone # else changes it at the same time you do (that's why it's on the same line). -SCHEMA_VERSION = "224" #john: remove more displayNames +SCHEMA_VERSION = "225" #john: remove more displayNames logger = None # initialized in initLogging()
Modified: trunk/chandler/parcels/osaf/pim/calendar/Calendar.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/pim/calendar/Calendar.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/pim/calendar/Calendar.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -458,7 +458,7 @@ # Redirections - whoFrom = schema.One(redirectTo="organizer", displayName=_(u'Who')) + whoFrom = schema.One(redirectTo="organizer") about = schema.One(redirectTo="displayName") date = schema.One(redirectTo="startTime")
Modified: trunk/chandler/parcels/osaf/pim/mail.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/pim/mail.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/pim/mail.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -554,7 +554,7 @@ spamScore = schema.One(schema.Float, initialValue = 0.0) rfc2822Message = schema.One(schema.Lob, indexed=False) dateSentString = schema.One(schema.Text, initialValue = '') - dateSent = schema.One(schema.DateTimeTZ, displayName=_(u"Sent"), indexed=True) + dateSent = schema.One(schema.DateTimeTZ, indexed=True) messageId = schema.One(schema.Text, initialValue = '') toAddress = schema.Sequence( 'EmailAddress', @@ -577,7 +577,7 @@ ccAddress = schema.Sequence( 'EmailAddress', initialValue = [], inverse = 'messagesCc', ) - subject = schema.One(schema.Text, displayName=_(u"Subject"), indexed=True) + subject = schema.One(schema.Text, indexed=True) headers = schema.Mapping( schema.Text, doc = 'Catch-all for headers', initialValue = {}, )
Modified: trunk/chandler/parcels/osaf/pim/tests/TestCollections.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/pim/tests/TestCollections.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/pim/tests/TestCollections.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -51,19 +51,19 @@ A dirt simple item -- think content item here, if you like """ - label = schema.One(schema.Text, displayName=uw("My Label")) + label = schema.One(schema.Text) collections = schema.Sequence(otherName='inclusions') appearsIn = schema.Sequence(otherName='set') class ChildSimpleItem(SimpleItem): - childData = schema.One(schema.Text, displayName=uw("Child data")) + childData = schema.One(schema.Text) class OtherSimpleItem(schema.Item): """ Another dirt simple item -- think content item here, if you like """ - label = schema.One(schema.Text, displayName=uw("My Label")) + label = schema.One(schema.Text) collections = schema.Sequence(otherName='inclusions') appearsIn = schema.Sequence(otherName='set')
Modified: trunk/chandler/parcels/osaf/servlets/xmlrpc.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/servlets/xmlrpc.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/servlets/xmlrpc.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -81,7 +81,7 @@ def xmlrpc_note(self, title, body, viewName=None): view = getServletView(self.repositoryView.repository, viewName) view.refresh() - note = pim.Note(itsView=view, displayName=title) + note = pim.Note(itsView=view) note.body = note.getAttributeAspect('body', 'type').makeValue(body, indexed=True) view.commit()
Modified: trunk/chandler/parcels/osaf/sharing/Sharing.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/sharing/Sharing.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/sharing/Sharing.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -2362,7 +2362,7 @@ "mappings.\n", ) username = schema.One( - schema.Text, displayName = messages.USERNAME, initialValue = u'', + schema.Text, initialValue = u'', ) password = schema.One( schema.Text,
Modified: trunk/chandler/parcels/osaf/sharing/tests/TestModifiableAttributes.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/sharing/tests/TestModifiableAttributes.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/sharing/tests/TestModifiableAttributes.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -30,13 +30,13 @@ # We need a currentContact set for isAttributeModifiable to work; # normally this is set by the app - me = pim.Contact(itsView=view, displayName=u'me', - references=[schema.ns('osaf.pim', view).currentContact] + me = pim.Contact(itsView=view, + references=[schema.ns('osaf.pim', view).currentContact] ) # Add the subject to a read-only share: - share_ro = sharing.Share(itsView=view, displayName=uw("share_ro")) + share_ro = sharing.Share(itsView=view) share_ro.mode = 'get' e1.sharedIn.append(share_ro)
Modified: trunk/chandler/parcels/osaf/views/repositoryviewer/Repository.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/views/repositoryviewer/Repository.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/views/repositoryviewer/Repository.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -67,7 +67,6 @@ class RepositoryItemDetail(ControlBlocks.ItemDetail): def getHTMLText(self, item): - print self.widget.GetMinWidth(), self.widget.GetMinHeight() def formatReference(reference): """ Formats the a reference attribute to be clickable, etcetera
Modified: trunk/chandler/parcels/osaf/webserver.py (11236 => 11237)
--- trunk/chandler/parcels/osaf/webserver.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/osaf/webserver.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -140,7 +140,7 @@ server. """ - location = schema.One(schema.Text, displayName=_(u"Location")) + location = schema.One(schema.Text) server = schema.One( Server, @@ -281,9 +281,9 @@ server attribute to a web server item. """ - location = schema.One(schema.Text, displayName=_(u"Location")) + location = schema.One(schema.Text) - path = schema.One(schema.Text, displayName=_(u"Path")) + path = schema.One(schema.Text,) module = schema.One(schema.Text, doc = "In order to find the filesystem directory to associate with "
Modified: trunk/chandler/parcels/photos/Photos.py (11236 => 11237)
--- trunk/chandler/parcels/photos/Photos.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/parcels/photos/Photos.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -32,7 +32,7 @@ class PhotoMixin(pim.ContentItem): schema.kindInfo(displayAttribute="displayName") - dateTaken = schema.One(schema.DateTime, displayName=_(u"taken")) + dateTaken = schema.One(schema.DateTime) file = schema.One(schema.Text) exif = schema.Mapping(schema.Text, initialValue={}) photoBody = schema.One(schema.Lob)
Modified: trunk/chandler/projects/Chandler-FeedsPlugin/feeds/tests/TestFeedIndexing.py (11236 => 11237)
--- trunk/chandler/projects/Chandler-FeedsPlugin/feeds/tests/TestFeedIndexing.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/projects/Chandler-FeedsPlugin/feeds/tests/TestFeedIndexing.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -58,7 +58,7 @@ # duplicate, then pass the 'multiple=True' arg to indexLookup. url = "" - item = feeds.FeedItem(itsView=view, displayName="Duplicate", link=url) + item = feeds.FeedItem(itsView=view, link=url) channel.add(item) items = indexes.valueLookup(channel, 'link', 'link', url, multiple=True)
Modified: trunk/chandler/samples/skeleton/__init__.py (11236 => 11237)
--- trunk/chandler/samples/skeleton/__init__.py 2006-07-22 14:49:38 UTC (rev 11236) +++ trunk/chandler/samples/skeleton/__init__.py 2006-07-22 17:15:03 UTC (rev 11237) @@ -19,12 +19,12 @@ class MyKind1(pim.ContentItem): """An example content kind""" - attr1 = schema.One(schema.Text, displayName=u"Attribute 1") + attr1 = schema.One(schema.Text) # redirection attributes who = schema.Descriptor(redirectTo="attr1") - attr2 = schema.One(schema.Text, displayName=u"Attribute 2") + attr2 = schema.One(schema.Text) # Typical clouds include a "copying" cloud, and a "sharing" cloud
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
