R-2.18.3

fix for building python 3 windows binaries

CHANGELOG

@@ -1,4 +1,4 @@
-## 2.18.1-2.18.2
+## 2.18.1-2.18.3
 - pydal 19.02
 - made template its own module (Yet Another Template Language)
 - improved python 3.4-3.7 support

Makefile

@@ -6,17 +6,18 @@ clean:
 	rm -f httpserver.log 
 	rm -f parameters*.py 
 	rm -f -r applications/*/compiled
-	find ./ -name '*~' -exec rm -f {} \; 
-	find ./ -name '*.orig' -exec rm -f {} \; 
-	find ./ -name '*.rej' -exec rm -f {} \; 
-	find ./ -name '#*' -exec rm -f {} \;
-	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
-	# find ./gluon/ -name '.*' -exec rm -f {} \;
-	find ./gluon/ -name '*class' -exec rm -f {} \; 
-	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
-	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
-	find ./applications/welcome/ -name '.*' -exec rm -f {} \; 
-	find ./ -name '*.pyc' -exec rm -f {} \;
+	find . -name '*~' -exec rm -f {} \; 
+	find . -name '*.orig' -exec rm -f {} \; 
+	find . -name '*.rej' -exec rm -f {} \; 
+	find . -name '#*' -exec rm -f {} \;
+	find . -name 'Thumbs.db' -exec rm -f {} \; 
+	find . -name '.tox' -exec rm -rf {} \; 
+	find . -name '__pycache__' -exec rm -rf {} \; 
+	find gluon/ -name '*class' -exec rm -f {} \; 
+	find applications/admin/ -name '.*' -exec rm -f {} \; 
+	find applications/examples/ -name '.*' -exec rm -f {} \; 
+	find applications/welcome/ -name '.*' -exec rm -f {} \; 
+	find . -name '*.pyc' -exec rm -f {} \;
 tests:
 	python web2py.py --run_system_tests
 coverage:
@@ -44,9 +45,9 @@ rmfiles:
 	rm -rf applications/examples/uploads/* 
 src:
 	### Use semantic versioning
-	echo 'Version 2.18.2-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.18.3-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
-	#make clean
+	make clean
 	# make rmfiles
 	### make welcome layout and appadmin the default
 	cp applications/welcome/views/appadmin.html applications/admin/views
@@ -56,7 +57,7 @@ src:
 	### build web2py_src.zip
 	echo '' > NEWINSTALL
 	mv web2py_src.zip web2py_src_old.zip | echo 'no old'
-	cd ..; zip -r --exclude=**.git** 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
+	cd ..; zip -r --exclude=**.git** --exclude=**.tox** --exclude=**_pycache__** 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

VERSION

@@ -1 +1 @@
-Version 2.18.2-stable+timestamp.2019.02.25.21.46.30
+Version 2.18.3-stable+timestamp.2019.03.03.15.06.20

applications/admin/languages/it.py

@@ -216,6 +216,7 @@
 'Enable': 'Enable',
 'Enable Close-Tag': 'Enable Close-Tag',
 'Enable Code Folding': 'Enable Code Folding',
+'Enter an integer between %(min)g and %(max)g': 'Enter an integer between %(min)g and %(max)g',
 'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error': 'Error',
 'Error logs for "%(app)s"': 'Log degli errori per "%(app)s"',

applications/welcome/languages/it.py

@@ -49,6 +49,7 @@
 'Cannot be empty': 'Non può essere vuoto',
 'Change password': 'Cambia Password',
 'change password': 'Cambia password',
+'Change Password': 'Change Password',
 'Check to delete': 'Seleziona per cancellare',
 'Clear': 'Resetta',
 'Clear CACHE?': 'Resetta CACHE?',
@@ -60,6 +61,7 @@
 'Community': 'Community',
 'Components and Plugins': 'Componenti and Plugin',
 'Config.ini': 'Config.ini',
+'Confirm Password': 'Confirm Password',
 'contains': 'contiene',
 'Controller': 'Controller',
 'Copyright': 'Copyright',
@@ -155,6 +157,7 @@
 'Lost Password': 'Password Smarrita',
 'Lost password?': 'Password smarrita?',
 'lost password?': 'dimenticato la password?',
+'Lost your password?': 'Lost your password?',
 'Main Menu': 'Menu principale',
 'Manage %(action)s': 'Manage %(action)s',
 'Manage Access Control': 'Manage Access Control',

gluon/__init__.py

@@ -10,39 +10,29 @@ Web2Py framework modules
 ========================
 """
 
-__all__ = ['A', 'B', 'BEAUTIFY', 'BODY', 'BR', 'CAT', 'CENTER', 'CLEANUP', 'CODE', 'CRYPT', 'DAL', 'DIV', 'EM', 'EMBED', 'FIELDSET', 'FORM', 'Field', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'HEAD', 'HR', 'HTML', 'HTTP', 'I', 'IFRAME', 'IMG', 'INPUT', 'IS_ALPHANUMERIC', 'IS_DATE', 'IS_DATETIME', 'IS_DATETIME_IN_RANGE', 'IS_DATE_IN_RANGE', 'IS_DECIMAL_IN_RANGE', 'IS_EMAIL', 'IS_LIST_OF_EMAILS', 'IS_EMPTY_OR', 'IS_EQUAL_TO', 'IS_EXPR', 'IS_FLOAT_IN_RANGE', 'IS_IMAGE', 'IS_JSON', 'IS_INT_IN_RANGE', 'IS_IN_DB', 'IS_IN_SET', 'IS_IPV4', 'IS_LENGTH', 'IS_LIST_OF', 'IS_LOWER', 'IS_MATCH', 'IS_NOT_EMPTY', 'IS_NOT_IN_DB', 'IS_NULL_OR', 'IS_SLUG', 'IS_STRONG', 'IS_TIME', 'IS_UPLOAD_FILENAME', 'IS_UPPER', 'IS_URL', 'LABEL', 'LEGEND', 'LI', 'LINK', 'LOAD', 'MARKMIN', 'MENU', 'META', 'OBJECT', 'OL', 'ON', 'OPTGROUP', 'OPTION', 'P', 'PRE', 'SCRIPT', 'SELECT', 'SPAN', 'SQLFORM', 'SQLTABLE', 'STRONG', 'STYLE', 'TABLE', 'TAG', 'TBODY', 'TD', 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'UL', 'URL', 'XHTML', 'XML', 'redirect', 'current', 'embed64']
+__all__ = ['A', 'B', 'BEAUTIFY', 'BODY', 'BR', 'CAT', 'CENTER', 'CLEANUP', 'CODE', 'CRYPT', 'DAL', 'DIV', 'EM', 'EMBED', 'FIELDSET', 'FORM', 'Field', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'HEAD', 'HR', 'HTML', 'HTTP', 'I', 'IFRAME', 'IMG', 'INPUT', 'IS_ALPHANUMERIC', 'IS_DATE', 'IS_DATETIME', 'IS_DATETIME_IN_RANGE', 'IS_DATE_IN_RANGE', 'IS_DECIMAL_IN_RANGE', 'IS_EMAIL', 'IS_LIST_OF_EMAILS', 'IS_EMPTY_OR', 'IS_EQUAL_TO', 'IS_EXPR', 'IS_FILE', 'IS_FLOAT_IN_RANGE', 'IS_IMAGE', 'IS_JSON', 'IS_INT_IN_RANGE', 'IS_IN_DB', 'IS_IN_SET', 'IS_IPV4', 'IS_LENGTH', 'IS_LIST_OF', 'IS_LOWER', 'IS_MATCH', 'IS_NOT_EMPTY', 'IS_NOT_IN_DB', 'IS_NULL_OR', 'IS_SLUG', 'IS_STRONG', 'IS_TIME', 'IS_UPLOAD_FILENAME', 'IS_UPPER', 'IS_URL', 'LABEL', 'LEGEND', 'LI', 'LINK', 'LOAD', 'MARKMIN', 'MENU', 'META', 'OBJECT', 'OL', 'ON', 'OPTGROUP', 'OPTION', 'P', 'PRE', 'SCRIPT', 'SELECT', 'SPAN', 'SQLFORM', 'SQLTABLE', 'STRONG', 'STYLE', 'TABLE', 'TAG', 'TBODY', 'TD', 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'UL', 'URL', 'XHTML', 'XML', 'redirect', 'current', 'embed64']
 
 #: add pydal to sys.modules
 import os
 import sys
-try:
-    pydalpath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "packages", "dal")
-    if pydalpath not in sys.path:
-        sys.path.append(pydalpath)
-    import pydal
-    sys.modules['pydal'] = pydal
-except ImportError:
-    raise RuntimeError(
-        "web2py depends on pydal, which apparently you have not installed.\n" +
-        "Probably you cloned the repository using git without '--recursive'" +
-        "\nTo fix this, please run (from inside your web2py folder):\n\n" +
-        "     git submodule update --init --recursive\n\n" +
-        "You can also download a complete copy from http://www.web2py.com."
-    )
-try:
-    yatlpath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "packages", "yatl")
-    if yatlpath not in sys.path:
-        sys.path.append(yatlpath)
-    import yatl
-    sys.modules['yatl'] = yatl
-except ImportError:
-    raise RuntimeError(
-        "web2py depends on yatl, which apparently you have not installed.\n" +
-        "Probably you cloned the repository using git without '--recursive'" +
-        "\nTo fix this, please run (from inside your web2py folder):\n\n" +
-        "     git submodule update --init --recursive\n\n" +
-        "You can also download a complete copy from http://www.web2py.com."
-    )
+
+MESSAGE = ("web2py depends on %s, which apparently you have not installed.\n" +
+           "Probably you cloned the repository using git without '--recursive'" +
+           "\nTo fix this, please run (from inside your web2py folder):\n\n" +
+           "     git submodule update --init --recursive\n\n" +
+           "You can also download a complete copy from http://www.web2py.com.")
+
+def import_packages():
+    for package, location in [('pydal', 'dal'), ('yatl', 'yatl')]:
+        try:
+            path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "packages", location)
+            if path not in sys.path:
+                sys.path.insert(0, path)
+            sys.modules[package] = __import__(package)
+        except ImportError:
+            raise RuntimeError(MESSAGE % package)
+
+import_packages()
 
 from .globals import current
 from .html import *

gluon/admin.py

@@ -436,7 +436,8 @@ def add_path_first(path):
     sys.path = [path] + [p for p in sys.path if (
         not p == path and not p == (path + '/'))]
     if not global_settings.web2py_runtime_gae:
-        site.addsitedir(path)
+        if not path in sys.path:
+            site.addsitedir(path)
 
 
 def try_mkdir(path):

gluon/cache.py

@@ -600,15 +600,14 @@ class Cache(object):
                     (session_, vars_, lang_, user_agent_, public_) = \
                         (session, vars, lang, user_agent, public)
 
+                expires = 'Fri, 01 Jan 1990 00:00:00 GMT'
                 if time_expire:
                     cache_control = 'max-age=%(time_expire)s, s-maxage=%(time_expire)s' % dict(time_expire=time_expire)
-                    if not session_ and public_:
-                        cache_control += ', public'
-                        expires = (current.request.utcnow + datetime.timedelta(seconds=time_expire)
-                                   ).strftime('%a, %d %b %Y %H:%M:%S GMT')
-                    else:
-                        cache_control += ', private'
-                        expires = 'Fri, 01 Jan 1990 00:00:00 GMT'
+                    expires = (current.request.utcnow + datetime.timedelta(seconds=time_expire)).strftime(
+                        '%a, %d %b %Y %H:%M:%S GMT')
+                else:
+                    cache_control = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
+                cache_control += ', public' if not session_ and public_ else ', private'
 
                 if cache_model:
                     # figure out the correct cache key

gluon/compileapp.py

@@ -429,7 +429,7 @@ def build_environment(request, response, session, store_current=True):
     c = environment['cache'] = Cache(request)
 
     # configure the validator to use the t translator
-    Validator.translator = T
+    Validator.translator = staticmethod(lambda text: None if text is None else str(T(text)))
 
     if store_current:
         current.globalenv = environment

gluon/contrib/redis_cache.py

@@ -85,7 +85,7 @@ def RedisCache(redis_conn=None, debug=False, with_lock=False, fail_gracefully=Fa
 
     locker.acquire()
     try:
-        if not application:
+        if application is None:
             application = current.request.application
         instance_name = 'redis_instance_' + application
         if not hasattr(RedisCache, instance_name):
@@ -110,10 +110,10 @@ class RedisClient(object):
         self.debug = debug
         self.with_lock = with_lock
         self.fail_gracefully = fail_gracefully
-        self.application = application
-        self.prefix = "w2p:cache:%s:" % application
+        self.application = application or current.request.application
+        self.prefix = "w2p:cache:%s:" % self.application
         if self.request:
-            app = application
+            app = self.application
         else:
             app = ''
 
@@ -126,7 +126,7 @@ class RedisClient(object):
         else:
             self.storage = self.meta_storage[app]
 
-        self.cache_set_key = 'w2p:%s:___cache_set' % application
+        self.cache_set_key = 'w2p:%s:___cache_set' % self.application
 
         self.r_server = redis_conn
         self._release_script = register_release_lock(self.r_server)

gluon/contrib/redis_utils.py

@@ -29,14 +29,16 @@ except ImportError:
 locker = Lock()
 
 
-def RConn(*args, **vars):
+def RConn(application=None, *args, **vars):
     """
     Istantiates a StrictRedis connection with parameters, at the first time
     only
     """
     locker.acquire()
     try:
-        instance_name = 'redis_conn_' + current.request.application
+        if application is None:
+            application = current.request.application
+        instance_name = 'redis_conn_' + application
         if not hasattr(RConn, instance_name):
             setattr(RConn, instance_name, redis.StrictRedis(*args, **vars))
         return getattr(RConn, instance_name)

gluon/contrib/webclient.py

@@ -121,7 +121,7 @@ class WebClient(object):
                 self.method = 'POST' if method=='auto' else method
                 # if there is only one form, set _formname automatically
                 if not '_formname' in data and len(self.forms) == 1:
-                    data['_formname'] = self.forms.keys()[0]
+                    data['_formname'] = next(iter(self.forms.keys())) # Use the first key
 
                 # if there is no formkey but it is known, set it
                 if '_formname' in data and not '_formkey' in data and \

gluon/highlight.py

@@ -166,7 +166,7 @@ class Highlighter(object):
                         + r'from|True|False)(?![a-zA-Z0-9_])'),
              'color:#185369; font-weight: bold'),
             ('WEB2PY',
-             re.compile(r'(request|response|session|cache|redirect|local_import|HTTP|TR|XML|URL|BEAUTIFY|A|BODY|BR|B|CAT|CENTER|CODE|COL|COLGROUP|DIV|EM|EMBED|FIELDSET|LEGEND|FORM|H1|H2|H3|H4|H5|H6|IFRAME|HEAD|HR|HTML|I|IMG|INPUT|LABEL|LI|LINK|MARKMIN|MENU|META|OBJECT|OL|ON|OPTION|P|PRE|SCRIPT|SELECT|SPAN|STYLE|TABLE|THEAD|TBODY|TFOOT|TAG|TD|TEXTAREA|TH|TITLE|TT|T|UL|XHTML|IS_SLUG|IS_STRONG|IS_LOWER|IS_UPPER|IS_ALPHANUMERIC|IS_DATETIME|IS_DATETIME_IN_RANGE|IS_DATE|IS_DATE_IN_RANGE|IS_DECIMAL_IN_RANGE|IS_EMAIL|IS_EXPR|IS_FLOAT_IN_RANGE|IS_IMAGE|IS_INT_IN_RANGE|IS_IN_SET|IS_IPV4|IS_LIST_OF|IS_LENGTH|IS_MATCH|IS_EQUAL_TO|IS_EMPTY_OR|IS_NULL_OR|IS_NOT_EMPTY|IS_TIME|IS_UPLOAD_FILENAME|IS_URL|CLEANUP|CRYPT|IS_IN_DB|IS_NOT_IN_DB|DAL|Field|SQLFORM|SQLTABLE|xmlescape|embed64)(?![a-zA-Z0-9_])'
+             re.compile(r'(request|response|session|cache|redirect|local_import|HTTP|TR|XML|URL|BEAUTIFY|A|BODY|BR|B|CAT|CENTER|CODE|COL|COLGROUP|DIV|EM|EMBED|FIELDSET|LEGEND|FORM|H1|H2|H3|H4|H5|H6|IFRAME|HEAD|HR|HTML|I|IMG|INPUT|LABEL|LI|LINK|MARKMIN|MENU|META|OBJECT|OL|ON|OPTION|P|PRE|SCRIPT|SELECT|SPAN|STYLE|TABLE|THEAD|TBODY|TFOOT|TAG|TD|TEXTAREA|TH|TITLE|TT|T|UL|XHTML|IS_SLUG|IS_STRONG|IS_LOWER|IS_UPPER|IS_ALPHANUMERIC|IS_DATETIME|IS_DATETIME_IN_RANGE|IS_DATE|IS_DATE_IN_RANGE|IS_DECIMAL_IN_RANGE|IS_EMAIL|IS_EXPR|IS_FILE|IS_FLOAT_IN_RANGE|IS_IMAGE|IS_INT_IN_RANGE|IS_IN_SET|IS_IPV4|IS_LIST_OF|IS_LENGTH|IS_MATCH|IS_EQUAL_TO|IS_EMPTY_OR|IS_NULL_OR|IS_NOT_EMPTY|IS_TIME|IS_UPLOAD_FILENAME|IS_URL|CLEANUP|CRYPT|IS_IN_DB|IS_NOT_IN_DB|DAL|Field|SQLFORM|SQLTABLE|xmlescape|embed64)(?![a-zA-Z0-9_])'
                         ), 'link:%(link)s;text-decoration:None;color:#FF5C1F;'),
             ('MAGIC', re.compile(r'self|None'),
              'color:#185369; font-weight: bold'),

gluon/main.py

@@ -25,7 +25,7 @@ import socket
 import random
 import string
 
-from gluon._compat import Cookie, urllib2
+from gluon._compat import Cookie, urllib_quote
 # from thread import allocate_lock
 
 from gluon.fileutils import abspath, write_file

gluon/sqlhtml.py

@@ -3284,6 +3284,8 @@ class SQLFORM(FORM):
             if isinstance(kwargs.get(key, None), dict):
                 if table._tablename in kwargs[key]:
                     kwargs[key] = kwargs[key][table._tablename]
+                elif '*' in kwargs[key]:
+                    kwargs[key] = kwargs[key]['*']
                 else:
                     del kwargs[key]
         check = {}

gluon/tests/test_validators.py

@@ -1021,6 +1021,65 @@ class TestValidators(unittest.TestCase):
         rtn = IS_IMAGE(error_message='oops')(img)
         self.assertEqual(rtn, (img, 'oops'))
 
+    def test_IS_FILE(self):
+        import cgi
+        from io import BytesIO
+
+        def gen_fake(filename):
+            formdata_file_data = """
+---123
+Content-Disposition: form-data; name="key2"
+
+value2y
+---123
+Content-Disposition: form-data; name="file_attach"; filename="%s"
+Content-Type: text/plain
+
+this is the content of the fake file
+
+---123--
+""" % filename
+            formdata_file_environ = {
+                'CONTENT_LENGTH':   str(len(formdata_file_data)),
+                'CONTENT_TYPE':     'multipart/form-data; boundary=-123',
+                'QUERY_STRING':     'key1=value1&key2=value2x',
+                'REQUEST_METHOD':   'POST',
+            }
+            return cgi.FieldStorage(fp=BytesIO(to_bytes(formdata_file_data)), environ=formdata_file_environ)['file_attach']
+
+        fake = gen_fake('example.pdf')
+        rtn = IS_FILE(extension='pdf')(fake)
+        self.assertEqual(rtn, (fake, None))
+        fake = gen_fake('example.gif')
+        rtn = IS_FILE(extension='pdf')(fake)
+        self.assertEqual(rtn, (fake, 'Enter valid filename'))
+        fake = gen_fake('multiple.pdf')
+        rtn = IS_FILE(extension=['pdf', 'png'])(fake)
+        self.assertEqual(rtn, (fake, None))
+        fake = gen_fake('multiple.png')
+        rtn = IS_FILE(extension=['pdf', 'png'])(fake)
+        self.assertEqual(rtn, (fake, None))
+        fake = gen_fake('multiple.gif')
+        rtn = IS_FILE(extension=['pdf', 'png'])(fake)
+        self.assertEqual(rtn, (fake, 'Enter valid filename'))
+        fake = gen_fake('backup2014.tar.gz')
+        rtn = IS_FILE(filename=re.compile('backup.*'), extension='tar.gz', lastdot=False)(fake)
+        self.assertEqual(rtn, (fake, None))
+        fake = gen_fake('README')
+        rtn = IS_FILE(filename='README', extension='', case=0)(fake)
+        self.assertEqual(rtn, (fake, None))
+        fake = gen_fake('readme')
+        rtn = IS_FILE(filename='README', extension='', case=0)(fake)
+        self.assertEqual(rtn, (fake, 'Enter valid filename'))
+        fake = gen_fake('readme')
+        rtn = IS_FILE(filename='README', case=2)(fake)
+        self.assertEqual(rtn, (fake, None))
+        fake = gen_fake('README')
+        rtn = IS_FILE(filename='README', case=2)(fake)
+        self.assertEqual(rtn, (fake, None))
+        rtn = IS_FILE(extension='pdf')('example.pdf')
+        self.assertEqual(rtn, ('example.pdf', 'Enter valid filename'))
+
     def test_IS_UPLOAD_FILENAME(self):
         import cgi
         from io import BytesIO

gluon/validators.py

@@ -48,6 +48,7 @@ __all__ = [
     'IS_LIST_OF_EMAILS',
     'IS_EMPTY_OR',
     'IS_EXPR',
+    'IS_FILE',
     'IS_FLOAT_IN_RANGE',
     'IS_IMAGE',
     'IS_IN_DB',
@@ -76,11 +77,8 @@ __all__ = [
 def options_sorter(x, y):
     return (str(x[1]).upper() > str(y[1]).upper() and 1) or -1
 
-def translator(text):
-    if text is None:
-        return None
-    text = Validator.translator(text)
-    return str(text)
+def translate(text):
+    return Validator.translator(text)
 
 class ValidationError(Exception):    
 
@@ -215,7 +213,7 @@ class IS_MATCH(Validator):
                 match = self.regex.search(value.encode('utf8'))
         if match is not None:
             return (self.extract and match.group() or value, None)
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_EQUAL_TO(Validator):
@@ -244,7 +242,7 @@ class IS_EQUAL_TO(Validator):
     def __call__(self, value):
         if value == self.expression:
             return (value, None)
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_EXPR(Validator):
@@ -278,7 +276,7 @@ class IS_EXPR(Validator):
         exec('__ret__=' + self.expression, self.environment)
         if self.environment['__ret__']:
             return (value, None)
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_LENGTH(Validator):
@@ -357,7 +355,7 @@ class IS_LENGTH(Validator):
                 return (value, None)
         elif self.minsize <= len(str(value)) <= self.maxsize:
             return (str(value), None)
-        return (value, translator(self.error_message) %
+        return (value, self.translator(self.error_message) %
                 dict(min=self.minsize, max=self.maxsize))
 
 
@@ -388,7 +386,7 @@ class IS_JSON(Validator):
             else:
                 return (json.loads(value), None)
         except JSONErrors:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
     def formatter(self, value):
         if value is None:
@@ -478,11 +476,11 @@ class IS_IN_SET(Validator):
         thestrset = [str(x) for x in self.theset]
         failures = [x for x in values if not str(x) in thestrset]
         if failures and self.theset:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         if self.multiple:
             if isinstance(self.multiple, (tuple, list)) and \
                     not self.multiple[0] <= len(values) < self.multiple[1]:
-                return (values, translator(self.error_message))
+                return (values, self.translator(self.error_message))
             return (values, None)
         return (value, None)
 
@@ -640,13 +638,13 @@ class IS_IN_DB(Validator):
                         if self.auto_add:
                             value = str(self.maybe_add(table, self.fieldnames[0], value))
                         else:
-                            return (values, translator(self.error_message))
+                            return (values, self.translator(self.error_message))
                     new_values.append(value)
                 values = new_values
 
             if isinstance(self.multiple, (tuple, list)) and \
                     not self.multiple[0] <= len(values) < self.multiple[1]:
-                return (values, translator(self.error_message))
+                return (values, self.translator(self.error_message))
             if self.theset:
                 if not [v for v in values if v not in self.theset]:
                     return (values, None)
@@ -668,12 +666,12 @@ class IS_IN_DB(Validator):
                 elif self.auto_add:
                     value = self.maybe_add(table, self.fieldnames[0], value)
                 else:
-                    return (value, translator(self.error_message))
+                    return (value, self.translator(self.error_message))
 
                 try:
                     value = int(value)
                 except TypeError:
-                    return (value, translator(self.error_message))
+                    return (value, self.translator(self.error_message))
 
             if self.theset:
                 if str(value) in self.theset:
@@ -687,7 +685,7 @@ class IS_IN_DB(Validator):
                         return self._and(value)
                     else:
                         return (value, None)
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_NOT_IN_DB(Validator):
@@ -727,7 +725,7 @@ class IS_NOT_IN_DB(Validator):
     def __call__(self, value):
         value = to_native(str(value))
         if not value.strip():
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         if value in self.allowed_override:
             return (value, None)
         (tablename, fieldname) = str(self.field).split('.')
@@ -740,11 +738,11 @@ class IS_NOT_IN_DB(Validator):
             fields = [table[f] for f in id]
             row = subset.select(*fields, **dict(limitby=(0, 1), orderby_on_limitby=False)).first()
             if row and any(str(row[f]) != str(id[f]) for f in id):
-                return (value, translator(self.error_message))
+                return (value, self.translator(self.error_message))
         else:
             row = subset.select(table._id, field, limitby=(0, 1), orderby_on_limitby=False).first()
             if row and str(row[table._id]) != str(id):
-                return (value, translator(self.error_message))
+                return (value, self.translator(self.error_message))
         return (value, None)
 
 
@@ -760,7 +758,7 @@ def range_error_message(error_message, what_to_enter, minimum, maximum):
             error_message += ' less than or equal to %(max)g'
     if type(maximum) in integer_types:
         maximum -= 1
-    return translator(error_message) % dict(min=minimum, max=maximum)
+    return translate(error_message) % dict(min=minimum, max=maximum)
 
 
 class IS_INT_IN_RANGE(Validator):
@@ -1045,7 +1043,7 @@ class IS_NOT_EMPTY(Validator):
     def __call__(self, value):
         value, empty = is_empty(value, empty_regex=self.empty_regex)
         if empty:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         return (value, None)
 
 
@@ -1201,7 +1199,7 @@ class IS_EMAIL(Validator):
 
     def __call__(self, value):
         if not(isinstance(value, (basestring, unicodeT))) or not value or '@' not in value:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
         body, domain = value.rsplit('@', 1)
 
@@ -1224,10 +1222,10 @@ class IS_EMAIL(Validator):
             if (not self.banned or not self.banned.match(domain)) \
                     and (not self.forced or self.forced.match(domain)):
                 return (value, None)
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
-class IS_LIST_OF_EMAILS(object):
+class IS_LIST_OF_EMAILS(Validator):
     """
     Example:
         Used as::
@@ -1255,7 +1253,7 @@ class IS_LIST_OF_EMAILS(object):
             return (value, None)
         else:
             return (value,
-                    translator(self.error_message) % ', '.join(bad_emails))
+                    self.translator(self.error_message) % ', '.join(bad_emails))
 
     def formatter(self, value, row=None):
         return ', '.join(value or [])
@@ -1614,7 +1612,7 @@ class IS_GENERIC_URL(Validator):
         # if we dont have anything or the URL misuses the '%' character
 
         if not value or self.GENERIC_URL.search(value):
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
         if '#' in value:
             url, fragment_part = value.split('#')
@@ -1626,7 +1624,7 @@ class IS_GENERIC_URL(Validator):
             try:
                 components = urlparse.urlparse(urllib_unquote(value))._asdict()
             except ValueError:
-                return (value, translator(self.error_message))
+                return (value, self.translator(self.error_message))
 
             # Clean up the scheme before we check it
             scheme = components['scheme']
@@ -1654,7 +1652,7 @@ class IS_GENERIC_URL(Validator):
             else:
                 return (value, None)
         # else the URL is not valid
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 # Sources (obtained 2017-Nov-11):
 #    http://data.iana.org/TLD/tlds-alpha-by-domain.txt
@@ -2090,7 +2088,7 @@ class IS_HTTP_URL(Validator):
         except:
             pass
         # else the HTTP URL is not valid
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_URL(Validator):
@@ -2240,7 +2238,7 @@ class IS_URL(Validator):
             except Exception as e:
                 # If we are not able to convert the unicode url into a
                 # US-ASCII URL, then the URL is not valid
-                return (value, translator(self.error_message))
+                return (value, self.translator(self.error_message))
             methodResult = subMethod(asciiValue)
             # if the validation of the US-ASCII version of the value failed
             if not methodResult[1] is None:
@@ -2322,7 +2320,7 @@ class IS_TIME(Validator):
             pass
         except ValueError:
             pass
-        return (ivalue, translator(self.error_message))
+        return (ivalue, self.translator(self.error_message))
 
 
 # A UTC class.
@@ -2353,7 +2351,7 @@ class IS_DATE(Validator):
 
     def __init__(self, format='%Y-%m-%d',
                  error_message='Enter date as %(format)s'):
-        self.format = translator(format)
+        self.format = self.translator(format)
         self.error_message = str(error_message)
         self.extremes = {}
 
@@ -2368,7 +2366,7 @@ class IS_DATE(Validator):
             return (value, None)
         except:
             self.extremes.update(IS_DATETIME.nice(self.format))
-            return (ovalue, translator(self.error_message) % self.extremes)
+            return (ovalue, self.translator(self.error_message) % self.extremes)
 
     def formatter(self, value):
         if value is None:
@@ -2417,7 +2415,7 @@ class IS_DATETIME(Validator):
     def __init__(self, format='%Y-%m-%d %H:%M:%S',
                  error_message='Enter date and time as %(format)s',
                  timezone=None):
-        self.format = translator(format)
+        self.format = self.translator(format)
         self.error_message = str(error_message)
         self.extremes = {}
         self.timezone = timezone
@@ -2436,7 +2434,7 @@ class IS_DATETIME(Validator):
             return (value, None)
         except:
             self.extremes.update(IS_DATETIME.nice(self.format))
-            return (ovalue, translator(self.error_message) % self.extremes)
+            return (ovalue, self.translator(self.error_message) % self.extremes)
 
     def formatter(self, value):
         if value is None:
@@ -2504,9 +2502,9 @@ class IS_DATE_IN_RANGE(IS_DATE):
         if msg is not None:
             return (value, msg)
         if self.minimum and self.minimum > value:
-            return (ovalue, translator(self.error_message) % self.extremes)
+            return (ovalue, self.translator(self.error_message) % self.extremes)
         if self.maximum and value > self.maximum:
-            return (ovalue, translator(self.error_message) % self.extremes)
+            return (ovalue, self.translator(self.error_message) % self.extremes)
         return (value, None)
 
 
@@ -2560,9 +2558,9 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME):
         if msg is not None:
             return (value, msg)
         if self.minimum and self.minimum > value:
-            return (ovalue, translator(self.error_message) % self.extremes)
+            return (ovalue, self.translator(self.error_message) % self.extremes)
         if self.maximum and value > self.maximum:
-            return (ovalue, translator(self.error_message) % self.extremes)
+            return (ovalue, self.translator(self.error_message) % self.extremes)
         return (value, None)
 
 
@@ -2580,10 +2578,10 @@ class IS_LIST_OF(Validator):
             ivalue = [ivalue]
         ivalue = [i for i in ivalue if str(i).strip()]
         if self.minimum is not None and len(ivalue) < self.minimum:
-            return (ivalue, translator(self.error_message or 'Minimum length is %(min)s') %
+            return (ivalue, self.translator(self.error_message or 'Minimum length is %(min)s') %
                     dict(min=self.minimum, max=self.maximum))
         if self.maximum is not None and len(ivalue) > self.maximum:
-            return (ivalue, translator(self.error_message or 'Maximum length is %(max)s') %
+            return (ivalue, self.translator(self.error_message or 'Maximum length is %(max)s') %
                     dict(min=self.minimum, max=self.maximum))
         new_value = []
         other = self.other
@@ -2722,7 +2720,7 @@ class IS_SLUG(Validator):
 
     def __call__(self, value):
         if self.check and value != urlify(value, self.maxlen, self.keep_underscores):
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         return (urlify(value, self.maxlen, self.keep_underscores), None)
 
 
@@ -2751,7 +2749,7 @@ class ANY_OF(Validator):
             if error is None:
                 break
         if error is not None and self.error_message is not None:
-            error = translator(self.error_message)
+            error = self.translator(self.error_message)
         return value, error
 
     def formatter(self, value):
@@ -2937,7 +2935,7 @@ class LazyCrypt(object):
         return not self.__eq__(other)
 
 
-class CRYPT(object):
+class CRYPT(Validator):
     """
     Examples:
         Use as::
@@ -3039,7 +3037,7 @@ class CRYPT(object):
     def __call__(self, value):
         v = value and str(value)[:self.max_length]
         if not v or len(v) < self.min_length:
-            return ('', translator(self.error_message))
+            return ('', self.translator(self.error_message))
         if isinstance(value, LazyCrypt):
             return (value, None)
         return (LazyCrypt(self, value), None)
@@ -3084,7 +3082,7 @@ def calc_entropy(string):
     return round(entropy, 2)
 
 
-class IS_STRONG(object):
+class IS_STRONG(Validator):
     """
     Examples:
         Use as::
@@ -3149,49 +3147,49 @@ class IS_STRONG(object):
         if self.entropy is not None:
             entropy = calc_entropy(value)
             if entropy < self.entropy:
-                failures.append(translator("Entropy (%(have)s) less than required (%(need)s)")
+                failures.append(self.translator("Entropy (%(have)s) less than required (%(need)s)")
                                 % dict(have=entropy, need=self.entropy))
         if isinstance(self.min, int) and self.min > 0:
             if not len(value) >= self.min:
-                failures.append(translator("Minimum length is %s") % self.min)
+                failures.append(self.translator("Minimum length is %s") % self.min)
         if isinstance(self.max, int) and self.max > 0:
             if not len(value) <= self.max:
-                failures.append(translator("Maximum length is %s") % self.max)
+                failures.append(self.translator("Maximum length is %s") % self.max)
         if isinstance(self.special, int):
             all_special = [ch in value for ch in self.specials]
             if self.special > 0:
                 if not all_special.count(True) >= self.special:
-                    failures.append(translator("Must include at least %s of the following: %s") 
+                    failures.append(self.translator("Must include at least %s of the following: %s") 
                                     % (self.special, self.specials))
             elif self.special is 0:
                 if len(all_special) > 0:
-                    failures.append(translator("May not contain any of the following: %s")
+                    failures.append(self.translator("May not contain any of the following: %s")
                                     % self.specials)
         if self.invalid:
             all_invalid = [ch in value for ch in self.invalid]
             if all_invalid.count(True) > 0:
-                failures.append(translator("May not contain any of the following: %s")
+                failures.append(self.translator("May not contain any of the following: %s")
                                 % self.invalid)
         if isinstance(self.upper, int):
             all_upper = re.findall("[A-Z]", value)
             if self.upper > 0:
                 if not len(all_upper) >= self.upper:
-                    failures.append(translator("Must include at least %s uppercase")
+                    failures.append(self.translator("Must include at least %s uppercase")
                                     % str(self.upper))
             elif self.upper is 0:
                 if len(all_upper) > 0:
                     failures.append(
-                        translator("May not include any uppercase letters"))
+                        self.translator("May not include any uppercase letters"))
         if isinstance(self.lower, int):
             all_lower = re.findall("[a-z]", value)
             if self.lower > 0:
                 if not len(all_lower) >= self.lower:
-                    failures.append(translator("Must include at least %s lowercase")
+                    failures.append(self.translator("Must include at least %s lowercase")
                                     % str(self.lower))
             elif self.lower is 0:
                 if len(all_lower) > 0:
                     failures.append(
-                        translator("May not include any lowercase letters"))
+                        self.translator("May not include any lowercase letters"))
         if isinstance(self.number, int):
             all_number = re.findall("[0-9]", value)
             if self.number > 0:
@@ -3199,11 +3197,11 @@ class IS_STRONG(object):
                 if self.number > 1:
                     numbers = "numbers"
                 if not len(all_number) >= self.number:
-                    failures.append(translator("Must include at least %s %s")
+                    failures.append(self.translator("Must include at least %s %s")
                                     % (str(self.number), numbers))
             elif self.number is 0:
                 if len(all_number) > 0:
-                    failures.append(translator("May not include any numbers"))
+                    failures.append(self.translator("May not include any numbers"))
         if len(failures) == 0:
             return (value, None)
         if not self.error_message:
@@ -3211,7 +3209,7 @@ class IS_STRONG(object):
                 return (value, '|'.join(map(str, failures)))
             return (value, ', '.join(failures))
         else:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
 
 class IS_IMAGE(Validator):
@@ -3303,7 +3301,7 @@ class IS_IMAGE(Validator):
             value.file.seek(0)
             return (value, None)
         except Exception as e:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
     def __bmp(self, stream):
         if stream.read(2) == b'BM':
@@ -3339,8 +3337,100 @@ class IS_IMAGE(Validator):
         return (-1, -1)
 
 
+class IS_FILE(Validator):
+    """
+    Checks if name and extension of file uploaded through file input matches
+    given criteria.
+
+    Does *not* ensure the file type in any way. Returns validation failure
+    if no data was uploaded.
+
+    Args:
+        filename: string/compiled regex or a list of strings/regex of valid filenames
+        extension: string/compiled regex or a list of strings/regex of valid extensions
+        lastdot: which dot should be used as a filename / extension separator:
+            True means last dot, eg. file.jpg.png -> file.jpg / png
+            False means first dot, eg. file.tar.gz -> file / tar.gz
+        case: 0 - keep the case, 1 - transform the string into lowercase (default),
+            2 - transform the string into uppercase
+
+    If there is no dot present, extension checks will be done against empty
+    string and filename checks against whole value.
+
+    Examples:
+        Check if file has a pdf extension (case insensitive):
+
+        INPUT(_type='file', _name='name',
+                requires=IS_FILE(extension='pdf'))
+
+        Check if file is called 'thumbnail' and has a jpg or png extension
+        (case insensitive):
+
+        INPUT(_type='file', _name='name',
+                requires=IS_FILE(filename='thumbnail',
+                extension=['jpg', 'png']))
+
+        Check if file has a tar.gz extension and name starting with backup:
+
+        INPUT(_type='file', _name='name',
+                requires=IS_FILE(filename=re.compile('backup.*'),
+                extension='tar.gz', lastdot=False))
+
+        Check if file has no extension and name matching README
+        (case sensitive):
+
+            INPUT(_type='file', _name='name',
+                requires=IS_FILE(filename='README',
+                extension='', case=0)
+
+    """
+
+    def __init__(self, filename=None, extension=None, lastdot=True, case=1,
+                 error_message='Enter valid filename'):
+        self.filename = filename
+        self.extension = extension
+        self.lastdot = lastdot
+        self.case = case
+        self.error_message = error_message
+
+    def match(self, value1, value2):
+        if isinstance(value1, (list, tuple)):
+            for v in value1:
+                if self.match(v, value2):
+                    return True
+            return False
+        elif isinstance(value1, type(regex_isint)):
+            return value1.match(value2)
+        elif isinstance(value1, str):
+            return value1 == value2
+
+    def __call__(self, value):
+        try:
+            string = value.filename
+        except:
+            return (value, self.translator(self.error_message))
+        if self.case == 1:
+            string = string.lower()
+        elif self.case == 2:
+            string = string.upper()
+        if self.lastdot:
+            dot = string.rfind('.')
+        else:
+            dot = string.find('.')
+        if dot == -1:
+            dot = len(string)
+        if self.filename and not self.match(self.filename, string[:dot]):
+            return (value, self.translator(self.error_message))
+        elif self.extension and not self.match(self.extension, string[dot + 1:]):
+            return (value, self.translator(self.error_message))
+        else:
+            return (value, None)
+
+
 class IS_UPLOAD_FILENAME(Validator):
     """
+    For new applications, use IS_FILE().
+
     Checks if name and extension of file uploaded through file input matches
     given criteria.
 
@@ -3396,7 +3486,7 @@ class IS_UPLOAD_FILENAME(Validator):
         try:
             string = value.filename
         except:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         if self.case == 1:
             string = string.lower()
         elif self.case == 2:
@@ -3408,9 +3498,9 @@ class IS_UPLOAD_FILENAME(Validator):
         if dot == -1:
             dot = len(string)
         if self.filename and not self.filename.match(string[:dot]):
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         elif self.extension and not self.extension.match(string[dot + 1:]):
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
         else:
             return (value, None)
 
@@ -3580,7 +3670,7 @@ class IS_IPV4(Validator):
                 ok = False
             if ok:
                 return (value, None)
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_IPV6(Validator):
@@ -3677,7 +3767,7 @@ class IS_IPV6(Validator):
             ip = ipaddress.IPv6Address(to_unicode(value))
             ok = True
         except ipaddress.AddressValueError:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
         if self.subnets:
             # iterate through self.subnets to see if value is a member
@@ -3688,7 +3778,7 @@ class IS_IPV6(Validator):
                 try:
                     ipnet = ipaddress.IPv6Network(to_unicode(network))
                 except (ipaddress.NetmaskValueError, ipaddress.AddressValueError):
-                    return (value, translator('invalid subnet provided'))
+                    return (value, self.translator('invalid subnet provided'))
                 if ip in ipnet:
                     ok = True
 
@@ -3719,7 +3809,7 @@ class IS_IPV6(Validator):
         if ok:
             return (value, None)
 
-        return (value, translator(self.error_message))
+        return (value, self.translator(self.error_message))
 
 
 class IS_IPADDRESS(Validator):
@@ -3901,12 +3991,12 @@ class IS_IPADDRESS(Validator):
         try:
             ip = IPAddress(to_unicode(value))
         except ValueError:
-            return (value, translator(self.error_message))
+            return (value, self.translator(self.error_message))
 
         if self.is_ipv4 and isinstance(ip, IPv6Address):
-            retval = (value, translator(self.error_message))
+            retval = (value, self.translator(self.error_message))
         elif self.is_ipv6 and isinstance(ip, IPv4Address):
-            retval = (value, translator(self.error_message))
+            retval = (value, self.translator(self.error_message))
         elif self.is_ipv4 or isinstance(ip, IPv4Address):
             retval = IS_IPV4(
                 minip=self.minip,
@@ -3930,6 +4020,6 @@ class IS_IPADDRESS(Validator):
                 error_message=self.error_message
             )(value)
         else:
-            retval = (value, translator(self.error_message))
+            retval = (value, self.translator(self.error_message))
 
         return retval