Get rid of remaining non-decorator property()

html5lib/_inputstream.py

@@ -611,26 +611,25 @@ def previous(self):
         self._position = p = p - 1
         return self[p:p + 1]
 
-    def setPosition(self, position):
-        if self._position >= len(self):
-            raise StopIteration
-        self._position = position
-
-    def getPosition(self):
+    @property
+    def position(self):
         if self._position >= len(self):
             raise StopIteration
         if self._position >= 0:
             return self._position
         else:
             return None
 
-    position = property(getPosition, setPosition)
+    @position.setter
+    def position(self, position):
+        if self._position >= len(self):
+            raise StopIteration
+        self._position = position
 
-    def getCurrentByte(self):
+    @property
+    def currentByte(self):
         return self[self.position:self.position + 1]
 
-    currentByte = property(getCurrentByte)
-
     def skip(self, chars=spaceCharactersBytes):
         """Skip past a list of characters"""
         p = self.position               # use property for the error-checking

html5lib/treebuilders/base.py

@@ -306,10 +306,12 @@ def createElement(self, token):
         element.attributes = token["data"]
         return element
 
-    def _getInsertFromTable(self):
+    @property
+    def insertFromTable(self):
         return self._insertFromTable
 
-    def _setInsertFromTable(self, value):
+    @insertFromTable.setter
+    def insertFromTable(self, value):
         """Switch the function used to insert an element from the
         normal one to the misnested table one and back again"""
         self._insertFromTable = value
@@ -318,8 +320,6 @@ def _setInsertFromTable(self, value):
         else:
             self.insertElement = self.insertElementNormal
 
-    insertFromTable = property(_getInsertFromTable, _setInsertFromTable)
-
     def insertElementNormal(self, token):
         name = token["name"]
         assert isinstance(name, text_type), "Element %s not unicode" % name

html5lib/treebuilders/dom.py

@@ -58,8 +58,9 @@ def __init__(self, element):
             base.Node.__init__(self, element.nodeName)
             self.element = element
 
-        namespace = property(lambda self: hasattr(self.element, "namespaceURI") and
-                             self.element.namespaceURI or None)
+        @property
+        def namespace(self):
+            return getattr(self.element, "namespaceURI", None)
 
         def appendChild(self, node):
             node.parent = self
@@ -88,10 +89,12 @@ def reparentChildren(self, newParent):
                 newParent.element.appendChild(child)
             self.childNodes = []
 
-        def getAttributes(self):
+        @property
+        def attributes(self):
             return AttrList(self.element)
 
-        def setAttributes(self, attributes):
+        @attributes.setter
+        def attributes(self, attributes):
             if attributes:
                 for name, value in list(attributes.items()):
                     if isinstance(name, tuple):
@@ -104,22 +107,20 @@ def setAttributes(self, attributes):
                     else:
                         self.element.setAttribute(
                             name, value)
-        attributes = property(getAttributes, setAttributes)
 
         def cloneNode(self):
             return NodeBuilder(self.element.cloneNode(False))
 
         def hasContent(self):
             return self.element.hasChildNodes()
 
-        def getNameTuple(self):
+        @property
+        def nameTuple(self):
             if self.namespace is None:
                 return namespaces["html"], self.name
             else:
                 return self.namespace, self.name
 
-        nameTuple = property(getNameTuple)
-
     class TreeBuilder(base.TreeBuilder):  # pylint:disable=unused-variable
         def documentClass(self):
             self.dom = Dom.getDOMImplementation().createDocument(None, None, None)

html5lib/treebuilders/etree.py

@@ -41,28 +41,30 @@ def _getETreeTag(self, name, namespace):
                 etree_tag = "{%s}%s" % (namespace, name)
             return etree_tag
 
-        def _setName(self, name):
-            self._name = name
-            self._element.tag = self._getETreeTag(self._name, self._namespace)
-
-        def _getName(self):
+        @property
+        def name(self):
             return self._name
 
-        name = property(_getName, _setName)
-
-        def _setNamespace(self, namespace):
-            self._namespace = namespace
+        @name.setter
+        def name(self, name):
+            self._name = name
             self._element.tag = self._getETreeTag(self._name, self._namespace)
 
-        def _getNamespace(self):
+        @property
+        def namespace(self):
             return self._namespace
 
-        namespace = property(_getNamespace, _setNamespace)
+        @namespace.setter
+        def namespace(self, namespace):
+            self._namespace = namespace
+            self._element.tag = self._getETreeTag(self._name, self._namespace)
 
