The sort order of dictionaries in Python is undocumented.  Use
tuples instead, which are documented to be lexically ordered.
Signed-off-by: NBen Hutchings <ben@decadent.org.uk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>