Fix issues where style could not show up after being set on tag

Author: kata198

AdvancedHTMLParser/SpecialAttributes.py

@@ -44,7 +44,10 @@ def _direct_set(self, key, value):
 
     def __setitem__(self, key, value):
         if key == 'style':
-            self.tag.style = StyleAttribute(value)
+            if not isinstance(value, StyleAttribute):
+                self.tag.style = StyleAttribute(value, self.tag)
+            else:
+                self.tag.style = value
         elif key == 'class':
 
             # Ensure when we update the "class" attribute, that we update the list as well.
@@ -220,9 +223,9 @@ class StyleAttribute(object):
         StyleAttribute - Represents the "style" field on a tag.
     '''
 
-    RESERVED_ATTRIBUTES = ('_styleValue', '_styleDict', '_asStr')
+    RESERVED_ATTRIBUTES = ('_styleValue', '_styleDict', '_asStr', 'tag')
 
-    def __init__(self, styleValue):
+    def __init__(self, styleValue, tag=None):
         '''
             __init__ - Create a StyleAttribute object.
 
@@ -233,6 +236,7 @@ def __init__(self, styleValue):
 
         self._styleValue = styleValue
         self._styleDict = StyleAttribute.styleToDict(styleValue)
+        self.tag = tag
 
     def __getattribute__(self, name):
         '''
@@ -281,6 +285,9 @@ def __setattr__(self, name, val):
         else:
             self._styleDict[name] = val
 
+        if self.tag and self._styleDict:
+            self.tag.setAttribute('style', self)
+
         return val
 
     @staticmethod
@@ -452,7 +459,7 @@ def __str__(self):
         return self._asStr()
 
     def __repr__(self):
-        return "%s(%s)" %(self.__class__.__name__, repr(self._asStr()))
+        return "%s(%s)" %(type(self).__name__, repr(self._asStr()))
 
     def __copy__(self):
         return self.__class__(self._asStr())

AdvancedHTMLParser/Tags.py

@@ -104,11 +104,13 @@ def __init__(self, tagName, attrList=None, isSelfClosing=False, ownerDocument=No
         if isSelfClosing is False and tagName in IMPLICIT_SELF_CLOSING_TAGS:
             isSelfClosing = True
 
+        styleAttr = StyleAttribute('', self)
+
         rawSet('_attributes', SpecialAttributesDict(self))
         rawSet('text', '')
         rawSet('blocks', [''])
         rawSet('classNames', [])
-        rawSet('style', StyleAttribute(''))
+        rawSet('style', styleAttr)
 
         rawSet('isSelfClosing', isSelfClosing)
 
@@ -145,7 +147,7 @@ def __setattr__(self, name, value):
             return value
 
         if name == 'style' and not isinstance(value, StyleAttribute):
-            value = StyleAttribute(value)
+            value = StyleAttribute(value, self)
 
         try:
             return object.__setattr__(self, name,  value)
@@ -853,6 +855,7 @@ def getStartTag(self):
         '''
         attributeString = []
         for name, val in self._attributes.items():
+            val = str(val)
             if val:
                 val = escapeQuotes(val)
                 attributeString.append('%s="%s"' %(name, val) )
@@ -1063,7 +1066,11 @@ def setStyle(self, styleName, styleValue):
 
             @return - String of current value of "style" after change is made.
         '''
-        setattr(self.style, styleName, styleValue)
+        if 'style' not in self._attributes:
+            self._attributes['style'] = "%s: %s" %(styleName, styleValue)
+        else:
+            setattr(self._attributes['style'], styleName, styleValue)
+#        setattr(self.style, styleName, styleValue)
 
     def setStyles(self, styleUpdatesDict):
         '''
@@ -1078,7 +1085,7 @@ def setStyles(self, styleUpdatesDict):
             @return - String of current value of "style" after change is made.
         '''
         for newName, newValue in styleUpdatesDict.items():
-            setattr(self.style, newName, newValue)
+            self.setStyle(newName, newValue)
 
         return self.style