Merge pull request #757 from bryan-m-hughes/timob-6207

[TIMOB-6207] Replaced one dependency with a portable version so that pro...
tidev · Nov 23, 2011 · 821fd58 · 821fd58
2 parents 81b6c3a + 397188c
commit 821fd58
Show file tree

Hide file tree

Showing 46 changed files with 9,208 additions and 1 deletion.
diff --git a/support/mobileweb/compiler.py b/support/mobileweb/compiler.py
@@ -4,11 +4,12 @@
 # Project Compiler
 #
 
-import os, sys, re, shutil, time, base64, sgmllib, codecs, xml, json
+import os, sys, re, shutil, time, base64, sgmllib, codecs, xml
 
 # Add the Android support dir, since mako is located there, and import mako
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),"..", "android")))
 import mako.template
+import simplejson as json
 
 template_dir = os.path.abspath(os.path.dirname(sys._getframe(0).f_code.co_filename))
 from tiapp import *

diff --git a/support/mobileweb/mako/__init__.py b/support/mobileweb/mako/__init__.py
@@ -0,0 +1,6 @@
+# __init__.py
+# Copyright (C) 2006, 2007, 2008 Michael Bayer mike_mp@zzzcomputing.com
+#
+# This module is part of Mako and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+