Following PEP 8 [1]:
Imports should usually be on separate lines, e.g.:
Yes: import os
import sys
No: import sys, os
This also makes it easier to read diffs that add and remove imports,
since you won't need a word-diff to see exactly what changed.
[1]: http://legacy.python.org/dev/peps/pep-0008/#imports
Conflicts:
irkerd
version = "2.6"
-import sys, getopt, urlparse, time, random, socket, signal, re
-import threading, Queue, SocketServer, select
+import Queue
+import SocketServer
+import getopt
try:
import simplejson as json # Faster, also makes us Python-2.4-compatible
except ImportError:
import json
+import random
+import re
+import select
+import signal
+import socket
+import sys
+import threading
+import time
+import urlparse
+
# Sketch of implementation:
#