From: W. Trevor King <wking@tremily.us>
Date: Fri, 7 Mar 2014 04:21:05 +0000 (-0800)
Subject: irkerd: Split imported modules onto their own lines
X-Git-Tag: 2.7~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14c51234d80471d44c5bed388a236f64b57e8bbf;p=irker.git

irkerd: Split imported modules onto their own lines

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
---

diff --git a/irkerd b/irkerd
index ea5f25e..1a1739e 100755
--- a/irkerd
+++ b/irkerd
@@ -45,12 +45,23 @@ CONNECTION_MAX = 200		# To avoid hitting a thread limit
 
 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:
 #