tree d9abc9d44d2277ad579cd24d7259a24137c9dd0f
parent 728bea60e5ff2bea36f8f9a3cafe6b96e452c211
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> 1568720156 -0700
committer GitHub <noreply@github.com> 1568720156 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJdgMUcCRBK7hj4Ov3rIwAAdHIIAH1hPnSMswrV+ZV1vQwMcmCi
 pnxCAHX55rGug308Kzh1JwW+UJWN0f49E9NZ1UrH8/jXCyOXZfsw/LejuSmuzMix
 /1Du3PEj4OENvW5ITvURudKINjELTAl4WXDPl0zeY1UeKIVt+c1rJrK7ucFawSWS
 ZRHvtxQs7GODItlhM1TpgJMHmOzcwCJtqj6aar5QcP0N6bKgK3R7iAUwVp0tEMlh
 JUmakAq9stHnDeI5PmFV21+YvEm3U4vSLcdNaWri5hpxles0Eihq21biX4+ekDIC
 c5EkgdC5+to2szXS0FgpoOz4H0zvXnjnCXr8Pvxb9Lyt06Xvr7VjcAE52hAN8LA=
 =JYiu
 -----END PGP SIGNATURE-----
 

bpo-37828: Fix default mock_name in unittest.mock.assert_called error (GH-16166)


In the format string for assert_called the evaluation order is incorrect and hence for mock's without name, 'None' is printed whereas it should be 'mock' like for other messages. The error message is ("Expected '%s' to have been called." % self._mock_name or 'mock').
(cherry picked from commit 5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa)

Co-authored-by: Abraham Toriz Cruz <awonderfulcode@gmail.com>