-        def _getAttributes(self):
+        @property
+        def attributes(self):
             return self._element.attrib
 
-        def _setAttributes(self, attributes):
+        @attributes.setter
+        def attributes(self, attributes):
             el_attrib = self._element.attrib
             el_attrib.clear()
             if attributes:
@@ -75,19 +77,17 @@ def _setAttributes(self, attributes):
                         name = key
                     el_attrib[name] = value
 
-        attributes = property(_getAttributes, _setAttributes)
-
-        def _getChildNodes(self):
+        @property
+        def childNodes(self):
             return self._childNodes
 
-        def _setChildNodes(self, value):
+        @childNodes.setter
+        def childNodes(self, value):
             del self._element[:]
             self._childNodes = []
             for element in value:
                 self.insertChild(element)
 
-        childNodes = property(_getChildNodes, _setChildNodes)
-
         def hasContent(self):
             """Return true if the node has children or text"""
             return bool(self._element.text or len(self._element))
@@ -156,39 +156,39 @@ def __init__(self, data):
             self._childNodes = []
             self._flags = []
 
-        def _getData(self):
+        @property
+        def data(self):
             return self._element.text
 
-        def _setData(self, value):
+        @data.setter
+        def data(self, value):
             self._element.text = value
 
-        data = property(_getData, _setData)
-
     class DocumentType(Element):
         def __init__(self, name, publicId, systemId):
             Element.__init__(self, "<!DOCTYPE>")
             self._element.text = name
             self.publicId = publicId
             self.systemId = systemId
 
-        def _getPublicId(self):
+        @property
+        def publicId(self):
             return self._element.get("publicId", "")
 
-        def _setPublicId(self, value):
+        @publicId.setter
+        def publicId(self, value):
             if value is not None:
                 self._element.set("publicId", value)
 
-        publicId = property(_getPublicId, _setPublicId)
-
-        def _getSystemId(self):
+        @property
+        def systemId(self):
             return self._element.get("systemId", "")
 
-        def _setSystemId(self, value):
+        @systemId.setter
+        def systemId(self, value):
             if value is not None:
                 self._element.set("systemId", value)
 
-        systemId = property(_getSystemId, _setSystemId)
-
     class Document(Element):
         def __init__(self):
             Element.__init__(self, "DOCUMENT_ROOT")

html5lib/treebuilders/etree_lxml.py

@@ -56,11 +56,10 @@ def appendChild(self, element):
 
         last.addnext(element._element)
 
-    def _getChildNodes(self):
+    @property
+    def childNodes(self):
         return self._childNodes
 
-    childNodes = property(_getChildNodes)
-
 
 def testSerializer(element):
     rv = []
@@ -233,26 +232,26 @@ def __init__(self, name, namespace):
                 builder.Element.__init__(self, name, namespace=namespace)
                 self._attributes = Attributes(self)
 
-            def _setName(self, name):
+            @property
+            def name(self):
+                return infosetFilter.fromXmlName(self._name)
+
+            @name.setter
+            def name(self, name):
                 self._name = infosetFilter.coerceElement(name)
                 self._element.tag = self._getETreeTag(
                     self._name, self._namespace)
 
-            def _getName(self):
-                return infosetFilter.fromXmlName(self._name)
-
-            name = property(_getName, _setName)
-
-            def _getAttributes(self):
+            @property
+            def attributes(self):
                 return self._attributes
 
-            def _setAttributes(self, value):
+            @attributes.setter
+            def attributes(self, value):
                 attributes = self.attributes
                 attributes.clear()
                 attributes.update(value)
 
-            attributes = property(_getAttributes, _setAttributes)
-
             def insertText(self, data, insertBefore=None):
                 data = infosetFilter.coerceCharacters(data)
                 builder.Element.insertText(self, data, insertBefore)
@@ -268,14 +267,14 @@ def __init__(self, data):
                 data = infosetFilter.coerceComment(data)
                 builder.Comment.__init__(self, data)
 
-            def _setData(self, data):
-                data = infosetFilter.coerceComment(data)
-                self._element.text = data
-
-            def _getData(self):
+            @property
+            def data(self):
                 return self._element.text
 
-            data = property(_getData, _setData)
+            @data.setter
+            def data(self, data):
+                data = infosetFilter.coerceComment(data)
+                self._element.text = data
 
         self.elementClass = Element
         self.commentClass = Comment