summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Barrois <raphael.barrois@polytechnique.org>2014-01-22 00:26:29 +0100
committerRaphaël Barrois <raphael.barrois@polytechnique.org>2014-01-22 00:26:29 +0100
commitf3ed0fa0c1d2d367a905952e9a6feaab58185616 (patch)
tree15e80b851a4dda98044e07738871c193b3329058
parente72d94b45312443d076d01ca833f19e8a5295847 (diff)
parentfb794bd1bcfcb84ec82e72d4f9c3b67624724fdf (diff)
downloadfactory-boy-f3ed0fa0c1d2d367a905952e9a6feaab58185616.tar
factory-boy-f3ed0fa0c1d2d367a905952e9a6feaab58185616.tar.gz
Merge branch 'maint/2.3.x'
-rw-r--r--docs/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c051916..b86d865 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -20,6 +20,8 @@ ChangeLog
*Bugfix:*
- Fix badly written assert containing state-changing code, spotted by `chsigi <https://github.com/chsigi>`_ (:issue:`126`)
+ - Don't crash when handling objects whose __repr__ is non-pure-ascii bytes on Py2,
+ discovered by `mbertheau <https://github.com/mbertheau>`_ (:issue:`123`)
.. _v2.3.0: