Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar

This commit is contained in:
Marco Pesenti Gritti 2006-06-16 15:43:03 -04:00
commit c7075255f8
2 changed files with 0 additions and 5 deletions

View File

@ -455,13 +455,9 @@ class PresenceService(gobject.GObject):
def share_activity(self, activity, stype, properties={}, address=None, port=None):
"""Convenience function to share an activity with other buddies."""
print "type stype == %s" % type(stype)
print "Type of a string is %s" % type("")
uid = activity.get_id()
owner_nick = self._owner.get_nick_name()
real_stype = Service.compose_service_type(stype, uid)
print "PS: type of real_stype is %s" % type(real_stype)
if address and type(address) != type(""):
raise ValueError("address must be a valid string.")
if not address:

View File

@ -70,7 +70,6 @@ class Service(object):
if not name or type(name) != type("") or not len(name):
raise ValueError("must specify a valid service name.")
print "Service:: type of full_stype is %s" % type(full_stype)
if full_stype and type(full_stype) == type(u""):
raise ValueError("service type must not be in unicode.")
if not full_stype or type(full_stype) != type("") or not len(full_stype):