diff --git a/tests/complex/scenario_generation/demand_models/runner.py b/tests/complex/scenario_generation/demand_models/runner.py
index db8101ffbcbe..c09d568818ad 100644
--- a/tests/complex/scenario_generation/demand_models/runner.py
+++ b/tests/complex/scenario_generation/demand_models/runner.py
@@ -31,7 +31,7 @@
 for s in demand.streams:
     vehicles1.extend(s.toVehicles(0, 86400))
 
-#demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
+# demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
 
 demand = Demand()
 demand.addStream(Stream(None, 0, 39600, 400, "from", "to", "passenger"))
@@ -41,7 +41,7 @@
 vehicles2 = []
 for s in demand.streams:
     vehicles2.extend(s.toVehicles(0, 86400))
-#demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
+# demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
 
 vehicles3 = []  # [600, 0, .000025, 14400]
 demand = Demand()
@@ -49,7 +49,7 @@
     800, [[400, 0, .000025, 14400], [200, 0, .00001, 14400]]), "from", "to", "passenger"))
 for s in demand.streams:
     vehicles3.extend(s.toVehicles(0, 86400))
-#demand.build(0, 3600, "net.net.xml", "linear.rou.xml")
+# demand.build(0, 3600, "net.net.xml", "linear.rou.xml")
 
 STEP = 300
 d1 = [0] * (86400 / STEP)
