From: W. Trevor King <wking@tremily.us>
Date: Fri, 7 Mar 2014 04:21:17 +0000 (-0800)
Subject: irkerd: Drop simplejson replacement
X-Git-Tag: 2.7~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cc44ada060e677682d095224cc6bcfce8ca06809;p=irker.git

irkerd: Drop simplejson replacement

Since we no longer officially support Python 2.5, there's no *need* to
use a fallback JSON library.  Removing it makes our dependencies
cleaner, and JSON-parsing speed is not likely to be a large fraction
of irkerd cycles anyway.
---

diff --git a/irkerd b/irkerd
index 71a8c10..3f64ef9 100755
--- a/irkerd
+++ b/irkerd
@@ -45,10 +45,7 @@ import Queue
 import SocketServer
 import argparse
 import logging
-try:
-    import simplejson as json	# Faster, also makes us Python-2.4-compatible
-except ImportError:
-    import json
+import json
 import random
 import re
 import select