json, icon, and misc fixes and improvements made to ejpi/gonvert

[gc-dialer] / dialcentral / backends / gvoice / gvoice.py

diff --git a/dialcentral/backends/gvoice/gvoice.py b/dialcentral/backends/gvoice/gvoice.py
index b0825ef..5ea83d5 100755 (executable)
--- a/dialcentral/backends/gvoice/gvoice.py
+++ b/dialcentral/backends/gvoice/gvoice.py
@@ -41,10 +41,14 @@ from xml.sax import saxutils
 from xml.etree import ElementTree
 
 try:
 from xml.etree import ElementTree
 
 try:

-       import simplejson as _simplejson
-       simplejson = _simplejson
+       import json as _json
+       simplejson = _json

 except ImportError:
 except ImportError:

-       simplejson = None
+       try:
+               import simplejson as _simplejson
+               simplejson = _simplejson
+       except ImportError:
+               simplejson = None

 
 import browser_emu
 
 
 import browser_emu