dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed tabs from gluon/*.py

Browse Source
This commit is contained in:
Massimo Di Pierro
2011-12-06 21:15:16 -06:00
parent 3890cc103b
commit 902b5947a7
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.3 (2011-12-06 17:01:38) dev Version 1.99.3 (2011-12-06 21:15:07) dev
gluon/custom_import.py
+14 -14
View File
@@ -67,14 +67,14 @@ class _BaseImporter(object):
""" """
def __call__(self, name, globals=None, locals=None, def __call__(self, name, globals=None, locals=None,
fromlist=None, level=-1): fromlist=None, level=-1):
""" """
The import method itself. The import method itself.
""" """
return _STANDARD_PYTHON_IMPORTER(name, return _STANDARD_PYTHON_IMPORTER(name,
globals, globals,
locals, locals,
fromlist, fromlist,
level) level)
def end(self): def end(self):
@@ -102,20 +102,19 @@ class _DateTrackerImporter(_BaseImporter):
self._tl._modules_loaded = set() self._tl._modules_loaded = set()
def __call__(self, name, globals=None, locals=None, def __call__(self, name, globals=None, locals=None,
fromlist=None, level=-1): fromlist=None, level=-1):
""" """
The import method itself. The import method itself.
""" """
globals = globals or {} globals = globals or {}
locals = locals or {} locals = locals or {}
fromlist = fromlist or [] fromlist = fromlist or []
call_begin_end = self._tl._modules_loaded is None call_begin_end = self._tl._modules_loaded is None
if call_begin_end: if call_begin_end:
self.begin() self.begin()
try:
try:
self._tl.globals = globals self._tl.globals = globals
self._tl.locals = locals self._tl.locals = locals
self._tl.level = level self._tl.level = level
@@ -252,14 +251,14 @@ class _Web2pyImporter(_BaseImporter):
return False return False
def __call__(self, name, globals=None, locals=None, def __call__(self, name, globals=None, locals=None,
fromlist=None, level=-1): fromlist=None, level=-1):
""" """
The import method itself. The import method itself.
""" """
globals = globals or {} globals = globals or {}
locals = locals or {} locals = locals or {}
fromlist = fromlist or [] fromlist = fromlist or []
self.begin() self.begin()
#try: #try:
@@ -327,3 +326,4 @@ class _Web2pyDateTrackerImporter(_Web2pyImporter, _DateTrackerImporter):
gluon/portalocker.py
+12 -11
View File
@@ -49,17 +49,17 @@ try:
import google.appengine import google.appengine
os_locking = 'gae' os_locking = 'gae'
except: except:
try: try:
import fcntl import fcntl
os_locking = 'posix' os_locking = 'posix'
except: except:
try: try:
import win32con import win32con
import win32file import win32file
import pywintypes import pywintypes
os_locking = 'windows' os_locking = 'windows'
except: except:
pass pass
if os_locking == 'windows': if os_locking == 'windows':
LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
@@ -126,3 +126,4 @@ if __name__ == '__main__':
scripts/fixws.py
+1 -1
View File
@@ -18,7 +18,7 @@ for filename in glob.glob(sys.argv[1]):
data1 = read_fileb(filename) data1 = read_fileb(filename)
write_fileb(filename + '.bak2', data1) write_fileb(filename + '.bak2', data1)
data2lines = read_fileb(filename).split('\n') 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) write_fileb(filename, data2)
print filename, len(data1)-len(data2) print filename, len(data1)-len(data2)