fixed expiration of session when auth is required, fixed utcnow for p…

…y 3.13, formatting

apps/_dashboard/diff2kryten.py

@@ -1,6 +1,5 @@
 import sys
 
-
 # Note, when changing the Highlight.js css,
 # the background color of .file .diff should match the
 # background in the .hljs class in gitlog.min.css

apps/_dashboard/utils.py

@@ -9,14 +9,13 @@
 ---------------
 """
 
+import glob
+import gzip
+import logging
 import os
 import re
-import tarfile
-import glob
 import shutil
-import logging
-import gzip
-
+import tarfile
 
 __all__ = (
     "safe_join",

apps/_default/__init__.py

@@ -1,5 +1,7 @@
 import os
-from py4web import action, Cache
+
+from py4web import Cache, action
+
 cache = Cache(size=1000)
 
 @action("index")

apps/_documentation/__init__.py

@@ -1,4 +1,4 @@
-from py4web import action, redirect, URL
+from py4web import URL, action, redirect
 
 
 @action("index")

apps/_scaffold/__init__.py

@@ -3,15 +3,13 @@
 
 assert py4web.check_compatible("0.1.20190709.1")
 
+# by importing controllers you expose the actions defined in it
+from . import controllers
 # by importing db you expose it to the _dashboard/dbadmin
 from .models import db
-
 # import the scheduler
 from .tasks import scheduler
 
-# by importing controllers you expose the actions defined in it
-from . import controllers
-
 # optional parameters
 __version__ = "0.0.0"
 __author__ = "you <[email protected]>"

apps/_scaffold/common.py

@@ -4,14 +4,17 @@
 """
 import os
 import sys
-from py4web import Session, Cache, Translator, Flash, DAL, Field, action
+
+from pydal.tools.scheduler import Scheduler
+from pydal.tools.tags import Tags
+
+from py4web import DAL, Cache, Field, Flash, Session, Translator, action
 from py4web.server_adapters.logging_utils import make_logger
-from py4web.utils.mailer import Mailer
 from py4web.utils.auth import Auth
 from py4web.utils.downloader import downloader
-from pydal.tools.tags import Tags
-from pydal.tools.scheduler import Scheduler
 from py4web.utils.factories import ActionFactory
+from py4web.utils.mailer import Mailer
+
 from . import settings
 
 # #######################################################
@@ -56,7 +59,9 @@
     session = Session(secret=settings.SESSION_SECRET_KEY, storage=conn)
 
 elif settings.SESSION_TYPE == "memcache":
-    import memcache, time
+    import time
+
+    import memcache
 
     conn = memcache.Client(settings.MEMCACHE_CLIENTS, debug=0)
     session = Session(secret=settings.SESSION_SECRET_KEY, storage=conn)
@@ -127,9 +132,8 @@
     )
 
 if settings.OAUTH2GOOGLE_SCOPED_CREDENTIALS_FILE:
