From: Senthil Kumaran Date: Sat, 16 Jan 2016 05:46:08 +0000 (-0800) Subject: Merge from 3.5 X-Git-Tag: v3.6.0a1~769 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b3a82ff556ad3ec2c0d77c6daacddcac9d1bc7b;p=thirdparty%2FPython%2Fcpython.git Merge from 3.5 Issue26035 - Correct the argument names used in the docs of the traceback module. Make it consistent with module args. Patch contributed by Upendra Kumar. --- 7b3a82ff556ad3ec2c0d77c6daacddcac9d1bc7b