From d22222ebea906847b341d572e68a71937956f720 Mon Sep 17 00:00:00 2001 From: ilvalle Date: Fri, 27 May 2016 15:25:09 +0200 Subject: [PATCH] running lib2to3.fixes.fix_reduce --- gluon/compileapp.py | 1 + gluon/contrib/hypermedia.py | 1 + gluon/contrib/login_methods/x509_auth.py | 1 + gluon/html.py | 1 + gluon/newcron.py | 1 + gluon/scheduler.py | 1 + gluon/sqlhtml.py | 1 + gluon/tools.py | 1 + gluon/validators.py | 1 + 9 files changed, 9 insertions(+) diff --git a/gluon/compileapp.py b/gluon/compileapp.py index 68e993d9..4d3fa880 100644 --- a/gluon/compileapp.py +++ b/gluon/compileapp.py @@ -40,6 +40,7 @@ import shutil import imp import logging import types +from functools import reduce logger = logging.getLogger("web2py") from gluon import rewrite from custom_import import custom_import_install diff --git a/gluon/contrib/hypermedia.py b/gluon/contrib/hypermedia.py index 86926e6f..d3fc58d6 100644 --- a/gluon/contrib/hypermedia.py +++ b/gluon/contrib/hypermedia.py @@ -1,6 +1,7 @@ import json from collections import OrderedDict from gluon import URL, IS_SLUG +from functools import reduce # compliant with https://github.com/collection-json/spec # also compliant with http://code.ge/media-types/collection-next-json/ diff --git a/gluon/contrib/login_methods/x509_auth.py b/gluon/contrib/login_methods/x509_auth.py index f4a9225f..63e83d7a 100644 --- a/gluon/contrib/login_methods/x509_auth.py +++ b/gluon/contrib/login_methods/x509_auth.py @@ -15,6 +15,7 @@ from gluon.http import HTTP, redirect #requires M2Crypto from M2Crypto import X509 +from functools import reduce class X509Auth(object): diff --git a/gluon/html.py b/gluon/html.py index 03941e98..8fa4212f 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -21,6 +21,7 @@ import sanitizer import itertools import decoder import copy_reg +from functools import reduce try: import cPickle as pickle except: diff --git a/gluon/newcron.py b/gluon/newcron.py index 838ce6cc..b8e1a6cd 100644 --- a/gluon/newcron.py +++ b/gluon/newcron.py @@ -21,6 +21,7 @@ import datetime import platform import portalocker import fileutils +from functools import reduce try: import cPickle as pickle except: diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 7cc485d0..8179508b 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -29,6 +29,7 @@ from gluon import DAL, Field, IS_NOT_EMPTY, IS_IN_SET, IS_NOT_IN_DB from gluon import IS_INT_IN_RANGE, IS_DATETIME, IS_IN_DB from gluon.utils import web2py_uuid from gluon.storage import Storage +from functools import reduce USAGE = """ ## Example diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index bcadfc0b..9b472880 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -39,6 +39,7 @@ from gluon.validators import IS_STRONG import gluon.serializers as serializers from gluon.globals import current +from functools import reduce try: import gluon.settings as settings diff --git a/gluon/tools.py b/gluon/tools.py index 465d9bf3..575d3848 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -11,6 +11,7 @@ Auth, Mail, PluginManager and various utilities """ import base64 +from functools import reduce try: import cPickle as pickle except: diff --git a/gluon/validators.py b/gluon/validators.py index 197f3ef6..c6cfcce0 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -24,6 +24,7 @@ import unicodedata from cStringIO import StringIO from gluon.utils import simple_hash, web2py_uuid, DIGEST_ALG_BY_SIZE from pydal.objects import Field, FieldVirtual, FieldMethod +from functools import reduce regex_isint = re.compile('^[+-]?\d+$')