Commits

Jason R. Coombs committed 6d909d9 Merge

Merge with cherrypy-3.2.x

Comments (0)

Files changed (1)

cherrypy/process/servers.py

             s.settimeout(timeout)
             s.connect((host, port))
             s.close()
+        except socket.error:
+            if s:
+                s.close()
+        else:
             raise IOError("Port %s is in use on %s; perhaps the previous "
                           "httpserver did not shut down properly." %
                           (repr(port), repr(host)))
-        except socket.error:
-            if s:
-                s.close()
 
 
 # Feel free to increase these defaults on slow systems:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.