Author: ai0867
Date: Sun Nov 6 19:38:21 2011
New Revision: 51895
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51895&view=rev
Log:
Use distributed-with-python-since-2.6 json if simplejson isn't available
Modified:
trunk/data/tools/wesnoth/libgithub.py
Modified: trunk/data/tools/wesnoth/libgithub.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth/libgithub.py?rev=51895&r1=51894&r2=51895&view=diff
==============================================================================
--- trunk/data/tools/wesnoth/libgithub.py (original)
+++ trunk/data/tools/wesnoth/libgithub.py Sun Nov 6 19:38:21 2011
@@ -7,7 +7,12 @@
import logging
import os
-import simplejson as json
+try:
+ # Externally distributed, usually more up-to-date
+ import simplejson as json
+except:
+ # Distributed with python since 2.6
+ import json
import subprocess
import urllib2
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