diff --git a/tests/complex/simpla/config/test.py b/tests/complex/simpla/config/test.py
index 9f5860c5ad7c..57ac99e51b7b 100644
--- a/tests/complex/simpla/config/test.py
+++ b/tests/complex/simpla/config/test.py
@@ -55,7 +55,7 @@ def setUp(self):
                 <vTypeMap original="origVTypeID" leader="leaderVTypeID" follower="followerVTypeID" catchup="catchupVTypeID" catchupFollower="catchupFollowerVTypeID" />
             """
         self.cfg_body1 =\
-            """        
+            """
                 <controlRate value="0" />
                 <vehicleSelectors>empty</vehicleSelectors>
                 <maxPlatoonGap value="-1" />
diff --git a/tests/complex/tutorial/city_mobil/agentManager.py b/tests/complex/tutorial/city_mobil/agentManager.py
index dc3eb2b2d4b0..910afc67c31f 100755
--- a/tests/complex/tutorial/city_mobil/agentManager.py
+++ b/tests/complex/tutorial/city_mobil/agentManager.py
@@ -163,7 +163,7 @@ def __init__(self):
         self.cyberCars = []
 
     def personArrived(self, personID, edge, target):
-        if not personID in self.agents:
+        if personID not in self.agents:
             person = PersonAgent(personID)
             self.agents[personID] = person
             person.startRequest(edge.replace("footmain", "cyber"),
diff --git a/tests/complex/tutorial/city_mobil/simpleManager.py b/tests/complex/tutorial/city_mobil/simpleManager.py
index 7e9043a32e0c..917f15462bb1 100755
--- a/tests/complex/tutorial/city_mobil/simpleManager.py
+++ b/tests/complex/tutorial/city_mobil/simpleManager.py
@@ -27,7 +27,7 @@ def __init__(self):
         self.personsWaitingAt = {}
 
     def personArrived(self, personID, edge, target):
-        if not edge in self.personsWaitingAt:
+        if edge not in self.personsWaitingAt:
             self.personsWaitingAt[edge] = []
         self.personsWaitingAt[edge].append((personID, target))
 
diff --git a/tests/complex/tutorial/city_mobil/vehicleControl.py b/tests/complex/tutorial/city_mobil/vehicleControl.py
index e529b06265df..031869cce5ee 100644
--- a/tests/complex/tutorial/city_mobil/vehicleControl.py
+++ b/tests/complex/tutorial/city_mobil/vehicleControl.py
@@ -124,7 +124,7 @@ def getPosition(vehicleID):
 
 
 def stopAt(vehicleID, edge, pos=None):
-    if pos == None:
+    if pos is None:
         pos = STOP_POS
         if edge.endswith("out") or edge.endswith("in"):
             pos = 90.
@@ -154,7 +154,7 @@ def _rerouteCar(vehicleID):
         for idx in range(SLOTS_PER_ROW):
             for dir in ["l", "r"]:
                 slotEdge = "slot%s-%s%s" % (rowIdx, idx, dir)
-                if not slotEdge in occupancy:
+                if slotEdge not in occupancy:
                     occupancy[slotEdge] = vehicleID
                     stopAt(vehicleID, slotEdge, SLOT_LENGTH - 5.)
                     return
@@ -188,7 +188,7 @@ def _checkInitialPositions(vehicleID, edge, pos):
         elif "foot" in edge:
             traci.vehicle.setStop(vehicleID, "-" + edge)
             parkEdge = edge.replace("foot", "slot")
-            if not parkEdge in persons:
+            if parkEdge not in persons:
                 persons[parkEdge] = []
             persons[parkEdge].append(vehicleID)
             vehicleStatus[vehicleID].parking = True
diff --git a/tests/netedit/additionalElements/access/delete/test.sikuli/test.py b/tests/netedit/additionalElements/access/delete/test.sikuli/test.py
index 3df841f2c124..8b678a8f12c0 100644
--- a/tests/netedit/additionalElements/access/delete/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/access/delete/test.sikuli/test.py
@@ -60,7 +60,7 @@
 # go to inspect mode
 netedit.deleteMode()
 
-#delete busStop
+# delete busStop
 netedit.leftClick(match, 420, 295)
 
 # undo
diff --git a/tests/netedit/additionalElements/access/inspect/test.sikuli/test.py b/tests/netedit/additionalElements/access/inspect/test.sikuli/test.py
index 649b4c3f8cbf..bb7988262fc8 100644
--- a/tests/netedit/additionalElements/access/inspect/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/access/inspect/test.sikuli/test.py
@@ -98,5 +98,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
-
diff --git a/tests/netedit/additionalElements/access/inspect_selection/test.sikuli/test.py b/tests/netedit/additionalElements/access/inspect_selection/test.sikuli/test.py
index a93123464137..0ee599b6859c 100644
--- a/tests/netedit/additionalElements/access/inspect_selection/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/access/inspect_selection/test.sikuli/test.py
@@ -60,4 +60,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/access/move/test.sikuli/test.py b/tests/netedit/additionalElements/access/move/test.sikuli/test.py
index 33891ae52c1d..ba2446f0fa28 100644
--- a/tests/netedit/additionalElements/access/move/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/access/move/test.sikuli/test.py
@@ -50,7 +50,7 @@
 # move Acces 1
 netedit.moveElement(match, -147, 163, 100, 163)
 
-#move Acces 2
+# move Acces 2
 netedit.moveElement(match, 100, 163, -100, 163)
 
 # Check undo redo
diff --git a/tests/netedit/additionalElements/calibrator/create/test.sikuli/test.py b/tests/netedit/additionalElements/calibrator/create/test.sikuli/test.py
index 28170c9b4483..50bea686d970 100644
--- a/tests/netedit/additionalElements/calibrator/create/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/calibrator/create/test.sikuli/test.py
@@ -88,13 +88,13 @@
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an invalid value 
+# change output with an invalid value
 netedit.modifyAdditionalDefaultValue(5, "%%%%###!!!")
 
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an valid value 
+# change output with an valid value
 netedit.modifyAdditionalDefaultValue(5, "myOwnOutput")
 
 # create calibrator with a valid parameter in other lane
diff --git a/tests/netedit/additionalElements/e2detector/create/test.sikuli/test.py b/tests/netedit/additionalElements/e2detector/create/test.sikuli/test.py
index 9ad8e658eaa0..0593b9122c75 100644
--- a/tests/netedit/additionalElements/e2detector/create/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/e2detector/create/test.sikuli/test.py
@@ -67,7 +67,7 @@
 # set valid filename
 netedit.modifyAdditionalDefaultValue(4, "myOwnFilename.txt")
 
-#create E2 with valid filename
+# create E2 with valid filename
 netedit.leftClick(match, 400, 250)
 
 # Change cont
diff --git a/tests/netedit/additionalElements/lanecalibrator/create/test.sikuli/test.py b/tests/netedit/additionalElements/lanecalibrator/create/test.sikuli/test.py
index 90ef62d3ab5e..40e3f7df0d53 100644
--- a/tests/netedit/additionalElements/lanecalibrator/create/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/lanecalibrator/create/test.sikuli/test.py
@@ -88,13 +88,13 @@
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an invalid value 
+# change output with an invalid value
 netedit.modifyAdditionalDefaultValue(5, "%%%%###!!!")
 
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an valid value 
+# change output with an valid value
 netedit.modifyAdditionalDefaultValue(5, "myOwnOutput")
 
 # create calibrator with a valid parameter in other lane
diff --git a/tests/netedit/additionalElements/parkingarea/inspect/test.sikuli/test.py b/tests/netedit/additionalElements/parkingarea/inspect/test.sikuli/test.py
index b6b3c2c1dd01..5657431bd3b0 100644
--- a/tests/netedit/additionalElements/parkingarea/inspect/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/parkingarea/inspect/test.sikuli/test.py
@@ -164,4 +164,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-"""
diff --git a/tests/netedit/additionalElements/parkingspace/delete/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/delete/test.sikuli/test.py
index a6a8be3af240..fa5560ce8880 100644
--- a/tests/netedit/additionalElements/parkingspace/delete/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/parkingspace/delete/test.sikuli/test.py
@@ -81,4 +81,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/parkingspace/inspect_selection/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/inspect_selection/test.sikuli/test.py
index 1fdd5696e01b..408825f81825 100644
--- a/tests/netedit/additionalElements/parkingspace/inspect_selection/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/parkingspace/inspect_selection/test.sikuli/test.py
@@ -103,4 +103,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/parkingspace/lock_unlock/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/lock_unlock/test.sikuli/test.py
index 4021b765cd85..d88c3d461ff4 100644
--- a/tests/netedit/additionalElements/parkingspace/lock_unlock/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/parkingspace/lock_unlock/test.sikuli/test.py
@@ -91,4 +91,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/parkingspace/move/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/move/test.sikuli/test.py
index 8390c33c506e..7a13025b4364 100644
--- a/tests/netedit/additionalElements/parkingspace/move/test.sikuli/test.py
+++ b/tests/netedit/additionalElements/parkingspace/move/test.sikuli/test.py
@@ -70,4 +70,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/basic/open_configuration/test.sikuli/test.py b/tests/netedit/basic/open_configuration/test.sikuli/test.py
index c1bf03ea5a4a..2e517e12d45a 100644
--- a/tests/netedit/basic/open_configuration/test.sikuli/test.py
+++ b/tests/netedit/basic/open_configuration/test.sikuli/test.py
@@ -23,7 +23,7 @@
 import neteditTestFunctions as netedit  # noqa
 
 # Open netedit without search the pink square reference
-neteditProcess, match= netedit.setupAndStart(neteditTestRoot, ['--configuration-file', 'input_net.netccfg'])
+neteditProcess, match = netedit.setupAndStart(neteditTestRoot, ['--configuration-file', 'input_net.netccfg'])
 
 # save loaded network as (for texttest comparing)
 netedit.saveNetwork()
diff --git a/tests/netedit/bugs/processing/ticket3994/test.sikuli/test.py b/tests/netedit/bugs/processing/ticket3994/test.sikuli/test.py
index db3a00f85891..0aa416e53a86 100644
--- a/tests/netedit/bugs/processing/ticket3994/test.sikuli/test.py
+++ b/tests/netedit/bugs/processing/ticket3994/test.sikuli/test.py
@@ -32,7 +32,7 @@
 netedit.selectMode()
 
 # select node 1
-netedit.leftClick(match, 315, 220) 
+netedit.leftClick(match, 315, 220)
 
 # select node 2
 netedit.leftClick(match, 415, 220)
