Fixes from integration testing

pandas-dev · Apr 8, 2017 · 8e9a567 · 8e9a567
1 parent c1fc232
commit 8e9a567
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/pandas/formats/excel.py b/pandas/formats/excel.py
@@ -237,11 +237,13 @@ def build_font(self, props):
             'size': size,
             'bold': self.BOLD_MAP.get(props.get('font-weight')),
             'italic': self.ITALIC_MAP.get(props.get('font-style')),
-            'underline': (None if decoration is None
-                          else 'underline' in decoration),
+            'underline': ('single'
+                          if decoration is not None
+                          and 'underline' in decoration
+                          else None),
             'strike': (None if decoration is None
                        else 'line-through' in decoration),
-            'color': self.color_to_excel(props.get('font-color')),
+            'color': self.color_to_excel(props.get('color')),
             # shadow if nonzero digit before shadow colour
             'shadow': (bool(re.search('^[^#(]*[1-9]',
                                       props['text-shadow']))

diff --git a/pandas/tests/formats/test_to_excel.py b/pandas/tests/formats/test_to_excel.py
@@ -43,11 +43,11 @@
     # - italic
     # - underline
     ('text-decoration: underline',
-     {'font': {'underline': True, 'strike': False}}),
+     {'font': {'underline': 'single', 'strike': False}}),
     ('text-decoration: overline',
-     {'font': {'underline': False, 'strike': False}}),
+     {'font': {'strike': False}}),
     ('text-decoration: none',
-     {'font': {'underline': False, 'strike': False}}),
+     {'font': {'strike': False}}),
     # - strike
     ('text-decoration: line-through',
      {'font': {'strike': True, 'underline': False}}),
@@ -56,9 +56,9 @@
     ('text-decoration: underline; text-decoration: line-through',
      {'font': {'strike': True, 'underline': False}}),
     # - color
-    ('font-color: red', {'font': {'color': 'FF0000'}}),
-    ('font-color: #ff0000', {'font': {'color': 'FF0000'}}),
-    ('font-color: #f0a', {'font': {'color': 'FF00AA'}}),
+    ('color: red', {'font': {'color': 'FF0000'}}),
+    ('color: #ff0000', {'font': {'color': 'FF0000'}}),
+    ('color: #f0a', {'font': {'color': 'FF00AA'}}),
     # - shadow
     ('text-shadow: none', {'font': {'shadow': False}}),
     ('text-shadow: 0px -0em 0px #CCC', {'font': {'shadow': False}}),
@@ -141,3 +141,8 @@ def test_css_to_excel_multiple():
 def test_css_to_excel_inherited(css, inherited, expected):
     convert = CSSToExcelConverter(inherited)
     assert expected == convert(css)
+
+
+@pytest.mark.xfail
+def test_css_to_excel_warns_when_not_supported():
+    pass