From 902b5947a7bf77f56c2c0bf7aa1a29d42ffd3bd9 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Tue, 6 Dec 2011 21:15:16 -0600
Subject: [PATCH] removed tabs from gluon/*.py

---
 VERSION                |  2 +-
 gluon/custom_import.py | 28 ++++++++++++++--------------
 gluon/portalocker.py   | 23 ++++++++++++-----------
 scripts/fixws.py       |  2 +-
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/VERSION b/VERSION
index a90da4d4..380df13a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-12-06 17:01:38) dev
+Version 1.99.3 (2011-12-06 21:15:07) dev
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index 15873f47..48ee0df3 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -67,14 +67,14 @@ class _BaseImporter(object):
         """
 
     def __call__(self, name, globals=None, locals=None,
-		 fromlist=None, level=-1):
+                 fromlist=None, level=-1):
         """
         The import method itself.
         """
         return _STANDARD_PYTHON_IMPORTER(name,
-					 globals,
-					 locals,
-					 fromlist,
+                                         globals,
+                                         locals,
+                                         fromlist,
                                          level)
 
     def end(self):
@@ -102,20 +102,19 @@ class _DateTrackerImporter(_BaseImporter):
         self._tl._modules_loaded = set()
 
     def __call__(self, name, globals=None, locals=None,
-		 fromlist=None, level=-1):
+                 fromlist=None, level=-1):
         """
         The import method itself.
         """
 
-	globals = globals or {}
-	locals = locals or {}
-	fromlist = fromlist or []
+        globals = globals or {}
+        locals = locals or {}
+        fromlist = fromlist or []
 
         call_begin_end = self._tl._modules_loaded is None
         if call_begin_end:
             self.begin()
-
-	try:
+        try:
             self._tl.globals = globals
             self._tl.locals = locals
             self._tl.level = level
@@ -252,14 +251,14 @@ class _Web2pyImporter(_BaseImporter):
         return False
 
     def __call__(self, name, globals=None, locals=None,
-		 fromlist=None, level=-1):
+                 fromlist=None, level=-1):
         """
         The import method itself.
         """
 
-	globals = globals or {}
-	locals = locals or {}
-	fromlist = fromlist or []
+        globals = globals or {}
+        locals = locals or {}
+        fromlist = fromlist or []
 
         self.begin()
         #try:
@@ -327,3 +326,4 @@ class _Web2pyDateTrackerImporter(_Web2pyImporter, _DateTrackerImporter):
 
 
 
+
diff --git a/gluon/portalocker.py b/gluon/portalocker.py
index 222f7565..c3bb007d 100644
--- a/gluon/portalocker.py
+++ b/gluon/portalocker.py
@@ -49,17 +49,17 @@ try:
     import google.appengine
     os_locking = 'gae'
 except:
-	try:
-		import fcntl
-		os_locking = 'posix'
-	except:
-		try:
-			import win32con
-			import win32file
-			import pywintypes
-			os_locking = 'windows'
-		except:
-			pass
+    try:
+        import fcntl
+        os_locking = 'posix'
+    except:
+        try:
+            import win32con
+            import win32file
+            import pywintypes
+            os_locking = 'windows'
+        except:
+            pass
 
 if os_locking == 'windows':
     LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
@@ -126,3 +126,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/scripts/fixws.py b/scripts/fixws.py
index 306d823a..744657d7 100755
--- a/scripts/fixws.py
+++ b/scripts/fixws.py
@@ -18,7 +18,7 @@ for filename in glob.glob(sys.argv[1]):
     data1 = read_fileb(filename)
     write_fileb(filename + '.bak2', data1)
     data2lines = read_fileb(filename).split('\n')
-    data2 = '\n'.join([line.rstrip() for line in data2lines])+'\n'
+    data2 = '\n'.join([line.rstrip().replace('\t','    '*2) for line in data2lines])+'\n'
     write_fileb(filename, data2)
     print filename, len(data1)-len(data2)