remove default attribute from formatted string (#44)

Author: derek73

nameparser/parser.py

@@ -119,7 +119,7 @@ def __unicode__(self):
             # string_format = "{title} {first} {middle} {last} {suffix} ({nickname})"
             _s = self.string_format.format(**self.as_dict())
             # remove trailing punctation from missing nicknames
-            _s = _s.replace(" ()","").replace(" ''","").replace(' ""',"")
+            _s = _s.replace(str(self.C.empty_attribute_default),'').replace(" ()","").replace(" ''","").replace(' ""',"")
             return self.collapse_whitespace(_s).strip(', ')
         return " ".join(self)
 
@@ -231,8 +231,10 @@ def _set_list(self, attr, value):
             val = value
         elif isinstance(value, text_types):
             val = [value]
+        elif value is None:
+            val = []
         else:
-            raise TypeError("Can only assign strings and lists to name attributes. "
+            raise TypeError("Can only assign strings, lists or None to name attributes. "
                     "Got {0}".format(type(value)))
         setattr(self, attr+"_list", self.parse_pieces(val))
 

tests.py

@@ -1274,6 +1274,20 @@ def test_empty_attribute_default(self):
         self.m(hn.nickname, None, hn)
         CONSTANTS.empty_attribute_default = _orig
 
+    def test_empty_attribute_on_instance(self):
+        hn = HumanName("")
+        hn.C.empty_attribute_default = None
+        self.m(hn.title, None, hn)
+        self.m(hn.first, None, hn)
+        self.m(hn.middle, None, hn)
+        self.m(hn.last, None, hn)
+        self.m(hn.suffix, None, hn)
+        self.m(hn.nickname, None, hn)
+
+    def test_none_empty_attribute_string_formatting(self):
+        hn = HumanName("")
+        hn.C.empty_attribute_default = None
+        self.m('', str(hn), hn)
 
 class HumanNameNicknameTestCase(HumanNameTestBase):
     # https://code.google.com/p/python-nameparser/issues/detail?id=33