Use faster json if available

Considered faster according to:
http://stackoverflow.com/questions/712791/json-and-simplejson-module-differences-in-python
http://stackoverflow.com/questions/706101/python-json-decoding-performance

As a side-effect, it might make irker work under Python versions older than 2.6.

Signed-off-by: Eric S. Raymond <esr@thyrsus.com>

diff --git a/irkerd b/irkerd
index 5785ce5dcebd266f91e41f7aeaee39a1aef819e7..51e13c274ad5a8460ebcfb9f0ee1c8fda0b71819 100755 (executable)
--- a/irkerd
+++ b/irkerd
@@ -58,9 +58,11 @@ except ImportError:
     CONNECTION_MAX = 200
     green_threads = False
 
-import sys, json, getopt, urlparse, time, random
+import sys, getopt, urlparse, time, random
 import threading, Queue, SocketServer
 import irc.client, logging
+try: import simplejson as json
+except ImportError: import json
 
 version = "1.5"
 

diff --git a/irkerhook.py b/irkerhook.py
index 46193108a6683522a1225767607512160324c407..0d1e284d94a2be61521a197eb9122c7ff2973b56 100755 (executable)
--- a/irkerhook.py
+++ b/irkerhook.py
@@ -37,8 +37,10 @@ default_channels = "irc://chat.freenode.net/%(project)s,irc://chat.freenode.net/
 # No user-serviceable parts below this line:
 #
 
-import os, sys, commands, socket, urllib, json
+import os, sys, commands, socket, urllib
 from pipes import quote as shellquote
+try: import simplejson as json
+except ImportError: import json
 
 version = "1.5"