From 038e25c259ad2fa5a63884e0343571f1c40b858a Mon Sep 17 00:00:00 2001 From: Hardirc Date: Fri, 8 Apr 2016 20:05:21 -0400 Subject: [PATCH] Enhance welcome db.py PEP8 --- applications/welcome/models/db.py | 140 ++++++++++++++++++------------ 1 file changed, 86 insertions(+), 54 deletions(-) diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py index 32dc27d5..63300c95 100644 --- a/applications/welcome/models/db.py +++ b/applications/welcome/models/db.py @@ -1,60 +1,84 @@ # -*- coding: utf-8 -*- -######################################################################### -## This scaffolding model makes your app work on Google App Engine too -## File is released under public domain and you can use without limitations -######################################################################### +# ------------------------------------------------------------------------- +# This scaffolding model makes your app work on Google App Engine too +# File is released under public domain and you can use without limitations +# ------------------------------------------------------------------------- if request.global_settings.web2py_version < "2.14.1": raise HTTP(500, "Requires web2py 2.13.3 or newer") -## if SSL/HTTPS is properly configured and you want all HTTP requests to -## be redirected to HTTPS, uncomment the line below: +# ------------------------------------------------------------------------- +# if SSL/HTTPS is properly configured and you want all HTTP requests to +# be redirected to HTTPS, uncomment the line below: +# ------------------------------------------------------------------------- # request.requires_https() -## app configuration made easy. Look inside private/appconfig.ini +# ------------------------------------------------------------------------- +# app configuration made easy. Look inside private/appconfig.ini +# ------------------------------------------------------------------------- from gluon.contrib.appconfig import AppConfig -## once in production, remove reload=True to gain full speed + +# ------------------------------------------------------------------------- +# once in production, remove reload=True to gain full speed +# ------------------------------------------------------------------------- myconf = AppConfig(reload=True) if not request.env.web2py_runtime_gae: - ## if NOT running on Google App Engine use SQLite or other DB - db = DAL(myconf.get('db.uri'), - pool_size = myconf.get('db.pool_size'), - migrate_enabled = myconf.get('db.migrate'), - check_reserved = ['all']) + # --------------------------------------------------------------------- + # if NOT running on Google App Engine use SQLite or other DB + # --------------------------------------------------------------------- + db = DAL(myconf.get('db.uri'), + pool_size=myconf.get('db.pool_size'), + migrate_enabled=myconf.get('db.migrate'), + check_reserved=['all']) else: - ## connect to Google BigTable (optional 'google:datastore://namespace') + # --------------------------------------------------------------------- + # connect to Google BigTable (optional 'google:datastore://namespace') + # --------------------------------------------------------------------- db = DAL('google:datastore+ndb') - ## store sessions and tickets there + # --------------------------------------------------------------------- + # store sessions and tickets there + # --------------------------------------------------------------------- session.connect(request, response, db=db) - ## or store session in Memcache, Redis, etc. - ## from gluon.contrib.memdb import MEMDB - ## from google.appengine.api.memcache import Client - ## session.connect(request, response, db = MEMDB(Client())) + # --------------------------------------------------------------------- + # or store session in Memcache, Redis, etc. + # from gluon.contrib.memdb import MEMDB + # from google.appengine.api.memcache import Client + # session.connect(request, response, db = MEMDB(Client())) + # --------------------------------------------------------------------- -## by default give a view/generic.extension to all actions from localhost -## none otherwise. a pattern can be 'controller/function.extension' +# ------------------------------------------------------------------------- +# by default give a view/generic.extension to all actions from localhost +# none otherwise. a pattern can be 'controller/function.extension' +# ------------------------------------------------------------------------- response.generic_patterns = ['*'] if request.is_local else [] -## choose a style for forms +# ------------------------------------------------------------------------- +# choose a style for forms +# ------------------------------------------------------------------------- response.formstyle = myconf.get('forms.formstyle') # or 'bootstrap3_stacked' or 'bootstrap2' or other response.form_label_separator = myconf.get('forms.separator') or '' - -## (optional) optimize handling of static files +# ------------------------------------------------------------------------- +# (optional) optimize handling of static files +# ------------------------------------------------------------------------- # response.optimize_css = 'concat,minify,inline' # response.optimize_js = 'concat,minify,inline' -## (optional) static assets folder versioning + +# ------------------------------------------------------------------------- +# (optional) static assets folder versioning +# ------------------------------------------------------------------------- # response.static_version = '0.0.0' -######################################################################### -## Here is sample code if you need for -## - email capabilities -## - authentication (registration, login, logout, ... ) -## - authorization (role based authorization) -## - services (xml, csv, json, xmlrpc, jsonrpc, amf, rss) -## - old style crud actions -## (more options discussed in gluon/tools.py) -######################################################################### + +# ------------------------------------------------------------------------- +# Here is sample code if you need for +# - email capabilities +# - authentication (registration, login, logout, ... ) +# - authorization (role based authorization) +# - services (xml, csv, json, xmlrpc, jsonrpc, amf, rss) +# - old style crud actions +# (more options discussed in gluon/tools.py) +# ------------------------------------------------------------------------- from gluon.tools import Auth, Service, PluginManager @@ -63,10 +87,14 @@ auth = Auth(db, host_names=myconf.get('host.names')) service = Service() plugins = PluginManager() -## create all tables needed by auth if not custom tables +# ------------------------------------------------------------------------- +# create all tables needed by auth if not custom tables +# ------------------------------------------------------------------------- auth.define_tables(username=False, signature=False) -## configure email +# ------------------------------------------------------------------------- +# configure email +# ------------------------------------------------------------------------- mail = auth.settings.mailer mail.settings.server = 'logging' if request.is_local else myconf.get('smtp.server') mail.settings.sender = myconf.get('smtp.sender') @@ -74,27 +102,31 @@ mail.settings.login = myconf.get('smtp.login') mail.settings.tls = myconf.get('smtp.tls') or False mail.settings.ssl = myconf.get('smtp.ssl') or False -## configure auth policy +# ------------------------------------------------------------------------- +# configure auth policy +# ------------------------------------------------------------------------- auth.settings.registration_requires_verification = False auth.settings.registration_requires_approval = False auth.settings.reset_password_requires_verification = True -######################################################################### -## Define your tables below (or better in another model file) for example -## -## >>> db.define_table('mytable',Field('myfield','string')) -## -## Fields can be 'string','text','password','integer','double','boolean' -## 'date','time','datetime','blob','upload', 'reference TABLENAME' -## There is an implicit 'id integer autoincrement' field -## Consult manual for more options, validators, etc. -## -## More API examples for controllers: -## -## >>> db.mytable.insert(myfield='value') -## >>> rows=db(db.mytable.myfield=='value').select(db.mytable.ALL) -## >>> for row in rows: print row.id, row.myfield -######################################################################### +# ------------------------------------------------------------------------- +# Define your tables below (or better in another model file) for example +# +# >>> db.define_table('mytable', Field('myfield', 'string')) +# +# Fields can be 'string','text','password','integer','double','boolean' +# 'date','time','datetime','blob','upload', 'reference TABLENAME' +# There is an implicit 'id integer autoincrement' field +# Consult manual for more options, validators, etc. +# +# More API examples for controllers: +# +# >>> db.mytable.insert(myfield='value') +# >>> rows = db(db.mytable.myfield == 'value').select(db.mytable.ALL) +# >>> for row in rows: print row.id, row.myfield +# ------------------------------------------------------------------------- -## after defining tables, uncomment below to enable auditing +# ------------------------------------------------------------------------- +# after defining tables, uncomment below to enable auditing +# ------------------------------------------------------------------------- # auth.enable_record_versioning(db)