run: convert Run.underline to Run.font pass-through

Steve Canny · Steve Canny · commit 19a552ea1b78 · 2015-02-08T00:01:41.000-08:00
diff --git a/docx/oxml/text/run.py b/docx/oxml/text/run.py
@@ -122,22 +122,6 @@ def text(self, text):
         self.clear_content()
         _RunContentAppender.append_to_run_from_text(self, text)
 
-    @property
-    def underline(self):
-        """
-        String contained in w:val attribute of ./w:rPr/w:u grandchild, or
-        |None| if not present.
-        """
-        rPr = self.rPr
-        if rPr is None:
-            return None
-        return rPr.u_val
-
-    @underline.setter
-    def underline(self, value):
-        rPr = self.get_or_add_rPr()
-        rPr.u_val = value
-
 
 class CT_RPr(BaseOxmlElement):
     """
diff --git a/docx/text/run.py b/docx/text/run.py
@@ -372,11 +372,11 @@ def underline(self):
         underline. The values from :ref:`WdUnderline` are used to specify
         other outline styles such as double, wavy, and dotted.
         """
-        return self._r.underline
+        return self.font.underline
 
     @underline.setter
     def underline(self, value):
-        self._r.underline = value
+        self.font.underline = value
 
     @boolproperty
     def web_hidden(self):
