Python 2 cleanups

* Remove Python 2 imports
* Remove str aliases
* Remove explicit object superclass
* Remove unnecessary super() arguments
* Remove unnecessary empty lines

Author: srittau

htmlgen/attribute.py

@@ -3,8 +3,7 @@
 from htmlgen.timeutil import parse_rfc3339_partial_time
 
 
-class html_attribute(object):
-
+class html_attribute:
     """Add an attribute to an HTML element.
 
         >>> from htmlgen import Element
@@ -45,8 +44,7 @@ def __set__(self, obj, value):
             obj.set_attribute(self._attribute_name, value)
 
 
-class boolean_html_attribute(object):
-
+class boolean_html_attribute:
     """Add a boolean attribute to an HTML element.
 
         >>> from htmlgen import Element
@@ -76,8 +74,7 @@ def __set__(self, obj, value):
             obj.remove_attribute(self._attribute_name)
 
 
-class int_html_attribute(object):
-
+class int_html_attribute:
     """Add an attribute to an HTML element that accepts only integers.
 
         >>> from htmlgen import Element
@@ -121,8 +118,7 @@ def __set__(self, obj, value):
             obj.set_attribute(self._attribute_name, str(value))
 
 
-class float_html_attribute(object):
-
+class float_html_attribute:
     """Add an attribute to an HTML element that accepts only numbers.
 
         >>> from htmlgen import Element
@@ -166,8 +162,7 @@ def __set__(self, obj, value):
             obj.set_attribute(self._attribute_name, str(value))
 
 
-class time_html_attribute(object):
-
+class time_html_attribute:
     """Add an attribute to an HTML element that accepts only time values.
 
     >>> from htmlgen import Element
@@ -212,8 +207,7 @@ def __set__(self, obj, value):
             obj.set_attribute(self._attribute_name, str(value))
 
 
-class list_html_attribute(object):
-
+class list_html_attribute:
     """Add an attribute to an HTML element that accepts a list of strings.
 
     >>> from htmlgen import Element
@@ -250,8 +244,7 @@ def __init__(self, data_name, default=None):
         super(data_attribute, self).__init__(attribute_name, default)
 
 
-class css_class_attribute(object):
-
+class css_class_attribute:
     """Add a boolean attribute to an HTML element that add a CSS class.
 
     >>> from htmlgen import Element

htmlgen/attribute.pyi

@@ -3,7 +3,7 @@ from typing import Optional, List, Iterable
 
 from htmlgen.element import Element
 
-class html_attribute(object):
+class html_attribute:
     def __init__(
         self, attribute_name: str, default: Optional[str] = ...
     ) -> None: ...
@@ -12,12 +12,12 @@ class html_attribute(object):
     ) -> Optional[str]: ...
     def __set__(self, obj: Element, value: Optional[str]) -> None: ...
 
-class boolean_html_attribute(object):
+class boolean_html_attribute:
     def __init__(self, attribute_name: str) -> None: ...
     def __get__(self, obj: Element, type_: Optional[type] = ...) -> bool: ...
     def __set__(self, obj: Element, value: bool) -> None: ...
 
-class int_html_attribute(object):
+class int_html_attribute:
     def __init__(
         self, attribute_name: str, default: Optional[int] = ...
     ) -> None: ...
@@ -26,7 +26,7 @@ class int_html_attribute(object):
     ) -> Optional[int]: ...
     def __set__(self, obj: Element, value: Optional[int]) -> None: ...
 
-class float_html_attribute(object):
+class float_html_attribute:
     def __init__(
         self, attribute_name: str, default: Optional[float] = ...
     ) -> None: ...
@@ -35,7 +35,7 @@ class float_html_attribute(object):
     ) -> Optional[float]: ...
     def __set__(self, obj: Element, value: Optional[float]) -> None: ...
 
-class time_html_attribute(object):
+class time_html_attribute:
     def __init__(
         self, attribute_name: str, default: Optional[datetime.time] = None
     ) -> None: ...
@@ -46,7 +46,7 @@ class time_html_attribute(object):
         self, obj: Element, value: Optional[datetime.time]
     ) -> None: ...
 
-class list_html_attribute(object):
+class list_html_attribute:
     def __init__(self, attribute_name: str) -> None: ...
     def __get__(
         self, obj: Element, type_: Optional[type] = ...
@@ -58,7 +58,7 @@ class data_attribute(html_attribute):
         self, data_name: str, default: Optional[str] = None
     ) -> None: ...
 
-class css_class_attribute(object):
+class css_class_attribute:
     def __init__(self, css_class: str) -> None: ...
     def __get__(self, obj: Element, type_: Optional[type] = ...) -> bool: ...
     def __set__(self, obj: Element, value: bool) -> None: ...

htmlgen/block.py

@@ -2,7 +2,6 @@
 
 
 class Division(Element):
-
     """An HTML division (<div>) element.
 
     <div> elements are block-level elements without semantic meaning. They are
@@ -12,33 +11,29 @@ class Division(Element):
         >>> div.id = "my-block"
         >>> div.add_css_classes("important", "legal")
         >>> div.append("This is more text.")
-
     """
 
     def __init__(self, *content):
-        super(Division, self).__init__("div")
+        super().__init__("div")
         self.extend(content)
 
 
 class Paragraph(Element):
-
     """An HTML paragraph (<p>) element.
 
     <p> elements are block-level elements that delineate text paragraphs.
 
         >>> p1 = Paragraph("This is a text paragraph.")
         >>> p2 = Paragraph()
         >>> p2.append("This is another paragraph.")
