From a45bffc90843a876997f53df38b405e990dedf17 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 1 Aug 2016 05:02:52 -0500 Subject: [PATCH] fixed admin imports --- applications/admin/controllers/default.py | 2 +- applications/admin/models/access.py | 2 +- applications/admin/private/hosts.deny | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index 6c46d971..bdadcf2b 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -15,7 +15,7 @@ from gluon.utils import web2py_uuid from gluon.tools import Config from gluon.compileapp import find_exposed_functions from glob import glob -from gluon._compat import iteritems, PY2, pickle, xrange, urlopen, to_bytes, StringIO, to_native +from pydal._compat import iteritems, PY2, pickle, xrange, urlopen, to_bytes, StringIO, to_native import shutil import platform diff --git a/applications/admin/models/access.py b/applications/admin/models/access.py index b94ce8d0..7e24ac58 100644 --- a/applications/admin/models/access.py +++ b/applications/admin/models/access.py @@ -1,10 +1,10 @@ import base64 import os import time -from gluon import portalocker from gluon.admin import apath from gluon.fileutils import read_file from gluon.utils import web2py_uuid +from pydal.contrib import portalocker # ########################################################### # ## make sure administrator is on localhost or https # ########################################################### diff --git a/applications/admin/private/hosts.deny b/applications/admin/private/hosts.deny index e69de29b..9447a26c 100644 --- a/applications/admin/private/hosts.deny +++ b/applications/admin/private/hosts.deny @@ -0,0 +1 @@ +127.0.0.1 1 1470045759