fix: python-openxml#168 Unicode error on Python 2 core-props

scanny · scanny · commit 37822d3268d8 · 2018-08-18T16:55:47.000-07:00
diff --git a/docx/oxml/coreprops.py b/docx/oxml/coreprops.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-lxml custom element classes for core properties-related XML elements.
-"""
+"""Custom element classes for core properties-related XML elements"""
 
 from __future__ import (
     absolute_import, division, print_function, unicode_literals
@@ -12,9 +10,10 @@
 
 from datetime import datetime, timedelta
 
-from . import parse_xml
-from .ns import nsdecls, qn
-from .xmlchemy import BaseOxmlElement, ZeroOrOne
+from docx.compat import is_string
+from docx.oxml import parse_xml
+from docx.oxml.ns import nsdecls, qn
+from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
 class CT_CoreProperties(BaseOxmlElement):
@@ -293,10 +292,10 @@ def _set_element_datetime(self, prop_name, value):
             del self.attrib[qn('xsi:foo')]
 
     def _set_element_text(self, prop_name, value):
-        """
-        Set string value of *name* property to *value*.
-        """
-        value = str(value)
+        """Set string value of *name* property to *value*."""
+        if not is_string(value):
+            value = str(value)
+
         if len(value) > 255:
             tmpl = (
                 "exceeded 255 char limit for property, got:\n\n'%s'"
