Fix another repr unicode problem

quiqueporta · Sep 29, 2018 · 90b9323 · 90b9323
1 parent f04c980
commit 90b9323
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.2.6 (2018-09-29)
+------------------
+
+- Another fix repr with unicode chars
+
 0.2.5 (2018-09-29)
 ------------------
 

diff --git a/README.rst b/README.rst
@@ -145,7 +145,7 @@ Test
     > PYTHONPATH=$PYTHONPATH:. mamba
 
 
-.. |Version Number| image:: https://img.shields.io/badge/version-0.2.5-blue.svg
+.. |Version Number| image:: https://img.shields.io/badge/version-0.2.6-blue.svg
 
 .. |Build Status| image:: https://travis-ci.org/quiqueporta/simple-value-object.svg?branch=master
     :target: https://travis-ci.org/quiqueporta/simple-value-object

diff --git a/simple_value_object/__init__.py b/simple_value_object/__init__.py
@@ -3,7 +3,7 @@
 from .value_object import ValueObject
 from .decorators import invariant
 
-VERSION = (0, 2, 5, 'final')
+VERSION = (0, 2, 6, 'final')
 __version__ = VERSION
 
 

diff --git a/simple_value_object/value_object.py b/simple_value_object/value_object.py
@@ -1,4 +1,5 @@
 import six
+import sys
 from inspect import getargspec
 import inspect
 
@@ -94,11 +95,19 @@ def __repr__(self):
                 value = value.encode('utf-8')
             if isinstance(value, six.string_types) or isinstance(value, six.binary_type):
                 value = value.decode('utf-8')
+            if isinstance(value,ValueObject):
+                if sys.version_info[0] < 3:
+                    value = repr(value).decode('utf-8')
             args_values.append(u"{}={}".format(arg, value))
 
         kwargs = u", ".join(args_values)
 
-        return u"{}({})".format(self.__class__.__name__, kwargs)
+        result = u"{}({})".format(self.__class__.__name__, kwargs)
+
+        if sys.version_info[0] < 3:
+            return result.encode('utf-8')
+
+        return result
 
     def __hash__(self):
         return self.hash

diff --git a/specs/value_object_spec.py b/specs/value_object_spec.py
@@ -8,9 +8,9 @@
 
 def py23_str(value):
     try:  # Python 2
-        return unicode(value)
-    except NameError:  # Python 3
-        return repr(value)
+        return value.decode('utf-8')
+    except AttributeError:  # Python 3
+        return value
 
 
 class Point(ValueObject):
@@ -84,9 +84,9 @@ def __init__(self, x, y=3):
             a_value_object_with_defaults = MyPoint(6)
             a_value_object_within_value_object = Money(100, Currency(u'€'))
 
-            expect(py23_str(a_value_object)).to(equal(u'Point(x=6, y=7)'))
-            expect(py23_str(a_value_object_with_defaults)).to(equal(u'MyPoint(x=6, y=3)'))
-            expect(py23_str(a_value_object_within_value_object)).to(equal(u'Money(amount=100, currency=Currency(symbol=€))'))
+            expect(py23_str(repr(a_value_object))).to(equal(u'Point(x=6, y=7)'))
+            expect(py23_str(repr(a_value_object_with_defaults))).to(equal(u'MyPoint(x=6, y=3)'))
+            expect(py23_str(repr(a_value_object_within_value_object))).to(equal(u'Money(amount=100, currency=Currency(symbol=€))'))
 
         with it('provides a representation of unicode parameters'):
             class MyValueObject(ValueObject):
@@ -95,7 +95,7 @@ def __init__(self, text):
 
             a_value_object = MyValueObject(u"Melón")
 
-            expect(py23_str(a_value_object)).to(equal(u"MyValueObject(text=Melón)"))
+            expect(py23_str(repr(a_value_object))).to(equal(u"MyValueObject(text=Melón)"))
 
     with context('restrictions'):
         with context('on initialization'):