diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index 963b6d0..085f0eb 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -587,7 +587,8 @@
         return _getElementsByTagNameHelper(self, name, NodeList())
 
     def getElementsByTagNameNS(self, namespaceURI, localName):
-        return _getElementsByTagNameNSHelper(self, namespaceURI, localName, NodeList())
+        return _getElementsByTagNameNSHelper(self, namespaceURI, localName,
+                                             NodeList())
 
     def __repr__(self):
         return "<DOM Element: %s at %s>" % (self.tagName, id(self))
@@ -935,7 +936,8 @@
         return _getElementsByTagNameHelper(self, name, NodeList())
 
     def getElementsByTagNameNS(self, namespaceURI, localName):
-        return _getElementsByTagNameNSHelper(self, namespaceURI, localName, NodeList())
+        return _getElementsByTagNameNSHelper(self, namespaceURI, localName,
+                                             NodeList())
 
     def writexml(self, writer, indent="", addindent="", newl=""):
         writer.write('<?xml version="1.0" ?>\n')