diff --git a/tests/netedit/bugs/ticket3900/test.sikuli/test.py b/tests/netedit/bugs/ticket3900/test.sikuli/test.py
index 279bb08d7d28..271c5d4fb0ee 100644
--- a/tests/netedit/bugs/ticket3900/test.sikuli/test.py
+++ b/tests/netedit/bugs/ticket3900/test.sikuli/test.py
@@ -30,4 +30,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess, True, True, True, False)
-
diff --git a/tests/netedit/netElements/edges/inspectB/test.sikuli/test.py b/tests/netedit/netElements/edges/inspectB/test.sikuli/test.py
index c158e1c57b9f..644d68413f22 100644
--- a/tests/netedit/netElements/edges/inspectB/test.sikuli/test.py
+++ b/tests/netedit/netElements/edges/inspectB/test.sikuli/test.py
@@ -62,7 +62,8 @@
 netedit.modifyAttribute(10, "")
 
 # Change parameter 10 with a valid value (empty)
-netedit.modifyAttribute(10, "emergency authority army vip passenger hov bus coach tram rail_urban rail rail_electric motorcycle moped pedestrian custom1")
+netedit.modifyAttribute(
+    10, "emergency authority army vip passenger hov bus coach tram rail_urban rail rail_electric motorcycle moped pedestrian custom1")
 
 # Change parameter 11 with an non valid value (dummy)
 netedit.modifyAttribute(11, "dummyShape")
diff --git a/tests/netedit/neteditTestFunctions.py b/tests/netedit/neteditTestFunctions.py
index 6b6fb4e15b15..3ffee296a74b 100644
--- a/tests/netedit/neteditTestFunctions.py
+++ b/tests/netedit/neteditTestFunctions.py
@@ -36,7 +36,7 @@
 # interaction functions
 #################################################
 
-""" 
+"""
 @brief type escape key
 """
 
@@ -149,7 +149,7 @@ def leftClick(match, positionx, positiony):
     click(clickedPosition)
     print "TestFunctions: Clicked over position", clickedPosition.x, '-', clickedPosition.y
 
-    
+
 """
 @brief do left click over a position relative to match (pink square) while shift key is pressed
 """
@@ -168,7 +168,7 @@ def leftClickShift(match, positionx, positiony):
     # Release Shift key (Sikulix function)
     keyUp(Key.SHIFT)
 
-    
+
 """
 @brief do left click over a position relative to match (pink square) while control key is pressed
 """
@@ -186,8 +186,8 @@ def leftClickControl(match, positionx, positiony):
     print "TestFunctions: Clicked with Control key pressed over position", clickedPosition.x, '-', clickedPosition.y
     # Release Shift key (Sikulix function)
     keyUp(Key.CTRL)
-    
-    
+
+
 """
 @brief drag and drop from position 1 to position 2
 """
@@ -204,6 +204,7 @@ def dragDrop(match, x1, y1, x2, y2):
 # basic functions
 #################################################
 
+
 """
 @brief setup Netedit
 """
@@ -326,6 +327,7 @@ def setupAndStart(testRoot, extraParameters=[], debugInformation=True, searchRef
         click(Region(200, 200, 10, 10))
         return NeteditProcess
 
+
 """
 @brief rebuild network
 """
@@ -343,7 +345,7 @@ def rebuildNetwork():
 def rebuildNetworkWithVolatileOptions(question=True):
     typeTwoKeys(Key.F5, Key.SHIFT)
     # confirm recompute
-    if question == True:
+    if question is True:
         waitQuestion('y')
     else:
         waitQuestion('n')
@@ -446,8 +448,8 @@ def waitQuestion(answer):
 """
 
 
