diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 3061d8e..5983a3b 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -226,7 +226,7 @@
     PyObject* *children;
 
     PyObject* _children[STATIC_CHILDREN];
-    
+
 } ElementObjectExtra;
 
 typedef struct {
@@ -354,14 +354,14 @@
         /* use Python 2.4's list growth strategy */
         size = (size >> 3) + (size < 9 ? 3 : 6) + size;
         /* Coverity CID #182 size_error: Allocating 1 bytes to pointer "children"
-         * which needs at least 4 bytes. 
-         * Although it's a false alarm always assume at least one child to 
+         * which needs at least 4 bytes.
+         * Although it's a false alarm always assume at least one child to
          * be safe.
          */
         size = size ? size : 1;
         if (self->extra->children != self->extra->_children) {
             /* Coverity CID #182 size_error: Allocating 1 bytes to pointer
-             * "children", which needs at least 4 bytes. Although it's a 
+             * "children", which needs at least 4 bytes. Although it's a
              * false alarm always assume at least one child to be safe.
              */
             children = PyObject_Realloc(self->extra->children,
@@ -606,7 +606,7 @@
     Py_INCREF(JOIN_OBJ(element->tail));
 
     if (self->extra) {
-        
+
         if (element_resize(element, self->extra->length) < 0) {
             Py_DECREF(element);
             return NULL;
@@ -618,7 +618,7 @@
         }
 
         element->extra->length = self->extra->length;
-        
+
     }
 
     return (PyObject*) element;
@@ -661,7 +661,7 @@
 
     if (!element)
         return NULL;
-    
+
     text = deepcopy(JOIN_OBJ(self->text), memo);
     if (!text)
         goto error;
@@ -675,7 +675,7 @@
     element->tail = JOIN_SET(tail, JOIN_GET(self->tail));
 
     if (self->extra) {
-        
+
         if (element_resize(element, self->extra->length) < 0)
             goto error;
 
@@ -689,7 +689,7 @@
         }
 
         element->extra->length = self->extra->length;
-        
+
     }
 
     /* add object to memo dictionary (so deepcopy won't visit it again) */
@@ -800,7 +800,7 @@
 
     if (!self->extra)
         Py_RETURN_NONE;
-        
+
     for (i = 0; i < self->extra->length; i++) {
         PyObject* item = self->extra->children[i];
         if (Element_CheckExact(item) &&
@@ -953,7 +953,7 @@
 element_iter(ElementObject* self, PyObject* args)
 {
     PyObject* result;
-    
+
     PyObject* tag = Py_None;
     if (!PyArg_ParseTuple(args, "|O:iter", &tag))
         return NULL;
@@ -985,7 +985,7 @@
 element_itertext(ElementObject* self, PyObject* args)
 {
     PyObject* result;
-    
+
     if (!PyArg_ParseTuple(args, ":itertext"))
         return NULL;
 
@@ -1483,7 +1483,7 @@
 
     if (PyUnicode_Check(nameobj))
         name = _PyUnicode_AsString(nameobj);
-    
+
     if (name == NULL)
         return NULL;
 
@@ -2113,7 +2113,7 @@
             Py_INCREF(key);
             tag = key;
         }
-        
+
         /* decode universal name */
         p = PyBytes_AS_STRING(tag);
         value = PyUnicode_DecodeUTF8(p, size, "strict");
@@ -2407,7 +2407,7 @@
 
     for (i = 0; i < 256; i++)
         s[i] = i;
-    
+
     u = PyUnicode_Decode((char*) s, 256, name, "replace");
     if (!u)
         return XML_STATUS_ERROR;
@@ -2466,7 +2466,7 @@
         PyObject_Del(self);
         return NULL;
     }
-     
+
     self->names = PyDict_New();
     if (!self->names) {
         PyObject_Del(self->entity);
@@ -2645,7 +2645,7 @@
     reader = PyObject_GetAttrString(fileobj, "read");
     if (!reader)
         return NULL;
-    
+
     /* read from open file object */
     for (;;) {
 
@@ -2796,7 +2796,7 @@
     {NULL, NULL}
 };
 
-static PyObject*  
+static PyObject*
 xmlparser_getattro(XMLParserObject* self, PyObject* nameobj)
 {
     if (PyUnicode_Check(nameobj)) {
@@ -2957,7 +2957,7 @@
         "            break\n"
         "          parser.feed(data)\n"
         "        self._root = parser.close()\n"
-        "      else:\n" 
+        "      else:\n"
         "        parser = cElementTree.XMLParser()\n"
         "        self._root = parser._parse(source)\n"
         "      return self._root\n"
