R-2.9.12

CHANGELOG

@@ -1,3 +1,21 @@
+## 2.9.12
+
+- Tornado HTTPS support, thanks Diego
+- Modular DAL, thanks Giovanni
+- Added coverage support, thanks Niphlod
+- More tests, thanks Niphlod and Paolo Valleri
+- Added support for show_if in readonly sqlform, thanks Paolo
+- Improved scheduler, thanks Niphlod
+- Email timeout support
+- Made web2py's custom_import work with circular imports, thanks Jack Kuan
+- Added Portuguese, Catalan, and Burmese translations
+- Allow map_hyphen to work for application names, thanks Tim Nyborg
+- New module appconfig.py, thanks Niphlod
+- Added geospatial support to Teradata adaptor, thanks Andrew Willimott 
+- Many bug fixes
+
+
+
 ## 2.9.6 - 2.9.10
 
 - fixed support of GAE + SQL

Makefile

@@ -37,7 +37,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.9.12-beta+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.9.12-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps

VERSION

@@ -1 +1 @@
-Version 2.9.12-beta+timestamp.2015.01.15.09.58.09
+Version 2.9.12-stable+timestamp.2015.01.17.00.07.04

applications/admin/controllers/default.py

@@ -1278,7 +1278,7 @@ def create_file():
             path = abspath(request.vars.location)
         else:
             if request.vars.dir:
-            	request.vars.location += request.vars.dir + '/'
+                    request.vars.location += request.vars.dir + '/'
             app = get_app(name=request.vars.location.split('/')[0])
             path = apath(request.vars.location, r=request)
         filename = re.sub('[^\w./-]+', '_', request.vars.filename)
@@ -1434,36 +1434,36 @@ def create_file():
         """ % URL('edit', args=[app,request.vars.dir,filename])
         return ''
     else:
-    	redirect(request.vars.sender + anchor)
+            redirect(request.vars.sender + anchor)
 
 
 def listfiles(app, dir, regexp='.*\.py$'):
-	files = sorted(
+        files = sorted(
          listdir(apath('%(app)s/%(dir)s/' % {'app':app, 'dir':dir}, r=request), regexp))
-	files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')]
+        files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')]
-	return files
+        return files
 
 def editfile(path,file,vars={}, app = None):
-	args=(path,file) if 'app' in vars else (app,path,file)
+        args=(path,file) if 'app' in vars else (app,path,file)
-	url = URL('edit', args=args, vars=vars)
+        url = URL('edit', args=args, vars=vars)
-	return A(file, _class='editor_filelink', _href=url, _style='word-wrap: nowrap;')
+        return A(file, _class='editor_filelink', _href=url, _style='word-wrap: nowrap;')
 
 def files_menu():
-	app = request.vars.app or 'welcome'
+        app = request.vars.app or 'welcome'
-	dirs=[{'name':'models', 'reg':'.*\.py$'},
+        dirs=[{'name':'models', 'reg':'.*\.py$'},
               {'name':'controllers', 'reg':'.*\.py$'},
               {'name':'views', 'reg':'[\w/\-]+(\.\w+)+$'},
               {'name':'modules', 'reg':'.*\.py$'},
               {'name':'static', 'reg': '[^\.#].*'},
               {'name':'private', 'reg':'.*\.py$'}]
-	result_files = []
+        result_files = []
-	for dir in dirs:
+        for dir in dirs:
-		result_files.append(TAG[''](LI(dir['name'], _class="nav-header component", _onclick="collapse('" + dir['name'] + "_files');"),
+                result_files.append(TAG[''](LI(dir['name'], _class="nav-header component", _onclick="collapse('" + dir['name'] + "_files');"),
-            			  LI(UL(*[LI(editfile(dir['name'], f, dict(id=dir['name'] + f.replace('.','__')), app), _style="overflow:hidden", _id=dir['name']+"__"+f.replace('.','__')) 
+                                      LI(UL(*[LI(editfile(dir['name'], f, dict(id=dir['name'] + f.replace('.','__')), app), _style="overflow:hidden", _id=dir['name']+"__"+f.replace('.','__'))
-            			  		for f in listfiles(app, dir['name'], regexp=dir['reg'])], 
+                                                      for f in listfiles(app, dir['name'], regexp=dir['reg'])],
-            			  		_class="nav nav-list small-font"),
+                                                      _class="nav nav-list small-font"),
-            			  	 _id=dir['name'] + '_files', _style="display: none;"))) 
+                                               _id=dir['name'] + '_files', _style="display: none;")))
-	return dict(result_files = result_files)
+        return dict(result_files = result_files)
 
 def upload_file():
     """ File uploading handler """
@@ -1941,4 +1941,3 @@ def install_plugin():
                 T('unable to install plugin "%s"', filename)
         redirect(URL(f="plugins", args=[app,]))
     return dict(form=form, app=app, plugin=plugin, source=source)
-

applications/admin/models/0.py

@@ -47,5 +47,3 @@ if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage']
 #set static_version
 from gluon.settings import global_settings
 response.static_version = global_settings.web2py_version.split('-')[0]
-
-

applications/admin/models/menu.py

@@ -34,4 +34,3 @@ else:
                           URL(_a, 'default', f='logout')))
     response.menu.append((T('Debug'), False,
                           URL(_a, 'debug', 'interact')))
-

applications/admin/models/plugin_statebutton.py

@@ -14,4 +14,3 @@ def stateWidget(field, value, data={'on-label':'Enabled', 'off-label':'Disabled'
         jQuery(".make-bootstrap-switch input[name='%s']").parent().bootstrapSwitch();
     """ % fieldName)
     return DIV(div, script)
