diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py index dec9aa2bf21..5fcc8d27647 100644 --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -251,7 +251,7 @@ Your selection [default 1]: ''', body = StringIO.StringIO() for key, value in data.items(): # handle multiple entries for the same name - if type(value) != type([]): + if type(value) not in (type([]), type( () )): value = [value] for value in value: value = unicode(value).encode("utf-8") diff --git a/Misc/NEWS b/Misc/NEWS index daa0add9004..485c5f029b3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -65,6 +65,9 @@ Library - Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. +- Bug #1545341: The 'classifier' keyword argument to the Distutils setup() + function now accepts tuples as well as lists. + - Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions.