Enforce Property name and source as unicode or ascii string

master/buildbot/process/properties.py

@@ -100,8 +100,7 @@ def asList(self):
     def asDict(self):
         """Return the properties as a simple key:value dictionary,
         properly unicoded"""
-        return dict((util.ascii2unicode(k), (v, util.ascii2unicode(s)))
-                    for k, (v, s) in self.properties.iteritems())
+        return dict((k, (v, s)) for k, (v, s) in self.properties.iteritems())
 
     def __repr__(self):
         return ('Properties(**' +
@@ -136,13 +135,15 @@ def hasProperty(self, name):
     has_key = hasProperty
 
     def setProperty(self, name, value, source, runtime=False):
+        name = util.ascii2unicode(name)
         try:
             json.dumps(value)
         except TypeError:
             warnings.warn(
                 "Non jsonable properties are not explicitly supported and" +
                 "will be explicitly disallowed in a future version.",
                 DeprecationWarning, stacklevel=2)
+        source = util.ascii2unicode(source)
 
         self.properties[name] = (value, source)
         if runtime:

master/docs/relnotes/index.rst

@@ -257,6 +257,8 @@ Changes and Removals
 
 * The undocumented ``path`` parameter of the :bb:step:`MasterShellCommand` buildstep has been renamed ``workdir`` for better consistency with the other steps.
 
+* The name and source of a Property have to be unicode or ascii string.
+
 Changes for Developers
 ~~~~~~~~~~~~~~~~~~~~~~