-def quit(NeteditProcess, openNetNonSavedDialog=False, saveNet=False, 
-         openAdditionalsNonSavedDialog=False, saveAdditionals=False, 
+def quit(NeteditProcess, openNetNonSavedDialog=False, saveNet=False,
+         openAdditionalsNonSavedDialog=False, saveAdditionals=False,
          openShapesNonSavedDialog=False, saveShapes=False):
     # check if Netedit is already closed
     if NeteditProcess.poll() is not None:
@@ -477,7 +479,7 @@ def quit(NeteditProcess, openNetNonSavedDialog=False, saveNet=False,
                 waitQuestion("s")
             else:
                 waitQuestion("q")
-                
+
         # Check if additionals must be saved
         if openShapesNonSavedDialog:
             # Wait some seconds
@@ -503,7 +505,7 @@ def quit(NeteditProcess, openNetNonSavedDialog=False, saveNet=False,
 """
 
 
-def openNetworkAs(waitTime = 2):
+def openNetworkAs(waitTime=2):
     # open save network as dialog
     typeTwoKeys("o", Key.CTRL)
     # jump to filename TextField
@@ -530,7 +532,7 @@ def saveNetwork():
 """
 
 
-def saveNetworkAs(waitTime = 2):
+def saveNetworkAs(waitTime=2):
     # open save network as dialog
     typeTwoKeys("s", Key.CTRL + Key.SHIFT)
     # jump to filename TextField
@@ -581,7 +583,7 @@ def openAboutDialog(waitingTime=DELAY_QUESTION):
 """
 
 
-def openConfigurationShortcut(waitTime = 2):
+def openConfigurationShortcut(waitTime=2):
     # open configuration dialog
     typeTwoKeys("o", Key.CTRL + Key.SHIFT)
     # jump to filename TextField
@@ -598,7 +600,7 @@ def openConfigurationShortcut(waitTime = 2):
 """
 
 
-def savePlainXML(waitTime = 2):
+def savePlainXML(waitTime=2):
     # open configuration dialog
     typeTwoKeys("l", Key.CTRL)
     # jump to filename TextField
@@ -613,7 +615,8 @@ def savePlainXML(waitTime = 2):
 # Create nodes and edges
 #################################################
 
-""" 
+
+"""
 @brief Change to create edge mode
 """
 
@@ -665,6 +668,7 @@ def changeTwoWayOption():
 # Inspect mode
 #################################################
 
+
 """
 @brief go to inspect mode
 """
@@ -673,6 +677,7 @@ def changeTwoWayOption():
 def inspectMode():
     typeKey("i")
 
+
 """
 @brief modify attribute of type int/float/string
 """
@@ -708,6 +713,7 @@ def modifyBoolAttribute(attributeNumber):
 # Move mode
 #################################################
 
+
 """
 @brief set move mode
 """
@@ -717,7 +723,7 @@ def moveMode():
     typeKey("m")
 
 
-"""    
+"""
 @brief move element
 """
 
@@ -734,6 +740,7 @@ def moveElement(match, startX, startY, endX, endY):
 # crossings
 #################################################
 
+
 """
 @brief Change to crossing mode
 """
@@ -833,6 +840,7 @@ def crossingInvertEdges(useSelectedEdges=False, thereIsSelectedEdges=False):
 # additionals
 #################################################
 
+
 """
 @brief change to additional mode
 """
@@ -856,7 +864,7 @@ def changeAdditional(additional):
     pasteIntoTextField(additional)
     # type enter to save change
     typeEnter()
-    
+
 
 """
 @brief modify default int/double/string value of an additional
@@ -985,6 +993,7 @@ def fixStoppingPlace(solution):
 # delete
 #################################################
 
+
 """
 @brief Change to delete mode
 """
@@ -1032,6 +1041,7 @@ def waitAutomaticallyDeleteAdditionalsWarning():
 # select mode
 #################################################
 
+
 """
 @brief Change to select mode
 """
@@ -1094,6 +1104,8 @@ def lockSelection(glType):
         typeTab()
     # type enter to save change
     typeSpace()
+
+
 """
 @brief select elements with default frame values
 """
@@ -1115,7 +1127,7 @@ def selectDefault():
 
 def saveSelection():
     focusOnFrame()
-    #jump to save
+    # jump to save
     for x in range(0, 24):
         typeTab()
     typeSpace()
@@ -1124,8 +1136,8 @@ def saveSelection():
     filename = os.path.join(textTestSandBox, "selection.txt")
     pasteIntoTextField(filename)
     typeEnter()
-    
-    
+
+
 """
 @brief save selection
 """
@@ -1133,7 +1145,7 @@ def saveSelection():
 
 def loadSelection():
     focusOnFrame()
-    #jump to save
+    # jump to save
     for x in range(0, 25):
         typeTab()
     typeSpace()
@@ -1142,7 +1154,7 @@ def loadSelection():
     filename = os.path.join(textTestSandBox, "selection.txt")
     pasteIntoTextField(filename)
     typeEnter()
-    
+
 
 """
 @brief select items
@@ -1309,6 +1321,7 @@ def selectionToogleEdges():
 # traffic light
 #################################################
 
+
 """
 @brief Change to traffic light mode
 """
@@ -1336,6 +1349,7 @@ def createTLS():
 # shapes
 #################################################
 
+
 """
 @brief change to shape mode
 """
@@ -1360,10 +1374,12 @@ def changeShape(shape):
     # type enter to save change
     typeEnter()
 
+
 """
 @brief Create squared Polygon in position with a certain size
 """
 
+
 def createSquaredPoly(match, positionx, positiony, size, close):
     # focus current frame
     focusOnFrame()
@@ -1375,7 +1391,7 @@ def createSquaredPoly(match, positionx, positiony, size, close):
     leftClick(match, positionx - (size/2), positiony - (size/2))
     leftClick(match, positionx - (size/2), positiony)
     # check if polygon has to be closed
-    if(close == True):
+    if (close is True):
         leftClick(match, positionx, positiony)
     # finish draw
     typeEnter()
@@ -1385,6 +1401,7 @@ def createSquaredPoly(match, positionx, positiony, size, close):
 @brief Create rectangle Polygon in position with a certain size
 """
 
+
 def createRectangledPoly(match, positionx, positiony, sizex, sizey, close):
     # focus current frame
     focusOnFrame()
@@ -1396,7 +1413,7 @@ def createRectangledPoly(match, positionx, positiony, sizex, sizey, close):
     leftClick(match, positionx - (sizex/2), positiony - (sizey/2))
     leftClick(match, positionx - (sizex/2), positiony)
     # check if polygon has to be closed
-    if(close == True):
+    if (close is True):
         leftClick(match, positionx, positiony)
     # finish draw
     typeEnter()
@@ -1406,6 +1423,7 @@ def createRectangledPoly(match, positionx, positiony, sizex, sizey, close):
 @brief Create line Polygon in position with a certain size
 """
 
+
 def createLinePoly(match, positionx, positiony, sizex, sizey, close):
     # focus current frame
     focusOnFrame()
@@ -1415,11 +1433,12 @@ def createLinePoly(match, positionx, positiony, sizex, sizey, close):
     leftClick(match, positionx, positiony)
     leftClick(match, positionx - (sizex/2), positiony - (sizey/2))
     # check if polygon has to be closed
-    if(close == True):
+    if (close is True):
         leftClick(match, positionx, positiony)
     # finish draw
     typeEnter()
 
+
 """
 @brief modify default int/double/string value of an shape
 """
diff --git a/tests/netedit/selection/select_basic/test.sikuli/test.py b/tests/netedit/selection/select_basic/test.sikuli/test.py
index 9f1b0c568f87..8415077b0ffc 100644
--- a/tests/netedit/selection/select_basic/test.sikuli/test.py
+++ b/tests/netedit/selection/select_basic/test.sikuli/test.py
@@ -65,4 +65,4 @@
 netedit.saveShapes()
 
 # quit netedit
-netedit.quit(neteditProcess)
\ No newline at end of file
+netedit.quit(neteditProcess)
diff --git a/tests/netedit/selection/select_load_selection/test.sikuli/test.py b/tests/netedit/selection/select_load_selection/test.sikuli/test.py
index fca3b2635744..00e1453a5139 100644
--- a/tests/netedit/selection/select_load_selection/test.sikuli/test.py
+++ b/tests/netedit/selection/select_load_selection/test.sikuli/test.py
@@ -31,7 +31,7 @@
 # save selection
 netedit.loadSelection()
 
-#check undo-redo
+# check undo-redo
 netedit.undo(match, 1)
 netedit.redo(match, 1)
 
diff --git a/tests/netedit/selection/select_lockselection/test.sikuli/test.py b/tests/netedit/selection/select_lockselection/test.sikuli/test.py
index ababe44f9750..015481950267 100644
--- a/tests/netedit/selection/select_lockselection/test.sikuli/test.py
+++ b/tests/netedit/selection/select_lockselection/test.sikuli/test.py
@@ -136,5 +136,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
-
diff --git a/tests/netedit/selection/select_rectangle/test.sikuli/test.py b/tests/netedit/selection/select_rectangle/test.sikuli/test.py
index b88ecb19bf5d..8d1c5730bb1f 100644
--- a/tests/netedit/selection/select_rectangle/test.sikuli/test.py
+++ b/tests/netedit/selection/select_rectangle/test.sikuli/test.py
@@ -31,7 +31,7 @@
 # go to select mode
 netedit.selectMode()
 
-# select manually the junction center 
+# select manually the junction center
 netedit.leftClick(match, 320, 220)
 
 # use a rectangle to check add mode
@@ -43,7 +43,7 @@
 # Select "remove" mode
 netedit.modificationModeRemove()
 
-# select manually the junction center 
+# select manually the junction center
 netedit.leftClick(match, 320, 220)
 
 # use a rectangle to check remove mode
@@ -82,4 +82,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/selection/select_toogle_edges/test.sikuli/test.py b/tests/netedit/selection/select_toogle_edges/test.sikuli/test.py
index f73260d9511b..ddb1d90ef787 100644
--- a/tests/netedit/selection/select_toogle_edges/test.sikuli/test.py
+++ b/tests/netedit/selection/select_toogle_edges/test.sikuli/test.py
@@ -58,4 +58,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/shapeElements/poi/inspect/test.sikuli/test.py b/tests/netedit/shapeElements/poi/inspect/test.sikuli/test.py
index ca9e23a20d22..70fd23f60a03 100644
--- a/tests/netedit/shapeElements/poi/inspect/test.sikuli/test.py
+++ b/tests/netedit/shapeElements/poi/inspect/test.sikuli/test.py
@@ -133,7 +133,7 @@
 # Change parameter 9 with a non valid value (empty)
 netedit.modifyAttribute(12, "")
 
-# Change parameter 9 with a valid value 
+# Change parameter 9 with a valid value
 netedit.modifyAttribute(12, "3.73,74.30")
 
 # Change boolean parameter GEO
diff --git a/tests/netedit/shapeElements/poilane/inspect/test.sikuli/test.py b/tests/netedit/shapeElements/poilane/inspect/test.sikuli/test.py
index b738f52c452e..ad6678cb1c24 100644
--- a/tests/netedit/shapeElements/poilane/inspect/test.sikuli/test.py
+++ b/tests/netedit/shapeElements/poilane/inspect/test.sikuli/test.py
@@ -165,4 +165,4 @@
 netedit.saveNetwork()
 
 # quit netedit
-netedit.quit(neteditProcess)
\ No newline at end of file
+netedit.quit(neteditProcess)
diff --git a/tests/netedit/shapeElements/poly/inspect/test.sikuli/test.py b/tests/netedit/shapeElements/poly/inspect/test.sikuli/test.py
index a6372707f290..24009c2e13df 100644
--- a/tests/netedit/shapeElements/poly/inspect/test.sikuli/test.py
+++ b/tests/netedit/shapeElements/poly/inspect/test.sikuli/test.py
@@ -65,7 +65,8 @@
 netedit.modifyAttribute(1, "12.00,8.00")
 
 # Change parameter 1 with a valid value
-netedit.modifyAttribute(1, "12.00,8.00 9.00,13.00 12.00,18.00 7.00,15.00 2.00,18.00 5.00,13.00 2.00,8.00 7.00,11.00 12.00,8.00")
+netedit.modifyAttribute(
+    1, "12.00,8.00 9.00,13.00 12.00,18.00 7.00,15.00 2.00,18.00 5.00,13.00 2.00,8.00 7.00,11.00 12.00,8.00")
 
 # Change parameter 2 with a non valid value (dummy)
 netedit.modifyAttribute(3, "dummyColor")
@@ -119,7 +120,8 @@
 netedit.modifyAttribute(9, "10")
 
 # Change parameter 9 with a valid value
-netedit.modifyAttribute(11, "-13.00,8.00 -8.00,13.00 -13.00,18.00 -18.00,23.00 -23.00,18.00 -28.00,13.00 -23.00,8.00 -18.00,3.00 -13.00,8.00")
+netedit.modifyAttribute(
+    11, "-13.00,8.00 -8.00,13.00 -13.00,18.00 -18.00,23.00 -23.00,18.00 -28.00,13.00 -23.00,8.00 -18.00,3.00 -13.00,8.00")
 
 # Change boolean parameter 10
 netedit.modifyShapeDefaultBoolValue(12)
@@ -144,4 +146,4 @@
 netedit.saveNetwork()
 
 # quit netedit
-netedit.quit(neteditProcess)
\ No newline at end of file
+netedit.quit(neteditProcess)
diff --git a/tests/netedit/shapeElements/poly/move/test.sikuli/test.py b/tests/netedit/shapeElements/poly/move/test.sikuli/test.py
index 6a8aca2f5f9f..b7cc5a7ee409 100644
--- a/tests/netedit/shapeElements/poly/move/test.sikuli/test.py
+++ b/tests/netedit/shapeElements/poly/move/test.sikuli/test.py
@@ -88,4 +88,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/trafficLights/save/test.sikuli/test.py b/tests/netedit/trafficLights/save/test.sikuli/test.py
index e037096091b9..cac9459974ab 100644
--- a/tests/netedit/trafficLights/save/test.sikuli/test.py
+++ b/tests/netedit/trafficLights/save/test.sikuli/test.py
@@ -60,4 +60,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/runInternalTests.py b/tests/runInternalTests.py
index 5971de3ac0f0..c401f3be44af 100755
--- a/tests/runInternalTests.py
+++ b/tests/runInternalTests.py
@@ -76,6 +76,7 @@ def runInternal(suffix, args, out=sys.stdout, guiTests=False, console=False, chr
     subprocess.call("%s %s -a %s" % (ttBin, args, apps), env=os.environ,
                     stdout=out, stderr=out, shell=True)
 
+
 if __name__ == "__main__":
     optParser = optparse.OptionParser()
     optParser.add_option("-s", "--suffix", default="",
diff --git a/tests/texttestDiff.py b/tests/texttestDiff.py
index 41e5493c0fc1..715c50db7ffa 100755
--- a/tests/texttestDiff.py
+++ b/tests/texttestDiff.py
@@ -46,8 +46,8 @@
         or ".net.xml" in orig):
     sumo = os.environ["GUISIM_BINARY"]
     extraArgs = []
-    #extraArgs += ["--gui-settings-file", "/scr2/debug/000_view_settings/internal_junctions.xml"]
-    #extraArgs += ["--gui-settings-file", "/scr2/debug/000_view_settings/junctions.xml"]
-    #extraArgs += ["--gui-settings-file", "/scr2/debug/000_view_settings/junctionType.xml"]
+    # extraArgs += ["--gui-settings-file", "/scr2/debug/000_view_settings/internal_junctions.xml"]
+    # extraArgs += ["--gui-settings-file", "/scr2/debug/000_view_settings/junctions.xml"]
+    # extraArgs += ["--gui-settings-file", "/scr2/debug/000_view_settings/junctionType.xml"]
     subprocess.Popen([sumo, "-n", orig, "-e", "3600"] + extraArgs)
     subprocess.Popen([sumo, "-n", new, "-e", "3600"] + extraArgs)
diff --git a/tests/tools/assign/costFunctionChecker/costFunction.py b/tests/tools/assign/costFunctionChecker/costFunction.py
index 5249fc66308b..f906e7712275 100644
--- a/tests/tools/assign/costFunctionChecker/costFunction.py
+++ b/tests/tools/assign/costFunctionChecker/costFunction.py
@@ -12,7 +12,6 @@
 # @version $Id$
 
 
-
 def constant(edge, weight):
     if edge == "middle" or edge == "left":
         return weight
diff --git a/tests/tools/sumolib/net/runner.py b/tests/tools/sumolib/net/runner.py
index 84350eafe116..ad2b6207e609 100755
--- a/tests/tools/sumolib/net/runner.py
+++ b/tests/tools/sumolib/net/runner.py
@@ -9,7 +9,7 @@
 
 # @file    runner.py
 # @author  Jakob Erdmann
-# @date    
+# @date
 # @version $Id$
 
 from __future__ import absolute_import
@@ -33,7 +33,7 @@
     ' '.join(sorted([l.getID() for l in lane2.getIncoming()]))))
 
 print("connections from %s:\n%s" % (
-    lane.getID(), 
+    lane.getID(),
     '\n'.join(list(map(str, lane.getOutgoing())))))
 print("outgoing internal lanes of %s: %s" % (
     lane.getID(),
diff --git a/tests/tools/sumolib/net_roundabout/runner.py b/tests/tools/sumolib/net_roundabout/runner.py
index bf686c722b13..096268146166 100755
--- a/tests/tools/sumolib/net_roundabout/runner.py
+++ b/tests/tools/sumolib/net_roundabout/runner.py
@@ -9,7 +9,7 @@
 
 # @file    runner.py
 # @author  Jakob Erdmann
-# @date    
+# @date
 # @version $Id$
 
 from __future__ import absolute_import
@@ -19,7 +19,7 @@
 import os
 import sys
 sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools'))
-import sumolib.net
+import sumolib.net  # noqa
 
 net = sumolib.net.readNet(sys.argv[1])
 for r in net.getRoundabouts():
diff --git a/tests/tools/sumolib/sumolib3d/unittests_shapes_coords_3d.py b/tests/tools/sumolib/sumolib3d/unittests_shapes_coords_3d.py
index 3c22b831b049..6da9011aa1c8 100755
--- a/tests/tools/sumolib/sumolib3d/unittests_shapes_coords_3d.py
+++ b/tests/tools/sumolib/sumolib3d/unittests_shapes_coords_3d.py
@@ -47,7 +47,7 @@ def setUpClass(cls):
 #        print ('xxxxxxxxxxxxxxxxxxx', netcon_bin)
 
         for node_file, net_file in [
-                #(NODEFILE_2D, NETFILE_2D),
+                # (NODEFILE_2D, NETFILE_2D),
                 (NODEFILE_3D, NETFILE_3D)
         ]:
 
@@ -81,7 +81,7 @@ def tearDownClass(cls):
         if os.path.exists(NETFILE_3D):
             os.remove(NETFILE_3D)
 
-    #### check node's coords ############################################
+    # check node's coords
     @unittest.skipIf(False, '')
     def test_check_node_coords_2d_for_3d_input_node_no_z(self):
         """ test to retrive the coords from a node with no z value
@@ -122,7 +122,7 @@ def test_check_node_coords_3d_for_3d_input_node_z_not_zero(self):
             self.sumo_net.getNode('a1').getCoord3D(),
             (200.0, 0.0, 10.0))
 
-    #### check node's shape #############################################
+    # check node's shape
 
     @unittest.skipIf(False, '')
     def test_check_node_shape_2d_on_a_node_with_no_z(self):
@@ -167,15 +167,15 @@ def test_check_node_shape_3d_on_a_node_with_z(self):
         for shape_point in result:
             self.assertTrue(len(shape_point) == 3)
 
-    #### check edge's shape #############################################
+    # check edge's shape
     @unittest.skipIf(False, '')
     def test_h001_edge_shape_not_stored(self):
-        """ 
+        """
 
         The edge is the center line of an H (both directions,
         one lane per edge).
 
-        Junction shapes are engaged so the lane of the edge 
+        Junction shapes are engaged so the lane of the edge
         is somewhat shorter at the start and at the end.
 
         Shape of the edge _is_not_ stored in sumo's net xml
@@ -186,7 +186,7 @@ def test_h001_edge_shape_not_stored(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'center_we_0'
 
-        #### check edge shape ################################
+        # check edge shape
         expected_result_raw_edge_shape_2D = \
             [(1000, 100), (1200, 100)]
 
@@ -204,12 +204,12 @@ def test_h001_edge_shape_not_stored(self):
 
     @unittest.skipIf(False, '')
     def test_h001_edge_shape_not_stored(self):
-        """ 
+        """
 
         The edge is the center line of an H (both directions,
         one lane per edge) with one extra shape point.
 
-        Junction shapes are engaged so the lane of the edge 
+        Junction shapes are engaged so the lane of the edge
         is somewhat shorter at the start and at the end.
 
         Shape of the edge _is_ stored in sumo's net xml
@@ -220,7 +220,7 @@ def test_h001_edge_shape_not_stored(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'center_we_0'
 
-        #### check edge shape ################################
+        # check edge shape
         expected_result_raw_edge_shape_2D = \
             [(1200, 100), (1100, 125), (1000, 100)]
 
@@ -236,15 +236,15 @@ def test_h001_edge_shape_not_stored(self):
         self.assertEqual(result_raw_edge_shape_3D,
                          expected_result_raw_edge_shape_3D)
 
-    #### check lane's shape #############################################
+    # check lane's shape
     @unittest.skipIf(False, '')
     def test_h001_lane_shape_2d(self):
-        """ 
+        """
 
         The edge is the center line of an H (both directions,
         one lane per edge).
 
-        Junction shapes are engaged so the lane of the edge 
+        Junction shapes are engaged so the lane of the edge
         is somewhat shorter at the start and at the end.
 
         2d version
@@ -254,7 +254,7 @@ def test_h001_lane_shape_2d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'center_we_0'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape(includeJunctions=False)
@@ -272,7 +272,7 @@ def test_h001_lane_shape_2d(self):
         self.assertTrue(1000 < result_end_point_wo[0] < 1200)     # x
         self.assertTrue(90 < result_end_point_wo[1] < 100)     # y
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape(includeJunctions=True)
@@ -300,12 +300,12 @@ def test_h001_lane_shape_2d(self):
 
     @unittest.skipIf(False, '')
     def test_h001_lane_shape_3d(self):
-        """ 
+        """
 
         The edge is the center line of an H (both directions,
         one lane per edge).
 
-        Junction shapes are engaged so the lane of the edge 
+        Junction shapes are engaged so the lane of the edge
         is somewhat shorter at the start and at the end.
 
         3d version
@@ -315,7 +315,7 @@ def test_h001_lane_shape_3d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'center_we_0'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape3D(includeJunctions=False)
@@ -335,7 +335,7 @@ def test_h001_lane_shape_3d(self):
         self.assertTrue(90 < result_end_point_wo[1] < 100)     # y
         self.assertTrue(result_end_point_wo[2] == 10)     # z
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape3D(includeJunctions=True)
@@ -365,17 +365,17 @@ def test_h001_lane_shape_3d(self):
 
     @unittest.skipIf(False, '')
     def test_h003_lane_shape_2d(self):
-        """ 
+        """
 
         The edge is the we-center line of an H (both directions,
         one lane per edge).
 
         This edge is not a straight line but has shape points defined.
 
-        Junction shapes are engaged so the lanes of the edge 
+        Junction shapes are engaged so the lanes of the edge
         are somewhat shorter at the start and at the end.
 
-        Still the edge goes from from to to node, so the shape 
+        Still the edge goes from from to to node, so the shape
         should start and end with these coords.
 
         2d version.
@@ -385,7 +385,7 @@ def test_h003_lane_shape_2d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(1)  # 'center_ew_1'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape(includeJunctions=False)
@@ -408,7 +408,7 @@ def test_h003_lane_shape_2d(self):
         self.assertTrue(1000 < result_end_point_wo[0] < 1200)  # x
         self.assertTrue(100 < result_end_point_wo[1] < 110)  # y
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape(includeJunctions=True)
@@ -443,17 +443,17 @@ def test_h003_lane_shape_2d(self):
 
     @unittest.skipIf(False, '')
     def test_h003_lane_shape_3d(self):
-        """ 
+        """
 
         The edge is the we-center line of an H (both directions,
         one lane per edge).
 
         This edge is not a straight line but has shape points defined.
 
-        Junction shapes are engaged so the lanes of the edge 
+        Junction shapes are engaged so the lanes of the edge
         are somewhat shorter at the start and at the end.
 
-        Still the edge goes from from to to node, so the shape 
+        Still the edge goes from from to to node, so the shape
         should start and end with these coords.
 
         3d version.
@@ -463,7 +463,7 @@ def test_h003_lane_shape_3d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(1)  # 'center_ew_1'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape3D(includeJunctions=False)
@@ -489,7 +489,7 @@ def test_h003_lane_shape_3d(self):
         self.assertTrue(100 < result_end_point_wo[1] < 110)  # y
         self.assertTrue(result_end_point_wo[2] == 10)  # z
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape3D(includeJunctions=True)
@@ -527,7 +527,7 @@ def test_h003_lane_shape_3d(self):
 
     @unittest.skipIf(False, '')
     def test_h004_lane_shape_2d(self):
-        """Get an internal lane and its shape. 
+        """Get an internal lane and its shape.
 
         Shape should not be influenced by the incluldeJunc parameter
 
@@ -562,7 +562,7 @@ def test_h004_lane_shape_2d(self):
 
     @unittest.skipIf(False, '')
     def test_h004_lane_shape_3d(self):
-        """Get an internal lane and its shape. 
+        """Get an internal lane and its shape.
 
         Shape should not be influenced by the incluldeJunc parameter
 
@@ -598,10 +598,10 @@ def test_h004_lane_shape_3d(self):
 
     @unittest.skipIf(False, '')
     def test_edge_001_lane_shape_2d(self):
-        """ 
+        """
 
-        Both way edge is the straight line between two nodes 
-        edge has no extra shape points - no intersections engaged.  
+        Both way edge is the straight line between two nodes
+        edge has no extra shape points - no intersections engaged.
         Edge is not centered.
 
         2d version.
@@ -611,7 +611,7 @@ def test_edge_001_lane_shape_2d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'straight_with_counter_0'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape(includeJunctions=False)
@@ -629,7 +629,7 @@ def test_edge_001_lane_shape_2d(self):
         self.assertTrue(100 <= result_end_point_wo[0] <= 200)   # x
         self.assertTrue(-10 <= result_end_point_wo[1] < 0)   # y
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape(includeJunctions=True)
@@ -659,10 +659,10 @@ def test_edge_001_lane_shape_2d(self):
 
     @unittest.skipIf(False, '')
     def test_edge_001_lane_shape_3d(self):
-        """ 
+        """
 
-        Both way edge is the straight line between two nodes 
-        edge has no extra shape points - no intersections engaged.  
+        Both way edge is the straight line between two nodes
+        edge has no extra shape points - no intersections engaged.
         Edge is not centered.
 
         3d version.
@@ -672,7 +672,7 @@ def test_edge_001_lane_shape_3d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'straight_with_counter_0'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape3D(includeJunctions=False)
@@ -692,7 +692,7 @@ def test_edge_001_lane_shape_3d(self):
         self.assertTrue(-10 <= result_end_point_wo[1] < 0)   # y
         self.assertTrue(result_end_point_wo[2] == 10)   # z
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape3D(includeJunctions=True)
@@ -724,15 +724,15 @@ def test_edge_001_lane_shape_3d(self):
 
     @unittest.skipIf(False, '')
     def test_sloopy_edge_003_lane_shape_2d(self):
-        """ 
+        """
 
-        Both way edge which is a sloopy line between two Nodes 
-        since the edge has extra shape points 
-        - no intersections engaged.  
+        Both way edge which is a sloopy line between two Nodes
+        since the edge has extra shape points
+        - no intersections engaged.
 
         There was only one shape point defined in the edge.xml
         The coord of the from and to node where not included
-        (since this is optional 
+        (since this is optional
         - the counder direction does inclued them - see below)
 
         2d version.
@@ -742,7 +742,7 @@ def test_sloopy_edge_003_lane_shape_2d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'sloopy_we_0'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape(includeJunctions=False)
@@ -765,7 +765,7 @@ def test_sloopy_edge_003_lane_shape_2d(self):
         self.assertTrue(3000 <= result_end_point_wo[0] <= 3500)  # x
         self.assertTrue(190 <= result_end_point_wo[1] < 200)  # y
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape(includeJunctions=True)
@@ -800,15 +800,15 @@ def test_sloopy_edge_003_lane_shape_2d(self):
 
     @unittest.skipIf(False, '')
     def test_sloopy_edge_003_lane_shape_3d(self):
-        """ 
+        """
 
-        Both way edge which is a sloopy line between two Nodes 
-        since the edge has extra shape points 
-        - no intersections engaged.  
+        Both way edge which is a sloopy line between two Nodes
+        since the edge has extra shape points
+        - no intersections engaged.
 
         There was only one shape point defined in the edge.xml
         The coord of the from and to node where not included
-        (since this is optional 
+        (since this is optional
         - the counder direction does inclued them - see below)
 
         3d version.
@@ -818,7 +818,7 @@ def test_sloopy_edge_003_lane_shape_3d(self):
         the_edge = self.sumo_net.getEdge(edge_id)
         the_lane = the_edge.getLane(0)  # 'sloopy_we_0'
 
-        #### check lane shape - without junction included ####
+        # check lane shape - without junction included
 
         result_lane_shape_without_junc = \
             the_lane.getShape3D(includeJunctions=False)
@@ -844,7 +844,7 @@ def test_sloopy_edge_003_lane_shape_3d(self):
         self.assertTrue(190 <= result_end_point_wo[1] < 200)  # y
         self.assertTrue(result_end_point_wo[2] == 10)  # z
 
-        #### check lane shape - with junction included #######
+        # check lane shape - with junction included
 
         result_lane_shape_with_junc = \
             the_lane.getShape3D(includeJunctions=True)
@@ -882,12 +882,12 @@ def test_sloopy_edge_003_lane_shape_3d(self):
 
     @unittest.skipIf(False, '')
     def test_straight_edge_005_lane_shape_2d(self):
-        """ 
+        """
 
-        Single way edge with spread type center - no shape points 
-        - no intersections engaged.  
+        Single way edge with spread type center - no shape points
+        - no intersections engaged.
 
-        Shape of edge and lane are identic. 
+        Shape of edge and lane are identic.
 
         No junctions are included.
 
@@ -901,7 +901,7 @@ def test_straight_edge_005_lane_shape_2d(self):
         expected_result = \
             [(100.0, 100.0), (200.0, 100.0)]
 
-        #### check lane shape ################################
+        # check lane shape
 
         result_lane_shape_with_junc = \
             the_lane.getShape(includeJunctions=True)
@@ -917,12 +917,12 @@ def test_straight_edge_005_lane_shape_2d(self):
 
     @unittest.skipIf(False, '')
     def test_straight_edge_005_lane_shape(self):
-        """ 
+        """
 
-        Single way edge with spread type center - no shape points 
-        - no intersections engaged.  
+        Single way edge with spread type center - no shape points
+        - no intersections engaged.
 
-        Shape of edge and lane are identic. 
+        Shape of edge and lane are identic.
 
         No junctions are included.
 
@@ -936,7 +936,7 @@ def test_straight_edge_005_lane_shape(self):
         expected_result = \
             [(100.0, 100.0, 10.0),  (200.0, 100.0, 10.0)]
 
-        #### check lane shape ################################
+        # check lane shape
 
         result_lane_shape_with_junc = \
             the_lane.getShape3D(includeJunctions=True)