-
     """
 
     def __init__(self, *content):
-        super(Paragraph, self).__init__("p")
+        super().__init__("p")
         self.extend(content)
 
 
 class Preformatted(Element):
-
     """An HTML pre-formatted text (<pre>) element.
 
     <pre> elements are block-level elements that contain text which will
@@ -47,8 +42,7 @@ class Preformatted(Element):
 
         >>> pre = Preformatted()
         >>> pre.append("Hello\\nWorld!")
-
     """
 
     def __init__(self):
-        super(Preformatted, self).__init__("pre")
+        super().__init__("pre")

htmlgen/document.py

@@ -8,7 +8,6 @@
 
 
 class Document(Generator):
-
     """An HTML document.
 
     A document consists of a doctype declaration and the HTML root tag.
@@ -34,11 +33,10 @@ class Document(Generator):
         >>> doc.add_script("my-script.js")
         >>> doc.add_stylesheet("style.css")
         >>> doc.append_body(Element("div"))
-
     """
 
     def __init__(self, title=None, language="en"):
-        super(Document, self).__init__()
+        super().__init__()
         self.root = HTMLRoot(title=title, language=language)
 
     def generate(self):
@@ -73,7 +71,6 @@ def append_body(self, child):
 
 
 class HTMLRoot(NonVoidElement):
-
     """HTML root (<html>) element.
 
         >>> root = HTMLRoot(title="My Page")
@@ -85,11 +82,10 @@ class HTMLRoot(NonVoidElement):
 
         >>> root.head = Head()
         >>> root.body = Body()
-
     """
 
     def __init__(self, title="", language="en"):
-        super(HTMLRoot, self).__init__("html")
+        super().__init__("html")
         self.head = Head(title=title)
         self.body = Body()
         self.set_attribute("xmlns", "http://www.w3.org/1999/xhtml")
@@ -102,7 +98,6 @@ def generate_children(self):
 
 
 class Head(Element):
-
     """HTML document head (<head>) element.
 
     A title element is provided by default, but it can be overwritten:
@@ -116,11 +111,10 @@ class Head(Element):
 
         >>> head.add_stylesheet("style.css")
         >>> head.add_script("script.js")
-
     """
 
     def __init__(self, title=None):
-        super(Head, self).__init__("head")
+        super().__init__("head")
         self._title = Title(title)
         self.append(self._title)
         self.append(Meta.create_charset("utf-8"))
@@ -151,19 +145,17 @@ def add_script(self, script):
 
 
 class Body(Element):
-
     """HTML body (<body>) element."""
 
     def __init__(self):
-        super(Body, self).__init__("body")
+        super().__init__("body")
 
 
 class Title(NonVoidElement):
-
     """HTML page title (<title>) element."""
 
     def __init__(self, title=None):
-        super(Title, self).__init__("title")
+        super().__init__("title")
         self.title = title or ""
 
     def generate_children(self):
@@ -172,11 +164,10 @@ def generate_children(self):
 
 
 class Meta(VoidElement):
-
     """HTML meta information (<meta>) element."""
 
     def __init__(self):
-        super(Meta, self).__init__("meta")
+        super().__init__("meta")
 
     @classmethod
     def create_charset(cls, charset):
@@ -186,7 +177,6 @@ def create_charset(cls, charset):
 
 
 class Script(NonVoidElement):
-
     """HTML script (<script>) element.
 
     A script element can either point to an external script via the url
@@ -210,12 +200,11 @@ class Script(NonVoidElement):
 
         >>> Script().type
         'text/javascript'
-
     """
 
     def __init__(self, url=None, script=None):
         assert url is None or script is None
-        super(Script, self).__init__("script")
+        super().__init__("script")
         if url:
             self.url = url
         self.script = script
@@ -249,11 +238,10 @@ def json_script(json):
 
 
 class HeadLink(VoidElement):
-
     """HTML meta data link (<link>) element."""
 
     def __init__(self, relation, url):
-        super(HeadLink, self).__init__("link")
+        super().__init__("link")
         self.relation = relation
         self.url = url
 
@@ -266,8 +254,7 @@ def create_stylesheet(cls, stylesheet):
 
 
 class Main(Element):
-
     """HTML main document content (<main>) element."""
 
     def __init__(self):
-        super(Main, self).__init__("main")
+        super().__init__("main")

htmlgen/element.py

@@ -1,18 +1,7 @@
-import sys
+from html import escape
 
 from htmlgen.generator import Generator, HTMLChildGenerator
 
-if sys.version_info[0] < 3:
-    from cgi import escape
-else:
-    from html import escape
-
-# TODO: Python 3: remove
-if sys.version_info[0] >= 3:
-    str_class = str
-else:
-    str_class = basestring
-
 
 def is_element(o, element_name):
     """Return whether a given object is a certain element generator."""
@@ -25,7 +14,7 @@ def is_element(o, element_name):
 
 class ElementBase(Generator):
     def __init__(self, element_name):
-        super(ElementBase, self).__init__()
+        super().__init__()
         self.element_name = element_name
         self._attributes = {}
         self._css_classes = set()
@@ -73,7 +62,7 @@ def set_attribute(self, name, value):
             '<div title="Test Title"></div>'
 
         """
-        if not isinstance(name, str_class) or not isinstance(value, str_class):
+        if not isinstance(name, str) or not isinstance(value, str):
             raise TypeError("name and value must be strings")
         self._attributes[name] = value
 
@@ -306,7 +295,7 @@ class Element(NonVoidElement):
     """
 
     def __init__(self, element_name):
-        super(Element, self).__init__(element_name)
+        super().__init__(element_name)
         self.children = HTMLChildGenerator()
 
     def __bool__(self):