diff --git a/VERSION b/VERSION index 7a32a07d..ba504ebd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.1 (2012-10-19 09:40:10) dev +Version 2.1.1 (2012-10-19 10:37:01) dev diff --git a/__init__.py b/__init__.py index 1901ba93..8b137891 100644 --- a/__init__.py +++ b/__init__.py @@ -1,12 +1 @@ - - - - - - - - - - - diff --git a/anyserver.py b/anyserver.py index 0cae0c2f..46daf4ec 100644 --- a/anyserver.py +++ b/anyserver.py @@ -9,7 +9,11 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) This file is based, although a rewrite, on MIT-licensed code from the Bottle web framework. """ -import os, sys, optparse, urllib +import os +import sys +import optparse +import urllib + path = os.path.dirname(os.path.abspath(__file__)) os.chdir(path) sys.path = [path]+[p for p in sys.path if not p==path] @@ -217,7 +221,7 @@ def mongrel2_handler(application,conn,debug=False): environ['QUERY_STRING'] = environ['URI'].split('?')[1] else: environ['QUERY_STRING'] = '' - if environ.has_key('Content-Length'): + if 'Content-Length' in environ: environ['CONTENT_LENGTH'] = environ['Content-Length'] # necessary for POST to work with Django environ['wsgi.input'] = req.body @@ -305,9 +309,3 @@ def main(): if __name__=='__main__': main() - - - - - - diff --git a/appengine_config.py b/appengine_config.py index a736220c..a36d1db6 100644 --- a/appengine_config.py +++ b/appengine_config.py @@ -2,9 +2,3 @@ def webapp_add_wsgi_middleware(app): from google.appengine.ext.appstats import recording app = recording.appstats_wsgi_middleware(app) return app - - - - - - diff --git a/applications/__init__.py b/applications/__init__.py index e69de29b..8b137891 100644 --- a/applications/__init__.py +++ b/applications/__init__.py @@ -0,0 +1 @@ + diff --git a/applications/admin/__init__.py b/applications/admin/__init__.py index e69de29b..8b137891 100644 --- a/applications/admin/__init__.py +++ b/applications/admin/__init__.py @@ -0,0 +1 @@ + diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index f00eba91..6802c419 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -441,7 +441,3 @@ def ccache(): return dict(form=form, total=total, ram=ram, disk=disk, object_stats=hp != False) - - - - diff --git a/applications/admin/controllers/debug.py b/applications/admin/controllers/debug.py index c18faf5c..f7c73d31 100644 --- a/applications/admin/controllers/debug.py +++ b/applications/admin/controllers/debug.py @@ -198,5 +198,3 @@ def toggle_breakpoint(): except Exception, e: session.flash = str(e) return response.json({'ok': ok, 'lineno': lineno}) - - diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index b6314641..0ecae821 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -1697,5 +1697,3 @@ def git_push(): session.flash = T("Push failed, git exited abnormally. See logs for details.") redirect(URL('site')) return dict(app=app,form=form) - - diff --git a/applications/admin/controllers/gae.py b/applications/admin/controllers/gae.py index 1caa283c..2047a3e7 100644 --- a/applications/admin/controllers/gae.py +++ b/applications/admin/controllers/gae.py @@ -89,6 +89,3 @@ def callback(): except: errors='' return (output+errors).replace('\n','
') - - - diff --git a/applications/admin/controllers/mercurial.py b/applications/admin/controllers/mercurial.py index 4f35dd54..34e0516b 100644 --- a/applications/admin/controllers/mercurial.py +++ b/applications/admin/controllers/mercurial.py @@ -80,6 +80,3 @@ def revision(): desc=ctx.description(), form=form ) - - - diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py index f407e725..df9e6d8b 100644 --- a/applications/admin/controllers/openshift.py +++ b/applications/admin/controllers/openshift.py @@ -58,4 +58,3 @@ class EXISTS(object): if os.path.exists(value): return (value,None) return (value,self.error_message) - diff --git a/applications/admin/controllers/plugin_jqmobile.py b/applications/admin/controllers/plugin_jqmobile.py index 77eb14ee..b9265a63 100644 --- a/applications/admin/controllers/plugin_jqmobile.py +++ b/applications/admin/controllers/plugin_jqmobile.py @@ -6,6 +6,3 @@ def index(): def about(): return locals() - - - diff --git a/applications/admin/controllers/shell.py b/applications/admin/controllers/shell.py index 728c2000..561e06eb 100644 --- a/applications/admin/controllers/shell.py +++ b/applications/admin/controllers/shell.py @@ -43,6 +43,3 @@ def reset(): session['commands:'+app] = [] session['history:'+app] = gluon.contrib.shell.History() return 'done' - - - diff --git a/applications/admin/controllers/toolbar.py b/applications/admin/controllers/toolbar.py index dfe220b8..9e0294a3 100644 --- a/applications/admin/controllers/toolbar.py +++ b/applications/admin/controllers/toolbar.py @@ -27,6 +27,3 @@ def profiler(): size += len(data) response.cookies[KEY] = size return data - - - diff --git a/applications/admin/controllers/webservices.py b/applications/admin/controllers/webservices.py index 9eab0f2b..7f38c7f8 100644 --- a/applications/admin/controllers/webservices.py +++ b/applications/admin/controllers/webservices.py @@ -127,5 +127,3 @@ def detach_debugger(): def call(): session.forget() return service() - - diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py index 841263c4..e8b3ac8c 100644 --- a/applications/admin/controllers/wizard.py +++ b/applications/admin/controllers/wizard.py @@ -554,6 +554,3 @@ def call(): return service() path = os.path.join(request.folder,'..',app,'databases','*') for file in glob.glob(path): os.unlink(file) - - - diff --git a/applications/admin/cron/expire_sessions.py b/applications/admin/cron/expire_sessions.py index 15faa5f0..a602a939 100644 --- a/applications/admin/cron/expire_sessions.py +++ b/applications/admin/cron/expire_sessions.py @@ -19,5 +19,3 @@ for filename in os.listdir(path): os.unlink(fullpath) except: logging.exception('failure to check %s'%fullpath) - - diff --git a/applications/admin/models/0.py b/applications/admin/models/0.py index 1d7abe3e..ebf9c29b 100644 --- a/applications/admin/models/0.py +++ b/applications/admin/models/0.py @@ -78,6 +78,3 @@ PLUGINS_APP = 'http://web2py.com/plugins' # set the language if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage'] is None): T.force(request.cookies['adminLanguage'].value) - - - diff --git a/applications/admin/models/0_imports.py b/applications/admin/models/0_imports.py index ecb8cbcd..b911c0e7 100644 --- a/applications/admin/models/0_imports.py +++ b/applications/admin/models/0_imports.py @@ -28,6 +28,3 @@ from gluon.languages import findT, update_all_languages from gluon.myregex import * from gluon.restricted import * from gluon.compileapp import compile_application, remove_compiled_application - - - diff --git a/applications/admin/models/access.py b/applications/admin/models/access.py index f2366669..f268366f 100644 --- a/applications/admin/models/access.py +++ b/applications/admin/models/access.py @@ -168,5 +168,3 @@ elif session.authorized and \ if request.controller=='appadmin' and DEMO_MODE: session.flash = 'Appadmin disabled in demo mode' redirect(URL('default','sites')) - - diff --git a/applications/admin/models/buttons.py b/applications/admin/models/buttons.py index e60e6c00..ec79c8db 100644 --- a/applications/admin/models/buttons.py +++ b/applications/admin/models/buttons.py @@ -34,6 +34,3 @@ def helpicon(): def searchbox(elementid): return TAG[''](LABEL(IMG(_id="search_start",_src=URL('static', 'images/search.png'), _alt=T('filter')), _class='icon', _for=elementid), ' ', INPUT(_id=elementid, _type='text', _size=12)) - - - diff --git a/applications/admin/models/db.py b/applications/admin/models/db.py index 11eb9c0a..b5df1aae 100644 --- a/applications/admin/models/db.py +++ b/applications/admin/models/db.py @@ -36,6 +36,3 @@ def is_manager(): return True else: return False - - - diff --git a/applications/admin/models/menu.py b/applications/admin/models/menu.py index b6dcdfd6..fa7d5fa6 100644 --- a/applications/admin/models/menu.py +++ b/applications/admin/models/menu.py @@ -33,6 +33,3 @@ if os.path.exists('applications/examples'): response.menu.append((T('Help'), False, URL('examples','default','index'))) else: response.menu.append((T('Help'), False, 'http://web2py.com/examples')) - - - diff --git a/applications/admin/models/plugin_multiselect.py b/applications/admin/models/plugin_multiselect.py index 09b9e7e0..ec45feec 100644 --- a/applications/admin/models/plugin_multiselect.py +++ b/applications/admin/models/plugin_multiselect.py @@ -1,6 +1,3 @@ response.files.append(URL('static','plugin_multiselect/jquery.multi-select.js')) response.files.append(URL('static','plugin_multiselect/multi-select.css')) response.files.append(URL('static','plugin_multiselect/start.js')) - - - diff --git a/applications/admin/modules/__init__.py b/applications/admin/modules/__init__.py index 139597f9..8b137891 100644 --- a/applications/admin/modules/__init__.py +++ b/applications/admin/modules/__init__.py @@ -1,2 +1 @@ - diff --git a/applications/examples/__init__.py b/applications/examples/__init__.py index e69de29b..8b137891 100644 --- a/applications/examples/__init__.py +++ b/applications/examples/__init__.py @@ -0,0 +1 @@ + diff --git a/applications/examples/controllers/ajax_examples.py b/applications/examples/controllers/ajax_examples.py index f7c49084..455e2f84 100644 --- a/applications/examples/controllers/ajax_examples.py +++ b/applications/examples/controllers/ajax_examples.py @@ -18,7 +18,3 @@ def flash(): def fade(): return dict() - - - - diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index f00eba91..6802c419 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -441,7 +441,3 @@ def ccache(): return dict(form=form, total=total, ram=ram, disk=disk, object_stats=hp != False) - - - - diff --git a/applications/examples/controllers/cache_examples.py b/applications/examples/controllers/cache_examples.py index 026a1f82..c4a95494 100644 --- a/applications/examples/controllers/cache_examples.py +++ b/applications/examples/controllers/cache_examples.py @@ -1,4 +1,3 @@ - import time @@ -47,6 +46,3 @@ def cache_controller_and_view(): t = time.ctime() d = dict(time=t, link=A('click to reload', _href=URL(r=request))) return response.render(d) - - - diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py index 0e61ae93..8e39b694 100644 --- a/applications/examples/controllers/default.py +++ b/applications/examples/controllers/default.py @@ -73,5 +73,3 @@ def changelog(): import os filename = os.path.join(request.env.gluon_parent, 'CHANGELOG') return response.render(dict(changelog=MARKMIN(read_file(filename)))) - - diff --git a/applications/examples/controllers/form_examples.py b/applications/examples/controllers/form_examples.py index cddd54b0..3847b043 100644 --- a/applications/examples/controllers/form_examples.py +++ b/applications/examples/controllers/form_examples.py @@ -1,6 +1,3 @@ - - - def form(): """ a simple entry form with various types of objects """ @@ -23,7 +20,3 @@ def form(): else: response.flash = 'please fill the form' return dict(form=form, vars=form.vars) - - - - diff --git a/applications/examples/controllers/global.py b/applications/examples/controllers/global.py index 2855e3cb..bcfab063 100644 --- a/applications/examples/controllers/global.py +++ b/applications/examples/controllers/global.py @@ -1,4 +1,3 @@ - session.forget() response.menu = [['home', False, '/%s/default/index' @@ -77,7 +76,3 @@ def vars(): doc=doc, attributes=attributes, ) - - - - diff --git a/applications/examples/controllers/layout_examples.py b/applications/examples/controllers/layout_examples.py index 5f10acfb..dea28f11 100644 --- a/applications/examples/controllers/layout_examples.py +++ b/applications/examples/controllers/layout_examples.py @@ -20,7 +20,3 @@ def basic(): ['basic', True, URL('basic')]] response.flash = 'you clicked on basic' return dict(message='you clicked on basic') - - - - diff --git a/applications/examples/controllers/session_examples.py b/applications/examples/controllers/session_examples.py index bbd1a421..1160b211 100644 --- a/applications/examples/controllers/session_examples.py +++ b/applications/examples/controllers/session_examples.py @@ -1,6 +1,3 @@ - - - def counter(): """ every time you reload, it increases the session.counter """ @@ -8,7 +5,3 @@ def counter(): session.counter = 0 session.counter += 1 return dict(counter=session.counter) - - - - diff --git a/applications/examples/controllers/simple_examples.py b/applications/examples/controllers/simple_examples.py index d740ced5..3438d3e8 100644 --- a/applications/examples/controllers/simple_examples.py +++ b/applications/examples/controllers/simple_examples.py @@ -137,5 +137,3 @@ Quoted text def ajaxwiki_onclick(): return MARKMIN(request.vars.text).xml() - - diff --git a/applications/examples/controllers/spreadsheet.py b/applications/examples/controllers/spreadsheet.py index 9a80c18e..426b8714 100644 --- a/applications/examples/controllers/spreadsheet.py +++ b/applications/examples/controllers/spreadsheet.py @@ -7,5 +7,3 @@ def index(): sheet = cache.ram('sheet1',lambda:Sheet(10,10,URL('callback')),0) #sheet.cell('r0c3',value='=r0c0+r0c1+r0c2',readonly=True) return dict(sheet=sheet) - - diff --git a/applications/examples/controllers/template_examples.py b/applications/examples/controllers/template_examples.py index 52aba5a4..addb8d07 100644 --- a/applications/examples/controllers/template_examples.py +++ b/applications/examples/controllers/template_examples.py @@ -1,6 +1,3 @@ - - - def variables(): return dict(a=10, b=20) @@ -31,7 +28,3 @@ def xml(): def beautify(): return dict(message=BEAUTIFY(request)) - - - - diff --git a/applications/examples/models/feeds_reader.py b/applications/examples/models/feeds_reader.py index 787f0a4c..658d5381 100644 --- a/applications/examples/models/feeds_reader.py +++ b/applications/examples/models/feeds_reader.py @@ -1,4 +1,3 @@ - def group_feed_reader(group,mode='div',counter='5'): """parse group feeds""" @@ -43,8 +42,3 @@ def code_feed_reader(project,mode='div'): return html - - - - - diff --git a/applications/examples/models/markmin.py b/applications/examples/models/markmin.py index b7352c88..4815ac79 100644 --- a/applications/examples/models/markmin.py +++ b/applications/examples/models/markmin.py @@ -37,5 +37,3 @@ def get_content(b=None,\ openedfile.close() return html - - diff --git a/applications/examples/models/menu.py b/applications/examples/models/menu.py index dc5de925..1a696daf 100644 --- a/applications/examples/models/menu.py +++ b/applications/examples/models/menu.py @@ -42,5 +42,3 @@ def toggle_menuclass(cssclass='pressed',menuid='headermenu'): return XML(jscript) else: return '' - - diff --git a/applications/welcome/__init__.py b/applications/welcome/__init__.py index e69de29b..8b137891 100644 --- a/applications/welcome/__init__.py +++ b/applications/welcome/__init__.py @@ -0,0 +1 @@ + diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index f00eba91..6802c419 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -441,7 +441,3 @@ def ccache(): return dict(form=form, total=total, ram=ram, disk=disk, object_stats=hp != False) - - - - diff --git a/applications/welcome/controllers/default.py b/applications/welcome/controllers/default.py index 7392c41d..4c4b563d 100644 --- a/applications/welcome/controllers/default.py +++ b/applications/welcome/controllers/default.py @@ -71,4 +71,3 @@ def data(): LOAD('default','data.load',args='tables',ajax=True,user_signature=True) """ return dict(form=crud()) - diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py index 95ab525c..26d28122 100644 --- a/applications/welcome/models/db.py +++ b/applications/welcome/models/db.py @@ -81,4 +81,3 @@ use_janrain(auth,filename='private/janrain.key') ## after defining tables, uncomment below to enable auditing # auth.enable_record_versioning(db) - diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py index 989328c4..81010a99 100644 --- a/applications/welcome/models/menu.py +++ b/applications/welcome/models/menu.py @@ -98,5 +98,3 @@ def _(): ] )] _() - - diff --git a/applications/welcome/routes.example.py b/applications/welcome/routes.example.py index 363080a8..5194cb8e 100644 --- a/applications/welcome/routes.example.py +++ b/applications/welcome/routes.example.py @@ -37,4 +37,3 @@ routers = { #NOTE! To change language in your application using these rules add this line #in one of your models files: # if request.uri_language: T.force(request.uri_language) - diff --git a/cgihandler.py b/cgihandler.py index a7bbcb1b..3c919199 100755 --- a/cgihandler.py +++ b/cgihandler.py @@ -61,9 +61,3 @@ sys.path = [path]+[p for p in sys.path if not p==path] import gluon.main wsgiref.handlers.CGIHandler().run(gluon.main.wsgibase) - - - - - - diff --git a/fcgihandler.py b/fcgihandler.py index 2a81b784..76cda9b8 100755 --- a/fcgihandler.py +++ b/fcgihandler.py @@ -51,9 +51,3 @@ if SOFTCRON: global_settings.web2py_crontype = 'soft' fcgi.WSGIServer(application, bindAddress='/tmp/fcgi.sock').run() - - - - - - diff --git a/gaehandler.py b/gaehandler.py index 0971b9f8..0965fffe 100755 --- a/gaehandler.py +++ b/gaehandler.py @@ -97,9 +97,3 @@ def main(): if __name__ == '__main__': main() - - - - - - diff --git a/gluon/__init__.py b/gluon/__init__.py index 795705f5..7065a70a 100644 --- a/gluon/__init__.py +++ b/gluon/__init__.py @@ -42,15 +42,3 @@ if 0: mail = Mail() service = Service() plugins = PluginManager() - - - - - - - - - - - - diff --git a/gluon/admin.py b/gluon/admin.py index 4fd874f9..ba392dbb 100644 --- a/gluon/admin.py +++ b/gluon/admin.py @@ -474,11 +474,3 @@ def create_missing_app_folders(request): if not os.path.exists(path): os.mkdir(path) global_settings.app_folders.add(request.folder) - - - - - - - - diff --git a/gluon/cache.py b/gluon/cache.py index 11c302c6..ec26711f 100644 --- a/gluon/cache.py +++ b/gluon/cache.py @@ -489,7 +489,3 @@ def lazy_cache(key=None,time_expire=None,cache_model='ram'): g.__name__ = f.__name__ return g return decorator - - - - diff --git a/gluon/cfs.py b/gluon/cfs.py index ceb52f18..6e610d49 100644 --- a/gluon/cfs.py +++ b/gluon/cfs.py @@ -51,11 +51,3 @@ def getcfs(key, filename, filter=None): cfs[key] = (t, data) cfs_lock.release() return data - - - - - - - - diff --git a/gluon/compileapp.py b/gluon/compileapp.py index ab5f063a..fc3eada8 100644 --- a/gluon/compileapp.py +++ b/gluon/compileapp.py @@ -700,11 +700,3 @@ def test(): if __name__ == '__main__': import doctest doctest.testmod() - - - - - - - - diff --git a/gluon/contenttype.py b/gluon/contenttype.py index cb0786ea..4270bb6c 100644 --- a/gluon/contenttype.py +++ b/gluon/contenttype.py @@ -717,11 +717,3 @@ def contenttype(filename, default='text/plain'): if default.startswith('text/'): default += '; charset=utf-8' return default - - - - - - - - diff --git a/gluon/contrib/AuthorizeNet.py b/gluon/contrib/AuthorizeNet.py index 8a6c7002..d54d7ee9 100755 --- a/gluon/contrib/AuthorizeNet.py +++ b/gluon/contrib/AuthorizeNet.py @@ -257,11 +257,3 @@ def test(): if __name__=='__main__': test() - - - - - - - - diff --git a/gluon/contrib/DowCommerce.py b/gluon/contrib/DowCommerce.py index e1a25672..03d19fd1 100644 --- a/gluon/contrib/DowCommerce.py +++ b/gluon/contrib/DowCommerce.py @@ -237,11 +237,3 @@ def test(): if __name__=='__main__': test() - - - - - - - - diff --git a/gluon/contrib/__init__.py b/gluon/contrib/__init__.py index e3c0074c..8b137891 100644 --- a/gluon/contrib/__init__.py +++ b/gluon/contrib/__init__.py @@ -1,9 +1 @@ - - - - - - - - diff --git a/gluon/contrib/aes.py b/gluon/contrib/aes.py index 375ca55f..24e40878 100644 --- a/gluon/contrib/aes.py +++ b/gluon/contrib/aes.py @@ -500,6 +500,3 @@ aes_Rcon = array('B', 'c697356ad4b37dfaefc5913972e4d3bd' '61c29f254a943366cc831d3a74e8cb'.decode('hex') ) - - - diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py index 5ff1113e..05f02b64 100644 --- a/gluon/contrib/autolinks.py +++ b/gluon/contrib/autolinks.py @@ -203,6 +203,3 @@ if __name__=="__main__": print expand_html(open(sys.argv[1]).read()) else: print test() - - - diff --git a/gluon/contrib/feedparser.py b/gluon/contrib/feedparser.py index 827ce866..a028d794 100755 --- a/gluon/contrib/feedparser.py +++ b/gluon/contrib/feedparser.py @@ -3905,10 +3905,3 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer result['version'] = result['version'] or feedparser.version result['namespaces'] = feedparser.namespacesInUse return result - - - - - - - diff --git a/gluon/contrib/gae_memcache.py b/gluon/contrib/gae_memcache.py index 2b4ef4db..ec08fd6a 100644 --- a/gluon/contrib/gae_memcache.py +++ b/gluon/contrib/gae_memcache.py @@ -65,4 +65,3 @@ class MemcacheClient(object): def flush_all(self,*a,**b): return self.client.delete(*a,**b) - diff --git a/gluon/contrib/gae_retry.py b/gluon/contrib/gae_retry.py index 82bb37e0..9b0fe426 100644 --- a/gluon/contrib/gae_retry.py +++ b/gluon/contrib/gae_retry.py @@ -84,11 +84,3 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0): setattr(wrapper, '_autoretry_datastore_timeouts', False) if getattr(wrapped, '_autoretry_datastore_timeouts', True): apiproxy_stub_map.MakeSyncCall = wrapper - - - - - - - - diff --git a/gluon/contrib/generics.py b/gluon/contrib/generics.py index 97abccf3..fa074416 100644 --- a/gluon/contrib/generics.py +++ b/gluon/contrib/generics.py @@ -61,11 +61,3 @@ def pdf_from_html(html): return pdflatex_from_html(html) else: return pyfpdf_from_html(html) - - - - - - - - diff --git a/gluon/contrib/google_wallet.py b/gluon/contrib/google_wallet.py index 3bd88e70..ffcbd9f8 100644 --- a/gluon/contrib/google_wallet.py +++ b/gluon/contrib/google_wallet.py @@ -13,11 +13,3 @@ def button(merchant_id="123456789012345", list_products += t % dict(k=k+1,key=key,value=value) button = '
%s
' % (merchant_id, list_products, merchant_id) return XML(button) - - - - - - - - diff --git a/gluon/contrib/gql.py b/gluon/contrib/gql.py index 03002ccb..d1023ab1 100644 --- a/gluon/contrib/gql.py +++ b/gluon/contrib/gql.py @@ -3,11 +3,3 @@ __all__ = ['DAL','Field','drivers','gae'] from gluon.dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, drivers, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType, gae - - - - - - - - diff --git a/gluon/contrib/imageutils.py b/gluon/contrib/imageutils.py index b01a283c..96facc08 100644 --- a/gluon/contrib/imageutils.py +++ b/gluon/contrib/imageutils.py @@ -57,6 +57,3 @@ def THUMB(image, nx=120, ny=120, gae=False, name='thumb'): return thumb else: return image - - - diff --git a/gluon/contrib/memdb.py b/gluon/contrib/memdb.py index 012fee05..527b051a 100644 --- a/gluon/contrib/memdb.py +++ b/gluon/contrib/memdb.py @@ -905,11 +905,3 @@ SQLStorage = DALStorage if __name__ == '__main__': import doctest doctest.testmod() - - - - - - - - diff --git a/gluon/contrib/pam.py b/gluon/contrib/pam.py index a0f3a983..c05f3e8e 100644 --- a/gluon/contrib/pam.py +++ b/gluon/contrib/pam.py @@ -121,11 +121,3 @@ def authenticate(username, password, service='login'): if __name__ == "__main__": import getpass print authenticate(getpass.getuser(), getpass.getpass()) - - - - - - - - diff --git a/gluon/contrib/pbkdf2.py b/gluon/contrib/pbkdf2.py index b96bec4f..b7a7dd42 100644 --- a/gluon/contrib/pbkdf2.py +++ b/gluon/contrib/pbkdf2.py @@ -128,6 +128,3 @@ def test(): if __name__ == '__main__': test() - - - diff --git a/gluon/contrib/populate.py b/gluon/contrib/populate.py index 66d08b79..b82173d0 100644 --- a/gluon/contrib/populate.py +++ b/gluon/contrib/populate.py @@ -165,11 +165,3 @@ if __name__ == '__main__': ell=Learner() ell.loadd(eval(IUP)) print ell.generate(1000,prefix=None) - - - - - - - - diff --git a/gluon/contrib/pyfpdf.py b/gluon/contrib/pyfpdf.py index 1bd0f404..26fc2940 100644 --- a/gluon/contrib/pyfpdf.py +++ b/gluon/contrib/pyfpdf.py @@ -9,5 +9,3 @@ from fpdf import * # import warnings # warnings.warn("pyfpdf package name is deprecated, please use fpdf instead") - - diff --git a/gluon/contrib/qdb.py b/gluon/contrib/qdb.py index 10e7af8a..732ff831 100644 --- a/gluon/contrib/qdb.py +++ b/gluon/contrib/qdb.py @@ -961,8 +961,3 @@ if __name__ == '__main__': # reimport as global __main__ namespace is destroyed import qdb qdb.main(**kwargs) - - - - - diff --git a/gluon/contrib/redis_cache.py b/gluon/contrib/redis_cache.py index b6aa6630..8fc30ab7 100644 --- a/gluon/contrib/redis_cache.py +++ b/gluon/contrib/redis_cache.py @@ -163,9 +163,3 @@ class RedisClient(object): def __keyFormat__(self, key): return 'w2p:%s:%s' % (self.request.application, key.replace(' ', '_')) - - - - - - diff --git a/gluon/contrib/redis_session.py b/gluon/contrib/redis_session.py index 6ffef629..8497fac7 100644 --- a/gluon/contrib/redis_session.py +++ b/gluon/contrib/redis_session.py @@ -197,5 +197,3 @@ class RecordDeleter(object): self.db.srem(id_idx, self.key) #remove the key itself self.db.delete(self.key) - - diff --git a/gluon/contrib/rss2.py b/gluon/contrib/rss2.py index 301a283a..c25fee86 100644 --- a/gluon/contrib/rss2.py +++ b/gluon/contrib/rss2.py @@ -586,11 +586,3 @@ def test(): if __name__ == '__main__': print test() - - - - - - - - diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py index d21d7870..bad60074 100755 --- a/gluon/contrib/shell.py +++ b/gluon/contrib/shell.py @@ -264,11 +264,3 @@ def run(history, statement, env={}): if __name__=='__main__': history=History() while True: print run(history, raw_input('>>> ')).rstrip() - - - - - - - - diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py index cffaee7b..8847f374 100644 --- a/gluon/contrib/simplejsonrpc.py +++ b/gluon/contrib/simplejsonrpc.py @@ -148,8 +148,3 @@ if __name__ == "__main__": location = "http://www.web2py.com.ar/webservices/sample/call/jsonrpc" client = ServerProxy(location, verbose='--verbose' in sys.argv,) print client.add(1, 2) - - - - - diff --git a/gluon/contrib/sms_utils.py b/gluon/contrib/sms_utils.py index b5e32937..7d6378ef 100644 --- a/gluon/contrib/sms_utils.py +++ b/gluon/contrib/sms_utils.py @@ -110,11 +110,3 @@ def sms_email(number,provider): elif number[:2]=='00': number=number[3:] number=re.sub('[^\d]','',number) return number+SMSCODES[provider] - - - - - - - - diff --git a/gluon/contrib/spreadsheet.py b/gluon/contrib/spreadsheet.py index 1fd956fd..22b7d025 100644 --- a/gluon/contrib/spreadsheet.py +++ b/gluon/contrib/spreadsheet.py @@ -877,7 +877,3 @@ if __name__ == '__main__': s.cell('b', value="=sin(a)") s.cell('c', value="=cos(a)**2+b*b") print s['c'].computed_value - - - - diff --git a/gluon/contrib/stripe.py b/gluon/contrib/stripe.py index 8bf25c8a..3e42c8f0 100644 --- a/gluon/contrib/stripe.py +++ b/gluon/contrib/stripe.py @@ -62,9 +62,3 @@ if __name__=='__main__': print 'paid',s['paid'],s['amount'] ,s['currency'] s = Stripe(key).refund(d[u'id']) print 'refunded',s['refunded'] - - - - - - diff --git a/gluon/contrib/taskbar_widget.py b/gluon/contrib/taskbar_widget.py index c053f2e9..313585a7 100644 --- a/gluon/contrib/taskbar_widget.py +++ b/gluon/contrib/taskbar_widget.py @@ -241,11 +241,3 @@ class TaskBarIcon: RUNNING = 0 STOPPED = 1 - - - - - - - - diff --git a/gluon/contrib/timecollect.py b/gluon/contrib/timecollect.py index 502a1b25..aeafc75c 100644 --- a/gluon/contrib/timecollect.py +++ b/gluon/contrib/timecollect.py @@ -93,7 +93,3 @@ if __name__=='__main__': print('') # You can turn off ordering of results print(t.getReportText(orderByCost=False)) - - - - diff --git a/gluon/contrib/user_agent_parser.py b/gluon/contrib/user_agent_parser.py index 27476f69..48de2b09 100644 --- a/gluon/contrib/user_agent_parser.py +++ b/gluon/contrib/user_agent_parser.py @@ -516,9 +516,3 @@ class mobilize(object): items.insert(-1,'mobile') current.response.view = '.'.join(items) return self.func() - - - - - - diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py index 48827a9a..19068802 100644 --- a/gluon/contrib/webclient.py +++ b/gluon/contrib/webclient.py @@ -200,6 +200,3 @@ def test_web2py_registration_and_login(): if __name__ == '__main__': test_web2py_registration_and_login() - - - diff --git a/gluon/contrib/websocket_messaging.py b/gluon/contrib/websocket_messaging.py index 2a385236..cd42356d 100644 --- a/gluon/contrib/websocket_messaging.py +++ b/gluon/contrib/websocket_messaging.py @@ -188,11 +188,3 @@ if __name__ == "__main__": http_server = tornado.httpserver.HTTPServer(application) http_server.listen(int(options.port), address=options.address) tornado.ioloop.IOLoop.instance().start() - - - - - - - - diff --git a/gluon/custom_import.py b/gluon/custom_import.py index a3e28964..6db23d2e 100644 --- a/gluon/custom_import.py +++ b/gluon/custom_import.py @@ -188,4 +188,3 @@ class TrackImporter(object): return file TRACK_IMPORTER = TrackImporter() - diff --git a/gluon/dal.py b/gluon/dal.py index 36d4d3bb..9e1dd50d 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -9548,4 +9548,3 @@ DAL.Table = Table # was necessary in gluon/globals.py session.connect if __name__ == '__main__': import doctest doctest.testmod() - diff --git a/gluon/debug.py b/gluon/debug.py index 3936cf47..8d184ce0 100644 --- a/gluon/debug.py +++ b/gluon/debug.py @@ -189,8 +189,3 @@ qdb_debugger.set_params(dict(call_stack=True, environment=True)) import gluon.main gluon.main.global_settings.debugging = True - - - - - diff --git a/gluon/decoder.py b/gluon/decoder.py index 010ed7fb..e3d6a560 100644 --- a/gluon/decoder.py +++ b/gluon/decoder.py @@ -72,11 +72,3 @@ def autoDetectXMLEncoding(buffer): def decoder(buffer): encoding = autoDetectXMLEncoding(buffer) return buffer.decode(encoding).encode('utf8') - - - - - - - - diff --git a/gluon/fileutils.py b/gluon/fileutils.py index c6019d16..5d0412eb 100644 --- a/gluon/fileutils.py +++ b/gluon/fileutils.py @@ -395,7 +395,3 @@ def abspath(*relpath, **base): if gluon: return os.path.join(global_settings.gluon_parent, path) return os.path.join(global_settings.applications_parent, path) - - - - diff --git a/gluon/globals.py b/gluon/globals.py index 7b515fe9..f9c85926 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -751,4 +751,3 @@ class Session(Storage): del response.session_file except: pass - diff --git a/gluon/highlight.py b/gluon/highlight.py index c66b429e..7fb45af2 100644 --- a/gluon/highlight.py +++ b/gluon/highlight.py @@ -342,11 +342,3 @@ if __name__ == '__main__': argfp.close() print '' + highlight(data, sys.argv[2])\ + '' - - - - - - - - diff --git a/gluon/html.py b/gluon/html.py index 6893b9b4..c7cd0686 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -2535,4 +2535,3 @@ class MARKMIN(XmlComponent): if __name__ == '__main__': import doctest doctest.testmod() - diff --git a/gluon/http.py b/gluon/http.py index 2dbc14f0..4dd08333 100644 --- a/gluon/http.py +++ b/gluon/http.py @@ -149,11 +149,3 @@ def redirect(location, how=303, client_side=False): raise HTTP(how, 'You are being redirected here' % loc, Location=loc) - - - - - - - - diff --git a/gluon/import_all.py b/gluon/import_all.py index 3406cf3e..35d09744 100644 --- a/gluon/import_all.py +++ b/gluon/import_all.py @@ -107,11 +107,3 @@ for module in base_modules + contributed_modules: msg += "Try the following command: " msg += "easy_install-%(python_version)s -U %(module)s" % locals() raise ImportError, msg - - - - - - - - diff --git a/gluon/languages.py b/gluon/languages.py index 3d94bb0a..9a7617a7 100644 --- a/gluon/languages.py +++ b/gluon/languages.py @@ -905,4 +905,3 @@ def update_all_languages(application_path): if __name__ == '__main__': import doctest doctest.testmod() - diff --git a/gluon/main.py b/gluon/main.py index 405a4160..2aaaa5e3 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -857,5 +857,3 @@ class HttpServer(object): os.unlink(self.pid_filename) except: pass - - diff --git a/gluon/messageboxhandler.py b/gluon/messageboxhandler.py index ba2e5ec9..33cd59b4 100644 --- a/gluon/messageboxhandler.py +++ b/gluon/messageboxhandler.py @@ -13,6 +13,3 @@ class MessageBoxHandler(logging.Handler): if tkMessageBox: msg = self.format(record) tkMessageBox.showinfo('info1', msg) - - - diff --git a/gluon/myregex.py b/gluon/myregex.py index 53a0e792..3661abfa 100644 --- a/gluon/myregex.py +++ b/gluon/myregex.py @@ -26,11 +26,3 @@ regex_include = re.compile(\ regex_extend = re.compile(\ '^\s*(?P\{\{\s*extend\s+[\'"](?P[^\'"]+)[\'"]\s*\}\})',re.MULTILINE) - - - - - - - - diff --git a/gluon/newcron.py b/gluon/newcron.py index 392258e6..c6b3026b 100644 --- a/gluon/newcron.py +++ b/gluon/newcron.py @@ -341,11 +341,3 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None): 'WEB2PY CRON: Execution error for %s: %s' \ % (task.get('cmd'), e)) token.release() - - - - - - - - diff --git a/gluon/portalocker.py b/gluon/portalocker.py index 8d622e4d..2766032d 100644 --- a/gluon/portalocker.py +++ b/gluon/portalocker.py @@ -161,8 +161,3 @@ if __name__=='__main__': f = LockedFile('test.txt',mode='rb') print f.read() f.close() - - - - - diff --git a/gluon/reserved_sql_keywords.py b/gluon/reserved_sql_keywords.py index b98af35a..cd3c4b55 100644 --- a/gluon/reserved_sql_keywords.py +++ b/gluon/reserved_sql_keywords.py @@ -1711,11 +1711,3 @@ ADAPTERS = { } ADAPTERS['all'] = reduce(lambda a,b:a.union(b),(x for x in ADAPTERS.values())) - - - - - - - - diff --git a/gluon/restricted.py b/gluon/restricted.py index ee59b16c..6533af47 100644 --- a/gluon/restricted.py +++ b/gluon/restricted.py @@ -305,11 +305,3 @@ def snapshot(info=None, context=5, code=None, environment=None): s[k] = BEAUTIFY(v) return s - - - - - - - - diff --git a/gluon/rewrite.py b/gluon/rewrite.py index 56af7d10..10227cde 100644 --- a/gluon/rewrite.py +++ b/gluon/rewrite.py @@ -1316,4 +1316,3 @@ def get_effective_router(appname): if not routers or appname not in routers: return None return Storage(routers[appname]) # return a copy - diff --git a/gluon/rocket.py b/gluon/rocket.py index e0a138a4..d8e832ae 100644 --- a/gluon/rocket.py +++ b/gluon/rocket.py @@ -1876,9 +1876,3 @@ def demo(): if __name__=='__main__': demo() - - - - - - diff --git a/gluon/sanitizer.py b/gluon/sanitizer.py index 80c94c03..6708a983 100644 --- a/gluon/sanitizer.py +++ b/gluon/sanitizer.py @@ -222,11 +222,3 @@ def sanitize(text, permitted_tags=[ if not isinstance(text, str): return str(text) return XssCleaner(permitted_tags=permitted_tags, allowed_attributes=allowed_attributes).strip(text, escape) - - - - - - - - diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 9c12ad0a..9f4a5a4a 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -962,4 +962,3 @@ def main(): if __name__=='__main__': main() - diff --git a/gluon/serializers.py b/gluon/serializers.py index 5c18db09..b9f2b04c 100644 --- a/gluon/serializers.py +++ b/gluon/serializers.py @@ -111,11 +111,3 @@ def rss(feed): pubDate=entry.get('created_on', now) ) for entry in feed.get('entries',[])]) return rss2.dumps(rss) - - - - - - - - diff --git a/gluon/settings.py b/gluon/settings.py index 6d0bea7a..655e6467 100644 --- a/gluon/settings.py +++ b/gluon/settings.py @@ -36,6 +36,3 @@ global_settings.is_jython = \ 'java' in sys.platform.lower() or \ hasattr(sys, 'JYTHON_JAR') or \ str(sys.copyright).find('Jython') > 0 - - - diff --git a/gluon/shell.py b/gluon/shell.py index 620dfbc3..10469a1c 100644 --- a/gluon/shell.py +++ b/gluon/shell.py @@ -424,11 +424,3 @@ def execute_from_command_line(argv=None): if __name__ == '__main__': execute_from_command_line() - - - - - - - - diff --git a/gluon/sql.py b/gluon/sql.py index cbbd4451..41dadbea 100644 --- a/gluon/sql.py +++ b/gluon/sql.py @@ -3,11 +3,3 @@ __all__ = ['DAL','Field','DRIVERS'] from dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, DRIVERS, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType - - - - - - - - diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 0e18ce0c..8ffae918 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2747,4 +2747,3 @@ class ExporterXML(ExportClass): out.write('\n') out.write('') return str(out.getvalue()) - diff --git a/gluon/storage.py b/gluon/storage.py index e7c027d4..a90ccd3d 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -258,11 +258,3 @@ class List(list): if __name__ == '__main__': import doctest doctest.testmod() - - - - - - - - diff --git a/gluon/streamer.py b/gluon/streamer.py index 5b192796..1b6dab2b 100644 --- a/gluon/streamer.py +++ b/gluon/streamer.py @@ -118,4 +118,3 @@ def stream_file_or_304_or_206( else: wrapped = streamer(stream, chunk_size=chunk_size, bytes=bytes) raise HTTP(status, wrapped, **headers) - diff --git a/gluon/template.py b/gluon/template.py index ec05e4a6..e531860c 100644 --- a/gluon/template.py +++ b/gluon/template.py @@ -889,11 +889,3 @@ def render(content = "hello world", if __name__ == '__main__': import doctest doctest.testmod() - - - - - - - - diff --git a/gluon/tools.py b/gluon/tools.py index 72123114..75eac67c 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -5022,9 +5022,3 @@ class Wiki(object): if __name__ == '__main__': import doctest doctest.testmod() - - - - - - diff --git a/gluon/utf8.py b/gluon/utf8.py index 06402c61..5882c400 100644 --- a/gluon/utf8.py +++ b/gluon/utf8.py @@ -652,7 +652,3 @@ if __name__ == '__main__': print "DOCTESTS FINISHED" doctests() - - - - diff --git a/gluon/utils.py b/gluon/utils.py index e3287f49..085f6d44 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -254,11 +254,3 @@ def is_valid_ip_address(address): return False else: # do not know what to do? assume it is a valid address return True - - - - - - - - diff --git a/gluon/validators.py b/gluon/validators.py index 49fabdf1..e577dbcc 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -3248,12 +3248,3 @@ class IS_IPV4(Validator): if __name__ == '__main__': import doctest doctest.testmod(optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS) - - - - - - - - - diff --git a/gluon/widget.py b/gluon/widget.py index 7b3cb53c..18b98bab 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -1218,13 +1218,3 @@ end tell except: pass logging.shutdown() - - - - - - - - - - diff --git a/gluon/winservice.py b/gluon/winservice.py index 67933796..3d448496 100644 --- a/gluon/winservice.py +++ b/gluon/winservice.py @@ -166,11 +166,3 @@ def web2py_windows_service_handler(argv=None, opt_file='options'): if __name__ == '__main__': web2py_windows_service_handler() - - - - - - - - diff --git a/gluon/xmlrpc.py b/gluon/xmlrpc.py index 756f08b7..7fa29978 100644 --- a/gluon/xmlrpc.py +++ b/gluon/xmlrpc.py @@ -19,11 +19,3 @@ def handler(request, response, methods): response.headers['Content-Type'] = 'text/xml' dispatch = getattr(dispatcher, '_dispatch', None) return dispatcher._marshaled_dispatch(request.body.read(), dispatch) - - - - - - - - diff --git a/isapiwsgihandler.py b/isapiwsgihandler.py index bce968b1..ce10023c 100644 --- a/isapiwsgihandler.py +++ b/isapiwsgihandler.py @@ -33,9 +33,3 @@ if __name__=='__main__': ScriptMapUpdate = "replace") params.VirtualDirs = [vd] HandleCommandLine(params) - - - - - - diff --git a/modpythonhandler.py b/modpythonhandler.py index 0973d6d6..ae2fa49e 100755 --- a/modpythonhandler.py +++ b/modpythonhandler.py @@ -222,9 +222,3 @@ def handler(req): Handler(req).run(gluon.main.wsgibase) return apache.OK - - - - - - diff --git a/options_std.py b/options_std.py index f00acfd8..feb0a48f 100644 --- a/options_std.py +++ b/options_std.py @@ -31,5 +31,3 @@ shutdown_timeout = 5 folder = os.getcwd() extcron = None nocron = None - - diff --git a/router.example.py b/router.example.py index 25cc6aba..f2e11498 100644 --- a/router.example.py +++ b/router.example.py @@ -209,9 +209,3 @@ def __routes_doctest(): if __name__ == '__main__': import doctest doctest.testmod() - - - - - - diff --git a/routes.example.py b/routes.example.py index 206b4f15..cab718b3 100644 --- a/routes.example.py +++ b/routes.example.py @@ -197,9 +197,3 @@ def __routes_doctest(): if __name__ == '__main__': import doctest doctest.testmod() - - - - - - diff --git a/scgihandler.py b/scgihandler.py index d18fafa8..acb055f8 100755 --- a/scgihandler.py +++ b/scgihandler.py @@ -72,8 +72,3 @@ if SOFTCRON: # uncomment one of the two rows below depending on the SCGIWSGI server installed #scgi.serve_application(application, '', 4000).run() SCGIServer(application, port=4000).enable_sighandler().run() - - - - - diff --git a/scripts/fixws.py b/scripts/fixws.py index 744657d7..8a1e7433 100755 --- a/scripts/fixws.py +++ b/scripts/fixws.py @@ -17,7 +17,7 @@ def write_fileb(filename, value, mode='wb'): for filename in glob.glob(sys.argv[1]): data1 = read_fileb(filename) write_fileb(filename + '.bak2', data1) - data2lines = read_fileb(filename).split('\n') + data2lines = read_fileb(filename).strip().split('\n') data2 = '\n'.join([line.rstrip().replace('\t',' '*2) for line in data2lines])+'\n' write_fileb(filename, data2) print filename, len(data1)-len(data2) diff --git a/setup.py b/setup.py index e4a82eb8..37e06275 100644 --- a/setup.py +++ b/setup.py @@ -77,4 +77,3 @@ if __name__ == '__main__': #s = raw_input('>') #if s.lower()[:1]=='y': start() - diff --git a/setup_app.py b/setup_app.py index 54e169cc..11df7c33 100755 --- a/setup_app.py +++ b/setup_app.py @@ -52,9 +52,3 @@ setup(app=['web2py.py'], 'packages': contributed_modules, }}, setup_requires=['py2app']) - - - - - - diff --git a/setup_exe.py b/setup_exe.py index 7855ab38..92d29639 100755 --- a/setup_exe.py +++ b/setup_exe.py @@ -182,9 +182,3 @@ if not make_zip and not remove_build_files: print "Finished!" print "Enjoy web2py " +web2py_version_line - - - - - - diff --git a/web2py.py b/web2py.py index 5ce0c209..125ddcdb 100755 --- a/web2py.py +++ b/web2py.py @@ -25,9 +25,3 @@ if __name__ == '__main__': except: sys.stderr.write('Sorry, -K only supported for python 2.6-2.7\n') gluon.widget.start(cron=True) - - - - - - diff --git a/wsgihandler.py b/wsgihandler.py index bb3c9f77..d43f37ca 100644 --- a/wsgihandler.py +++ b/wsgihandler.py @@ -42,9 +42,3 @@ else: if SOFTCRON: from gluon.settings import global_settings global_settings.web2py_crontype = 'soft' - - - - - -