removed dependency on OrderedDict
implement assertRaisesRegexp on py2.6