Validate options for compose_service_type

2006-06-15 17:40:33 -04:00
parent e1070a21cb
commit 31e9671190
5 changed files with 10 additions and 25 deletions
@@ -42,6 +42,10 @@ def _txt_to_dict(txt):
 	return prop_dict

 def compose_service_type(stype, activity_uid):
+	if not activity_uid:
+		return stype
+	if not stype or (type(stype) != type("") and type(stype) != type(u"")):
+		raise ValueError("stype must be a valid string.")
 	return "_%s_%s" % (activity_uid, stype)

 def _decompose_service_type(stype):