-    from py4web.utils.auth_plugins.oauth2google_scoped import (
-        OAuth2GoogleScoped,
-    )  # TESTED
+    from py4web.utils.auth_plugins.oauth2google_scoped import \
+        OAuth2GoogleScoped  # TESTED
 
     auth.register_plugin(
         OAuth2GoogleScoped(
@@ -151,7 +155,8 @@
     )
 
 if settings.OAUTH2FACEBOOK_CLIENT_ID:
-    from py4web.utils.auth_plugins.oauth2facebook import OAuth2Facebook  # UNTESTED
+    from py4web.utils.auth_plugins.oauth2facebook import \
+        OAuth2Facebook  # UNTESTED
 
     auth.register_plugin(
         OAuth2Facebook(

apps/_scaffold/controllers.py

@@ -25,19 +25,12 @@
 Warning: Fixtures MUST be declared with @action.uses({fixtures}) else your app will result in undefined behavior
 """
 
-from py4web import action, request, abort, redirect, URL
 from yatl.helpers import A
-from .common import (
-    db,
-    session,
-    T,
-    cache,
-    auth,
-    logger,
-    authenticated,
-    unauthenticated,
-    flash,
-)
+
+from py4web import URL, abort, action, redirect, request
+
+from .common import (T, auth, authenticated, cache, db, flash, logger, session,
+                     unauthenticated)
 
 
 @action("index")

apps/_scaffold/models.py

@@ -2,9 +2,10 @@
 This file defines the database models
 """
 
-from .common import db, Field
 from pydal.validators import *
 
+from .common import Field, db
+
 ### Define your table below
 #
 # db.define_table('thing', Field('name'))

apps/_scaffold/settings.py

@@ -6,6 +6,7 @@
 This file is provided as an example:
 """
 import os
+
 from py4web.core import required_folder
 
 # mode (default or development)

apps/_scaffold/tasks.py

@@ -1,4 +1,4 @@
-from .common import settings, scheduler
+from .common import scheduler, settings
 from .models import db
 
 # #######################################################

apps/fadebook/__init__.py

@@ -3,11 +3,10 @@
 
 assert py4web.check_compatible("0.1.20190709.1")
 
-# by importing db you expose it to the _dashboard/dbadmin
-from .models import db
-
 # by importing controllers you expose the actions defined in it
 from . import controllers
+# by importing db you expose it to the _dashboard/dbadmin
+from .models import db
 
 # optional parameters
 __version__ = "0.0.0"

apps/fadebook/common.py

@@ -4,14 +4,17 @@
 """
 import os
 import sys
-from py4web import Session, Cache, Translator, Flash, DAL, Field, action
+
+from pydal.tools.scheduler import Scheduler
+from pydal.tools.tags import Tags
+
+from py4web import DAL, Cache, Field, Flash, Session, Translator, action
 from py4web.server_adapters.logging_utils import make_logger
-from py4web.utils.mailer import Mailer
 from py4web.utils.auth import Auth
 from py4web.utils.downloader import downloader
-from pydal.tools.tags import Tags
-from pydal.tools.scheduler import Scheduler
 from py4web.utils.factories import ActionFactory
+from py4web.utils.mailer import Mailer
+
 from . import settings
 
 # #######################################################
@@ -56,7 +59,9 @@
     session = Session(secret=settings.SESSION_SECRET_KEY, storage=conn)
 
 elif settings.SESSION_TYPE == "memcache":
-    import memcache, time
+    import time
+
+    import memcache
 
     conn = memcache.Client(settings.MEMCACHE_CLIENTS, debug=0)
     session = Session(secret=settings.SESSION_SECRET_KEY, storage=conn)
@@ -127,9 +132,8 @@
     )
 
 if settings.OAUTH2GOOGLE_SCOPED_CREDENTIALS_FILE:
-    from py4web.utils.auth_plugins.oauth2google_scoped import (
-        OAuth2GoogleScoped,
-    )  # TESTED
+    from py4web.utils.auth_plugins.oauth2google_scoped import \
+        OAuth2GoogleScoped  # TESTED
 
     auth.register_plugin(
         OAuth2GoogleScoped(
@@ -151,7 +155,8 @@
     )
 
 if settings.OAUTH2FACEBOOK_CLIENT_ID:
-    from py4web.utils.auth_plugins.oauth2facebook import OAuth2Facebook  # UNTESTED
+    from py4web.utils.auth_plugins.oauth2facebook import \
+        OAuth2Facebook  # UNTESTED
 
     auth.register_plugin(
         OAuth2Facebook(

apps/fadebook/controllers.py

@@ -1,6 +1,7 @@
-from py4web import action, redirect, URL, Field, HTTP
+from py4web import HTTP, URL, Field, action, redirect
 from py4web.utils.form import Form
-from .common import flash, session, db, auth
+
+from .common import auth, db, flash, session
 from .make_up_data import make
 
 #

apps/fadebook/make_up_data.py

@@ -3,9 +3,10 @@
 
 def make():
     # prevent circular imports
-    from .common import db, action
     from py4web.utils.populate import populate
 
+    from .common import action, db
+
     if db(db.auth_user).count() == 1:
         populate(db.auth_user, 10, contents={"is_active": True})
         populate(db.feed_item, 100, contents={"is_active": True})

apps/fadebook/models.py

@@ -1,6 +1,7 @@
-from .common import *
 from pydal.validators import IS_NOT_EMPTY
 
+from .common import *
+
 db.define_table(
     "feed_item", Field("body", "text", requires=IS_NOT_EMPTY()), auth.signature
 )

apps/fadebook/settings.py

@@ -6,6 +6,7 @@
 This file is provided as an example:
 """
 import os
+
 from py4web.core import required_folder
 
 # mode (default or development)

apps/showcase/__init__.py

@@ -20,11 +20,11 @@
 from .examples.page_with_redirect import page_with_redirect, target
 from .examples.page_with_template import page_with_template
 from .examples.page_without_template import page_without_template
+from .examples.rest import rest
+from .examples.rpc import rpc
 from .examples.session_clear import session_clear
 from .examples.session_counter import session_counter
 from .examples.tagsinput_form import tagsinput_form
-from .examples.rest import rest
-from .examples.rpc import rpc
 from .vue_components_examples.vue_file_uploader import vue_file_uploader
 from .vue_components_examples.vue_grid import vue_grid
 from .vue_components_examples.vue_star_rater import vue_star_rater
@@ -33,7 +33,6 @@
     from .examples.auth_form import auth_form
     from .examples.auth_forms import auth_forms
     from .examples.create_form import create_form
-    from .examples.update_form import update_form
     from .examples.custom_form import custom_form
     from .examples.example_ajax_grid import example_ajax_grid
     from .examples.example_html_grid import example_html_grid
@@ -43,11 +42,12 @@
     from .examples.show_a_button import show_a_button
     from .examples.socketio import index as socketio
     from .examples.test_expose import test_expose1, test_expose2, test_expose3
-    from .vue_components_examples.vue_view_form import vue_view_form
-    from .vue_components_examples.vue_insert_form import vue_insert_form
+    from .examples.update_form import update_form
+    from .examples.ws import index as ws
     from .vue_components_examples.vue_edit_form import vue_edit_form
     from .vue_components_examples.vue_grid_and_forms import vue_grid_and_forms
-    from .examples.ws import index as ws
+    from .vue_components_examples.vue_insert_form import vue_insert_form
+    from .vue_components_examples.vue_view_form import vue_view_form
 
 
 @action("index")

apps/showcase/examples/example_html_grid.py

@@ -2,7 +2,7 @@
 
 from yatl.helpers import A, I
 
-from py4web import action, URL, redirect
+from py4web import URL, action, redirect
 from py4web.utils.form import FormStyleDefault
 from py4web.utils.grid import Column, Grid, GridClassStyle
 

apps/showcase/examples/rest.py

@@ -1,8 +1,9 @@
-import uuid
 import json
-from py4web.core import action, request, response, Fixture
-from .models import db, Field
+import uuid
+
+from py4web.core import Fixture, action, request, response
 
+from .models import Field, db
 
 # for demo purposes we create a table of tokens
 # in practice you want to link them to users

apps/showcase/examples/rpc.py

@@ -1,7 +1,8 @@
+import requests
+
 from py4web import action, request
 from py4web.utils.jsonrpc import JsonRpc
 
-import requests
 
 # define a function you want to expose
 def add(x, y):

apps/tagged_posts/__init__.py

@@ -3,11 +3,10 @@
 
 assert py4web.check_compatible("0.1.20190709.1")
 
-# by importing db you expose it to the _dashboard/dbadmin
-from .models import db
-
 # by importing controllers you expose the actions defined in it
 from . import controllers
+# by importing db you expose it to the _dashboard/dbadmin
+from .models import db
 
 # optional parameters
 __version__ = "0.0.0"