From b0a01ef7207c2d48f9aa9e5baa4fba897ce4d422 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 10 Jul 2017 03:13:12 -0500 Subject: [PATCH] fixed some relative imports, thanks steve.van.christen --- Makefile | 4 ++-- applications/welcome/routes.example.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3475d649..fa50dd8e 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ update: echo "remember that pymysql was tweaked" src: ### Use semantic versioning - echo 'Version 2.15.0-beta+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.15.1-beta+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean ### clean up baisc apps @@ -54,7 +54,7 @@ src: ### build web2py_src.zip echo '' > NEWINSTALL mv web2py_src.zip web2py_src_old.zip | echo 'no old' - cd ..; zip -r web2py/web2py_src.zip web2py/web2py.py web2py/anyserver.py web2py/gluon/* web2py/extras/* web2py/handlers/* web2py/examples/* web2py/README.markdown web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/MANIFEST.in web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py + cd ..; zip -r web2py/web2py_src.zip web2py/web2py.py web2py/anyserver.py web2py/fabfile.py web2py/gluon/* web2py/extras/* web2py/handlers/* web2py/examples/* web2py/README.markdown web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/MANIFEST.in web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py mdp: make src diff --git a/applications/welcome/routes.example.py b/applications/welcome/routes.example.py index 2530c9fb..fa2a6c81 100644 --- a/applications/welcome/routes.example.py +++ b/applications/welcome/routes.example.py @@ -20,8 +20,8 @@ # YOU CAN COPY THIS FILE TO ANY APPLICATION'S ROOT DIRECTORY WITHOUT CHANGES! # ---------------------------------------------------------------------------------------------------------------------- -from fileutils import abspath -from languages import read_possible_languages +from gluon.fileutils import abspath +from gluon.languages import read_possible_languages possible_languages = read_possible_languages(abspath('applications', app)) # ----------------------------------------------------------------------------------------------------------------------