-

gluon/contrib/hypermedia.py

@@ -340,4 +340,3 @@ example_policies = {
         'DELETE':{'query':None},
         },
     }
-

gluon/contrib/mockimaplib.py

@@ -252,4 +252,3 @@ class IMAP4(object):
         return Connection()
 
 IMAP4_SSL = IMAP4
-

gluon/contrib/stripe.py

@@ -192,7 +192,7 @@ jQuery(function(){
     <label class="control-label">Card Number</label>
     <div class="controls">
       <input type="text" size="20" data-stripe="number"
-	     placeholder="4242424242424242"/>
+             placeholder="4242424242424242"/>
     </div>
   </div>
 
@@ -200,7 +200,7 @@ jQuery(function(){
     <label class="control-label">CVC</label>
     <div class="controls">
       <input type="text" size="4" style="width:80px" data-stripe="cvc"
-	     placeholder="XXX"/>
+             placeholder="XXX"/>
       <a href="http://en.wikipedia.org/wiki/Card_Verification_Code" target="_blank">What is this?</a>
     </div>
   </div>
@@ -209,10 +209,10 @@ jQuery(function(){
     <label class="control-label">Expiration</label>
     <div class="controls">
       <input type="text" size="2" style="width:40px" data-stripe="exp-month"
-	     placeholder="MM"/>
+             placeholder="MM"/>
       /
       <input type="text" size="4" style="width:80px" data-stripe="exp-year"
-	     placeholder="YYYY"/>
+             placeholder="YYYY"/>
     </div>
   </div>
 

gluon/contrib/webclient.py

@@ -1,4 +1,3 @@
-
 """
 Developed by Massimo Di Pierro
 Released under the web2py license (LGPL)

gluon/dal/objects.py

@@ -2703,4 +2703,3 @@ class Rows(object):
     # for consistent naming yet backwards compatible
     as_csv = __str__
     json = as_json
-

gluon/tests/test_dal_nosql.py

@@ -1406,4 +1406,3 @@ class TestQuotesByDefault(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
     tearDownModule()
-

gluon/tools.py

@@ -6169,4 +6169,3 @@ class Config(object):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-

gluon/utils.py

@@ -350,4 +350,3 @@ def getipaddrinfo(host):
                 and isinstance(addrinfo[4][0], basestring)]
     except socket.error:
         return []
-

handlers/web2py_on_gevent.py

@@ -110,4 +110,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-

scripts/service/linux.py

@@ -218,4 +218,3 @@ class LinuxService(ServiceBase):
         else:
             cmd = env['update-rc.d']
             return [cmd, self.name, 'remove']
-