From 52fac63b9e167b12e9d3ef806b3f0d1df56b912d Mon Sep 17 00:00:00 2001 From: Jeremie Dokime Date: Tue, 2 Sep 2014 18:16:51 +0200 Subject: [PATCH 01/58] Fix LOAD on action @request.restful() LOAD didn't work on action decorated with @request.restful() when args and/or vars are passed because the restful method is called with the main "request" object (browser url action) instead of the "other_request" object used by LOAD. So I have injected the restful method with the good object context. It's a bit nasty, so if someone knows how to do it better, I'm happy. --- gluon/compileapp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gluon/compileapp.py b/gluon/compileapp.py index 5b132fab..0bc40581 100644 --- a/gluon/compileapp.py +++ b/gluon/compileapp.py @@ -38,6 +38,7 @@ import marshal import shutil import imp import logging +import types logger = logging.getLogger("web2py") from gluon import rewrite from custom_import import custom_import_install @@ -211,7 +212,7 @@ def LOAD(c=None, f='index', args=None, vars=None, request.env.path_info other_request.cid = target other_request.env.http_web2py_component_element = target - other_request.restful = request.restful # Needed when you call LOAD() on a controller who has some actions decorates with @request.restful() + other_request.restful = types.MethodType(request.restful.im_func, other_request) # A bit nasty but needed to use LOAD on action decorates with @request.restful() other_response.view = '%s/%s.%s' % (c, f, other_request.extension) other_environment = copy.copy(current.globalenv) # NASTY From f1ab50fb9171c3d423d668d07e7f240c8e47f11d Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 2 Sep 2014 12:17:26 -0500 Subject: [PATCH 02/58] fixed a problem with reset_password --- VERSION | 2 +- gluon/tools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 5b654a16..95265916 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.02.10.10.07 +Version 2.9.6-stable+timestamp.2014.09.02.12.17.18 diff --git a/gluon/tools.py b/gluon/tools.py index 0f55fbb6..64d57f91 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -3007,7 +3007,7 @@ class Auth(object): if self.settings.prevent_password_reset_attacks: key = request.vars.key - if not key and len(request.args)>1: + if not key and len(request.args)>0: key = request.args[-1] if key: session._reset_password_key = key From d1e4ede9b379de89869278870190ad3d4e9f7652 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Sep 2014 10:52:31 -0500 Subject: [PATCH 03/58] fixed problem with delimiters, thanks Anthony --- VERSION | 2 +- gluon/globals.py | 1 - gluon/template.py | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 95265916..30b7b922 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.02.12.17.18 +Version 2.9.6-stable+timestamp.2014.09.03.10.52.25 diff --git a/gluon/globals.py b/gluon/globals.py index e81ec9a8..3c2a0f55 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -165,7 +165,6 @@ class Request(Storage): - is_local - is_https - restful() - - settings """ def __init__(self, env): diff --git a/gluon/template.py b/gluon/template.py index 131cb927..9e98f2cf 100644 --- a/gluon/template.py +++ b/gluon/template.py @@ -279,11 +279,11 @@ class TemplateParser(object): self.context = context # allow optional alternative delimiters + if delimiters is None: - delimiters = context.get('response', {})\ - .get('app_settings',{}).get('template_delimiters') + delimiters = context.get('response', {}).get('delimiters') if delimiters != self.default_delimiters: - escaped_delimiters = (escape(elimiters[0]), + escaped_delimiters = (escape(delimiters[0]), escape(delimiters[1])) self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL) else: From 9b9a5034ad5ece5fede6e326f44ac5f870c8e5a6 Mon Sep 17 00:00:00 2001 From: ilvalle Date: Wed, 3 Sep 2014 19:28:16 +0200 Subject: [PATCH 04/58] fix grid groupby with more than 2 Fields in the expression --- gluon/sqlhtml.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 5254db55..98ff1031 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2111,6 +2111,8 @@ class SQLFORM(FORM): field_id = groupby #take the field passed as groupby elif groupby and isinstance(groupby, Expression): field_id = groupby.first #take the first groupby field + while not(isinstance(field_id, Field)): # Navigate to the first Field of the expression + field_id = field_id.first table = field_id.table tablename = table._tablename if not any(str(f) == str(field_id) for f in fields): From fa5100cb2a43bd114a904b833d7c4edc45d6c639 Mon Sep 17 00:00:00 2001 From: niphlod Date: Wed, 3 Sep 2014 21:09:09 +0200 Subject: [PATCH 05/58] avoid multiple cascade paths --- gluon/scheduler.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 3bbef86c..63110e31 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -96,7 +96,7 @@ IDENTIFIER = "%s#%s" % (socket.gethostname(),os.getpid()) logger = logging.getLogger('web2py.scheduler.%s' % IDENTIFIER) from gluon import DAL, Field, IS_NOT_EMPTY, IS_IN_SET, IS_NOT_IN_DB -from gluon import IS_INT_IN_RANGE, IS_DATETIME +from gluon import IS_INT_IN_RANGE, IS_DATETIME, IS_IN_DB from gluon.utils import web2py_uuid from gluon.storage import Storage @@ -671,7 +671,10 @@ class Scheduler(MetaScheduler): db.define_table( 'scheduler_task_deps', Field('job_name', default='job_0'), - Field('task_parent', 'reference scheduler_task'), + Field('task_parent', 'integer', + requires=IS_IN_DB(db, 'scheduler_task.id', + '%(task_name)s') + ), Field('task_child', 'reference scheduler_task'), Field('can_visit', 'boolean', default=False), migrate=self.__get_migrate('scheduler_task_deps', migrate) From 1456c0da1ebabb65c8c5bf29bd9b79f2c7f1f280 Mon Sep 17 00:00:00 2001 From: niphlod Date: Wed, 3 Sep 2014 21:23:24 +0200 Subject: [PATCH 06/58] references can be long too --- gluon/scheduler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 63110e31..32027691 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -1314,7 +1314,7 @@ class Scheduler(MetaScheduler): """ from gluon.dal import Query sr, st = self.db.scheduler_run, self.db.scheduler_task - if isinstance(ref, int): + if isinstance(ref, (int, long)): q = st.id == ref elif isinstance(ref, str): q = st.uuid == ref @@ -1365,7 +1365,7 @@ class Scheduler(MetaScheduler): Experimental """ st, sw = self.db.scheduler_task, self.db.scheduler_worker - if isinstance(ref, int): + if isinstance(ref, (int, long)): q = st.id == ref elif isinstance(ref, str): q = st.uuid == ref From d744a99e13c2ec673a6a844c41bc95b658b46f37 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Sep 2014 16:29:05 -0500 Subject: [PATCH 07/58] fixed partially problem with web2py_filesystem on GAE --- VERSION | 2 +- gluon/dal.py | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 30b7b922..560c0b35 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.03.10.52.25 +Version 2.9.6-stable+timestamp.2014.09.03.16.28.59 diff --git a/gluon/dal.py b/gluon/dal.py index ae137270..5fcaca24 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4592,19 +4592,23 @@ class DatabaseStoredFile: def escape(self, obj): return self.db._adapter.escape(obj) + @classmethod + def try_create_web2py_filesystem(db): + if not DatabaseStoredFile.web2py_filesystem: + if db._adapter.dbengine == 'mysql': + sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;" + elif db._adapter.dbengine in ('postgres', 'sqlite'): + sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content TEXT, PRIMARY KEY(path));" + db.executesql(sql) + DatabaseStoredFile.web2py_filesystem = True + def __init__(self, db, filename, mode): if not db._adapter.dbengine in ('mysql', 'postgres', 'sqlite'): raise RuntimeError("only MySQL/Postgres/SQLite can store metadata .table files in database for now") self.db = db self.filename = filename self.mode = mode - if not self.web2py_filesystem: - if db._adapter.dbengine == 'mysql': - sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;" - elif db._adapter.dbengine in ('postgres', 'sqlite'): - sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content TEXT, PRIMARY KEY(path));" - self.db.executesql(sql) - DatabaseStoredFile.web2py_filesystem = True + DatabaseStoredFile.try_create_web2py_filesystem(db) self.p = 0 self.data = '' if mode in ('r', 'rw', 'a'): @@ -4655,6 +4659,9 @@ class DatabaseStoredFile: def exists(db, filename): if exists(filename): return True + + DatabaseStoredFile.try_create_web2py_filesystem(db) + query = "SELECT path FROM web2py_filesystem WHERE path='%s'" % filename try: if db.executesql(query): From 3902cb0b27cb4bfac435498fb9dddaf7f7d4cce3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Sep 2014 16:37:19 -0500 Subject: [PATCH 08/58] support for multiple db filesystems, thanks Luca --- VERSION | 2 +- gluon/dal.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 560c0b35..14157cd4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.03.16.28.59 +Version 2.9.6-stable+timestamp.2014.09.03.16.37.15 diff --git a/gluon/dal.py b/gluon/dal.py index 5fcaca24..f1034826 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4587,20 +4587,20 @@ class CubridAdapter(MySQLAdapter): ######## GAE MySQL ########## class DatabaseStoredFile: - web2py_filesystem = False + web2py_filesystems = set() def escape(self, obj): return self.db._adapter.escape(obj) @classmethod def try_create_web2py_filesystem(db): - if not DatabaseStoredFile.web2py_filesystem: + if not db._uri in DatabaseStoredFile.web2py_filesystems: if db._adapter.dbengine == 'mysql': sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;" elif db._adapter.dbengine in ('postgres', 'sqlite'): sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content TEXT, PRIMARY KEY(path));" db.executesql(sql) - DatabaseStoredFile.web2py_filesystem = True + DatabaseStoredFile.web2py_filesystems.add(db._uri) def __init__(self, db, filename, mode): if not db._adapter.dbengine in ('mysql', 'postgres', 'sqlite'): From b8a29a67aa8c7243e7c3c9e04e5db93654ef9df0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Sep 2014 17:14:00 -0500 Subject: [PATCH 09/58] typo in try_create_web2py_filesystem --- gluon/dal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/dal.py b/gluon/dal.py index f1034826..b305ec29 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4592,7 +4592,7 @@ class DatabaseStoredFile: def escape(self, obj): return self.db._adapter.escape(obj) - @classmethod + @staticmethod def try_create_web2py_filesystem(db): if not db._uri in DatabaseStoredFile.web2py_filesystems: if db._adapter.dbengine == 'mysql': From 8c5422d2d6dba51f947ef5e2251c91fb127b5b35 Mon Sep 17 00:00:00 2001 From: Jonathan New Date: Thu, 4 Sep 2014 19:16:00 +0800 Subject: [PATCH 10/58] fix custom view delimiters --- gluon/template.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gluon/template.py b/gluon/template.py index 9e98f2cf..7a18e7ea 100644 --- a/gluon/template.py +++ b/gluon/template.py @@ -280,14 +280,18 @@ class TemplateParser(object): # allow optional alternative delimiters - if delimiters is None: - delimiters = context.get('response', {}).get('delimiters') if delimiters != self.default_delimiters: escaped_delimiters = (escape(delimiters[0]), escape(delimiters[1])) self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL) - else: - delimiters = self.default_delimiters + elif hasattr(context.get('response', None), 'delimiters'): + if context['response'].delimiters != self.default_delimiters: + delimiters = context['response'].delimiters + escaped_delimiters = ( + escape(delimiters[0]), + escape(delimiters[1])) + self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, + DOTALL) self.delimiters = delimiters # Create a root level Content that everything will go into. From 9fd827c5611a3ec8f6e852ca4eba3059872af2e2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 4 Sep 2014 22:16:09 -0500 Subject: [PATCH 11/58] added recfile.py --- VERSION | 2 +- gluon/recfile.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100755 gluon/recfile.py diff --git a/VERSION b/VERSION index 14157cd4..dca5b40e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.03.16.37.15 +Version 2.9.6-stable+timestamp.2014.09.04.22.16.03 diff --git a/gluon/recfile.py b/gluon/recfile.py new file mode 100755 index 00000000..a0ba462b --- /dev/null +++ b/gluon/recfile.py @@ -0,0 +1,57 @@ +import os, uuid + +def generate(filename, depth=2, base=512): + dummyhash = sum(ord(c)*256**(i % 4) for i,c in enumerate(filename)) % base**depth + folders = [] + for level in range(depth-1,-1,-1): + code, dummyhash = divmod(dummyhash, base**level) + folders.append("%03x" % code) + folders.append(filename) + return os.path.join(*folders) + +def exists(filename, path=None): + if os.path.exists(filename): + return True + if path is None: + path, filename = os.path.split(filename) + fullfilename = os.path.join(path, generate(filename)) + if os.path.exists(fullfilename): + return True + return False + +def remove(filename, path=None): + if os.path.exists(filename): + return os.unlink(filename) + if path is None: + path, filename = os.path.split(filename) + fullfilename = os.path.join(path, generate(filename)) + if os.path.exists(fullfilename): + return os.unlink(fullfilename) + raise IOError + +def open(filename, mode="r", path=None): + if not path: + path, filename = os.path.split(filename) + fullfilename = None + if not mode.startswith('w'): + fullfilename = os.path.join(path, filename) + if not os.path.exists(fullfilename): + fullfilename = None + if not fullfilename: + fullfilename = os.path.join(path, generate(filename)) + if mode.startswith('w') and not os.path.exists(os.path.dirname(fullfilename)): + os.makedirs(os.path.dirname(fullfilename)) + return file(fullfilename, mode) + +def test(): + if not os.path.exists('tests'): + os.mkdir('tests') + for k in range(20): + filename = os.path.join('tests',str(uuid.uuid4())+'.test') + open(filename, "w").write('test') + assert open(filename, "r").read()=='test' + if exists(filename): + remove(filename) + +if __name__ == '__main__': + test() From 2d9f0fafdc38f526453e2fe2e75c5f420d216303 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 4 Sep 2014 22:27:52 -0500 Subject: [PATCH 12/58] better cache-disk, thanks Leonel --- Makefile | 18 +- VERSION | 2 +- gluon/cache.py | 1283 ++++++++++++++++++++++++------------------------ 3 files changed, 665 insertions(+), 638 deletions(-) diff --git a/Makefile b/Makefile index b9af6814..400d9950 100644 --- a/Makefile +++ b/Makefile @@ -35,15 +35,15 @@ src: make clean ### clean up baisc apps rm -f routes.py - rm -f applications/*/sessions/* - rm -f applications/*/errors/* | echo 'too many files' - rm -f applications/*/cache/* - rm -f applications/admin/databases/* - rm -f applications/welcome/databases/* - rm -f applications/examples/databases/* - rm -f applications/admin/uploads/* - rm -f applications/welcome/uploads/* - rm -f applications/examples/uploads/* + rm -rf applications/*/sessions/* + rm -rf applications/*/errors/* | echo 'too many files' + rm -rf applications/*/cache/* + rm -rf applications/admin/databases/* + rm -rf applications/welcome/databases/* + rm -rf applications/examples/databases/* + rm -rf applications/admin/uploads/* + rm -rf applications/welcome/uploads/* + rm -rf applications/examples/uploads/* ### NO MORE make epydoc # make epydoc ### make welcome layout and appadmin the default diff --git a/VERSION b/VERSION index dca5b40e..bce9addb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.04.22.16.03 +Version 2.9.6-stable+timestamp.2014.09.04.22.27.48 diff --git a/gluon/cache.py b/gluon/cache.py index 9c85a962..087fc6c7 100644 --- a/gluon/cache.py +++ b/gluon/cache.py @@ -1,628 +1,655 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -""" -| This file is part of the web2py Web Framework -| Copyrighted by Massimo Di Pierro -| License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) - -Basic caching classes and methods ---------------------------------- - -- Cache - The generic caching object interfacing with the others -- CacheInRam - providing caching in ram -- CacheOnDisk - provides caches on disk - -Memcache is also available via a different module (see gluon.contrib.memcache) - -When web2py is running on Google App Engine, -caching will be provided by the GAE memcache -(see gluon.contrib.gae_memcache) -""" -import time -import portalocker -import shelve -import thread -import os -import logging -import re -import hashlib -import datetime -try: - from gluon import settings - have_settings = True -except ImportError: - have_settings = False - -logger = logging.getLogger("web2py.cache") - -__all__ = ['Cache', 'lazy_cache'] - - -DEFAULT_TIME_EXPIRE = 300 - - - -class CacheAbstract(object): - """ - Abstract class for cache implementations. - Main function just provides referenced api documentation. - - Use CacheInRam or CacheOnDisk instead which are derived from this class. - - Note: - Michele says: there are signatures inside gdbm files that are used - directly by the python gdbm adapter that often are lagging behind in the - detection code in python part. - On every occasion that a gdbm store is probed by the python adapter, - the probe fails, because gdbm file version is newer. - Using gdbm directly from C would work, because there is backward - compatibility, but not from python! - The .shelve file is discarded and a new one created (with new - signature) and it works until it is probed again... - The possible consequences are memory leaks and broken sessions. - """ - - cache_stats_name = 'web2py_cache_statistics' - - def __init__(self, request=None): - """Initializes the object - - Args: - request: the global request object - """ - raise NotImplementedError - - def __call__(self, key, f, - time_expire=DEFAULT_TIME_EXPIRE): - """ - Tries to retrieve the value corresponding to `key` from the cache if the - object exists and if it did not expire, else it calls the function `f` - and stores the output in the cache corresponding to `key`. It always - returns the function that is returned. - - Args: - key(str): the key of the object to be stored or retrieved - f(function): the function whose output is to be cached. - - If `f` is `None` the cache is cleared. - time_expire(int): expiration of the cache in seconds. - - It's used to compare the current time with the time - when the requested object was last saved in cache. It does not - affect future requests. Setting `time_expire` to 0 or negative - value forces the cache to refresh. - """ - raise NotImplementedError - - def clear(self, regex=None): - """ - Clears the cache of all keys that match the provided regular expression. - If no regular expression is provided, it clears all entries in cache. - - Args: - regex: if provided, only keys matching the regex will be cleared, - otherwise all keys are cleared. - """ - - raise NotImplementedError - - def increment(self, key, value=1): - """ - Increments the cached value for the given key by the amount in value - - Args: - key(str): key for the cached object to be incremeneted - value(int): amount of the increment (defaults to 1, can be negative) - """ - raise NotImplementedError - - def _clear(self, storage, regex): - """ - Auxiliary function called by `clear` to search and clear cache entries - """ - r = re.compile(regex) - for (key, value) in storage.items(): - if r.match(str(key)): - del storage[key] - break - - -class CacheInRam(CacheAbstract): - """ - Ram based caching - - This is implemented as global (per process, shared by all threads) - dictionary. - A mutex-lock mechanism avoid conflicts. - """ - - locker = thread.allocate_lock() - meta_storage = {} - - def __init__(self, request=None): - self.initialized = False - self.request = request - self.storage = {} - - def initialize(self): - if self.initialized: - return - else: - self.initialized = True - self.locker.acquire() - request = self.request - if request: - app = request.application - else: - app = '' - if not app in self.meta_storage: - self.storage = self.meta_storage[app] = { - CacheAbstract.cache_stats_name: {'hit_total': 0, 'misses': 0}} - else: - self.storage = self.meta_storage[app] - self.locker.release() - - def clear(self, regex=None): - self.initialize() - self.locker.acquire() - storage = self.storage - if regex is None: - storage.clear() - else: - self._clear(storage, regex) - - if not CacheAbstract.cache_stats_name in storage.keys(): - storage[CacheAbstract.cache_stats_name] = { - 'hit_total': 0, 'misses': 0} - - self.locker.release() - - def __call__(self, key, f, - time_expire=DEFAULT_TIME_EXPIRE, - destroyer=None): - """ - Attention! cache.ram does not copy the cached object. - It just stores a reference to it. Turns out the deepcopying the object - has some problems: - - - would break backward compatibility - - would be limiting because people may want to cache live objects - - would work unless we deepcopy no storage and retrival which would make - things slow. - - Anyway. You can deepcopy explicitly in the function generating the value - to be cached. - """ - self.initialize() - - dt = time_expire - now = time.time() - - self.locker.acquire() - item = self.storage.get(key, None) - if item and f is None: - del self.storage[key] - if destroyer: - destroyer(item[1]) - self.storage[CacheAbstract.cache_stats_name]['hit_total'] += 1 - self.locker.release() - - if f is None: - return None - if item and (dt is None or item[0] > now - dt): - return item[1] - elif item and (item[0] < now - dt) and destroyer: - destroyer(item[1]) - value = f() - - self.locker.acquire() - self.storage[key] = (now, value) - self.storage[CacheAbstract.cache_stats_name]['misses'] += 1 - self.locker.release() - return value - - def increment(self, key, value=1): - self.initialize() - self.locker.acquire() - try: - if key in self.storage: - value = self.storage[key][1] + value - self.storage[key] = (time.time(), value) - except BaseException, e: - self.locker.release() - raise e - self.locker.release() - return value - - -class CacheOnDisk(CacheAbstract): - """ - Disk based cache - - This is implemented as a shelve object and it is shared by multiple web2py - processes (and threads) as long as they share the same filesystem. - The file is locked when accessed. - - Disk cache provides persistance when web2py is started/stopped but it slower - than `CacheInRam` - - Values stored in disk cache must be pickable. - """ - - def _close_shelve_and_unlock(self): - try: - if self.storage: - self.storage.close() - except ValueError: - pass - finally: - self.storage = None - if self.locker and self.locked: - portalocker.unlock(self.locker) - self.locker.close() - self.locked = False - - def _open_shelve_and_lock(self): - """Open and return a shelf object, obtaining an exclusive lock - on self.locker first. Replaces the close method of the - returned shelf instance with one that releases the lock upon - closing.""" - - storage = None - locker = None - locked = False - try: - locker = locker = open(self.locker_name, 'a') - portalocker.lock(locker, portalocker.LOCK_EX) - locked = True - try: - storage = shelve.open(self.shelve_name) - except: - logger.error('corrupted cache file %s, will try rebuild it' - % self.shelve_name) - storage = None - if storage is None: - if os.path.exists(self.shelve_name): - os.unlink(self.shelve_name) - storage = shelve.open(self.shelve_name) - if not CacheAbstract.cache_stats_name in storage.keys(): - storage[CacheAbstract.cache_stats_name] = { - 'hit_total': 0, 'misses': 0} - storage.sync() - except Exception, e: - if storage: - storage.close() - storage = None - if locked: - portalocker.unlock(locker) - locker.close() - locked = False - raise RuntimeError( - 'unable to create/re-create cache file %s' % self.shelve_name) - self.locker = locker - self.locked = locked - self.storage = storage - return storage - - def __init__(self, request=None, folder=None): - self.initialized = False - self.request = request - self.folder = folder - self.storage = {} - - def initialize(self): - if self.initialized: - return - else: - self.initialized = True - folder = self.folder - request = self.request - - # Lets test if the cache folder exists, if not - # we are going to create it - folder = folder or os.path.join(request.folder, 'cache') - - if not os.path.exists(folder): - os.mkdir(folder) - - ### we need this because of a possible bug in shelve that may - ### or may not lock - self.locker_name = os.path.join(folder, 'cache.lock') - self.shelve_name = os.path.join(folder, 'cache.shelve') - - def clear(self, regex=None): - self.initialize() - storage = self._open_shelve_and_lock() - try: - if regex is None: - storage.clear() - else: - self._clear(storage, regex) - storage.sync() - finally: - self._close_shelve_and_unlock() - - def __call__(self, key, f, - time_expire=DEFAULT_TIME_EXPIRE): - self.initialize() - dt = time_expire - storage = self._open_shelve_and_lock() - try: - item = storage.get(key, None) - storage[CacheAbstract.cache_stats_name]['hit_total'] += 1 - if item and f is None: - del storage[key] - storage.sync() - now = time.time() - if f is None: - value = None - elif item and (dt is None or item[0] > now - dt): - value = item[1] - else: - value = f() - storage[key] = (now, value) - storage[CacheAbstract.cache_stats_name]['misses'] += 1 - storage.sync() - finally: - self._close_shelve_and_unlock() - - return value - - def increment(self, key, value=1): - self.initialize() - storage = self._open_shelve_and_lock() - try: - if key in storage: - value = storage[key][1] + value - storage[key] = (time.time(), value) - storage.sync() - finally: - self._close_shelve_and_unlock() - return value - -class CacheAction(object): - def __init__(self, func, key, time_expire, cache, cache_model): - self.__name__ = func.__name__ - self.__doc__ = func.__doc__ - self.func = func - self.key = key - self.time_expire = time_expire - self.cache = cache - self.cache_model = cache_model - - def __call__(self, *a, **b): - if not self.key: - key2 = self.__name__ + ':' + repr(a) + ':' + repr(b) - else: - key2 = self.key.replace('%(name)s', self.__name__)\ - .replace('%(args)s', str(a)).replace('%(vars)s', str(b)) - cache_model = self.cache_model - if not cache_model or isinstance(cache_model, str): - cache_model = getattr(self.cache, cache_model or 'ram') - return cache_model(key2, - lambda a=a, b=b: self.func(*a, **b), - self.time_expire) - - -class Cache(object): - """ - Sets up generic caching, creating an instance of both CacheInRam and - CacheOnDisk. - In case of GAE will make use of gluon.contrib.gae_memcache. - - - self.ram is an instance of CacheInRam - - self.disk is an instance of CacheOnDisk - """ - - autokey = ':%(name)s:%(args)s:%(vars)s' - - def __init__(self, request): - """ - Args: - request: the global request object - """ - # GAE will have a special caching - if have_settings and settings.global_settings.web2py_runtime_gae: - from gluon.contrib.gae_memcache import MemcacheClient - self.ram = self.disk = MemcacheClient(request) - else: - # Otherwise use ram (and try also disk) - self.ram = CacheInRam(request) - try: - self.disk = CacheOnDisk(request) - except IOError: - logger.warning('no cache.disk (IOError)') - except AttributeError: - # normally not expected anymore, as GAE has already - # been accounted for - logger.warning('no cache.disk (AttributeError)') - - def action(self, time_expire=DEFAULT_TIME_EXPIRE, cache_model=None, - prefix=None, session=False, vars=True, lang=True, - user_agent=False, public=True, valid_statuses=None, - quick=None): - """Better fit for caching an action - - Warning: - Experimental! - - Currently only HTTP 1.1 compliant - reference : http://code.google.com/p/doctype-mirror/wiki/ArticleHttpCaching - - Args: - time_expire(int): same as @cache - cache_model(str): same as @cache - prefix(str): add a prefix to the calculated key - session(bool): adds response.session_id to the key - vars(bool): adds request.env.query_string - lang(bool): adds T.accepted_language - user_agent(bool or dict): if True, adds is_mobile and is_tablet to the key. - Pass a dict to use all the needed values (uses str(.items())) - (e.g. user_agent=request.user_agent()). Used only if session is - not True - public(bool): if False forces the Cache-Control to be 'private' - valid_statuses: by default only status codes starting with 1,2,3 will be cached. - pass an explicit list of statuses on which turn the cache on - quick: Session,Vars,Lang,User-agent,Public: - fast overrides with initials, e.g. 'SVLP' or 'VLP', or 'VLP' - """ - from gluon import current - from gluon.http import HTTP - def wrap(func): - def wrapped_f(): - if current.request.env.request_method != 'GET': - return func() - if time_expire: - cache_control = 'max-age=%(time_expire)s, s-maxage=%(time_expire)s' % dict(time_expire=time_expire) - if quick: - session_ = True if 'S' in quick else False - vars_ = True if 'V' in quick else False - lang_ = True if 'L' in quick else False - user_agent_ = True if 'U' in quick else False - public_ = True if 'P' in quick else False - else: - session_, vars_, lang_, user_agent_, public_ = session, vars, lang, user_agent, public - 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' - if cache_model: - #figure out the correct cache key - cache_key = [current.request.env.path_info, current.response.view] - if session_: - cache_key.append(current.response.session_id) - elif user_agent_: - if user_agent_ is True: - cache_key.append("%(is_mobile)s_%(is_tablet)s" % current.request.user_agent()) - else: - cache_key.append(str(user_agent_.items())) - if vars_: - cache_key.append(current.request.env.query_string) - if lang_: - cache_key.append(current.T.accepted_language) - cache_key = hashlib.md5('__'.join(cache_key)).hexdigest() - if prefix: - cache_key = prefix + cache_key - try: - #action returns something - rtn = cache_model(cache_key, lambda : func(), time_expire=time_expire) - http, status = None, current.response.status - except HTTP, e: - #action raises HTTP (can still be valid) - rtn = cache_model(cache_key, lambda : e.body, time_expire=time_expire) - http, status = HTTP(e.status, rtn, **e.headers), e.status - else: - #action raised a generic exception - http = None - else: - #no server-cache side involved - try: - #action returns something - rtn = func() - http, status = None, current.response.status - except HTTP, e: - #action raises HTTP (can still be valid) - status = e.status - http = HTTP(e.status, e.body, **e.headers) - else: - #action raised a generic exception - http = None - send_headers = False - if http and isinstance(valid_statuses, list): - if status in valid_statuses: - send_headers = True - elif valid_statuses is None: - if str(status)[0] in '123': - send_headers = True - if send_headers: - headers = { - 'Pragma' : None, - 'Expires' : expires, - 'Cache-Control' : cache_control - } - current.response.headers.update(headers) - if cache_model and not send_headers: - #we cached already the value, but the status is not valid - #so we need to delete the cached value - cache_model(cache_key, None) - if http: - if send_headers: - http.headers.update(current.response.headers) - raise http - return rtn - wrapped_f.__name__ = func.__name__ - wrapped_f.__doc__ = func.__doc__ - return wrapped_f - return wrap - - def __call__(self, - key=None, - time_expire=DEFAULT_TIME_EXPIRE, - cache_model=None): - """ - Decorator function that can be used to cache any function/method. - - Args: - key(str) : the key of the object to be store or retrieved - time_expire(int) : expiration of the cache in seconds - `time_expire` is used to compare the current time with the time - when the requested object was last saved in cache. - It does not affect future requests. - Setting `time_expire` to 0 or negative value forces the cache to - refresh. - cache_model(str): can be "ram", "disk" or other (like "memcache"). - Defaults to "ram" - - When the function `f` is called, web2py tries to retrieve - the value corresponding to `key` from the cache if the - object exists and if it did not expire, else it calles the function `f` - and stores the output in the cache corresponding to `key`. In the case - the output of the function is returned. - - Example: :: - - @cache('key', 5000, cache.ram) - def f(): - return time.ctime() - - Note: - If the function `f` is an action, we suggest using - @cache.action instead - """ - - def tmp(func, cache=self, cache_model=cache_model): - return CacheAction(func, key, time_expire, self, cache_model) - return tmp - - @staticmethod - def with_prefix(cache_model, prefix): - """ - allow replacing cache.ram with cache.with_prefix(cache.ram,'prefix') - it will add prefix to all the cache keys used. - """ - return lambda key, f, time_expire=DEFAULT_TIME_EXPIRE, prefix=prefix:\ - cache_model(prefix + key, f, time_expire) - - -def lazy_cache(key=None, time_expire=None, cache_model='ram'): - """ - Can be used to cache any function including ones in modules, - as long as the cached function is only called within a web2py request - - If a key is not provided, one is generated from the function name - `time_expire` defaults to None (no cache expiration) - - If cache_model is "ram" then the model is current.cache.ram, etc. - """ - def decorator(f, key=key, time_expire=time_expire, cache_model=cache_model): - key = key or repr(f) - - def g(*c, **d): - from gluon import current - return current.cache(key, time_expire, cache_model)(f)(*c, **d) - g.__name__ = f.__name__ - return g - return decorator +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +| This file is part of the web2py Web Framework +| Copyrighted by Massimo Di Pierro +| License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) + +Basic caching classes and methods +--------------------------------- + +- Cache - The generic caching object interfacing with the others +- CacheInRam - providing caching in ram +- CacheOnDisk - provides caches on disk + +Memcache is also available via a different module (see gluon.contrib.memcache) + +When web2py is running on Google App Engine, +caching will be provided by the GAE memcache +(see gluon.contrib.gae_memcache) +""" +import time +import shutil +import thread +import os +import sys +import logging +import re +import hashlib +import datetime +import tempfile +from gluon import recfile +try: + from gluon import settings + have_settings = True +except ImportError: + have_settings = False + +try: + import cPickle as pickle +except: + import pickle + +logger = logging.getLogger("web2py.cache") + +__all__ = ['Cache', 'lazy_cache'] + + +DEFAULT_TIME_EXPIRE = 300 + + + +class CacheAbstract(object): + """ + Abstract class for cache implementations. + Main function just provides referenced api documentation. + + Use CacheInRam or CacheOnDisk instead which are derived from this class. + + Note: + Michele says: there are signatures inside gdbm files that are used + directly by the python gdbm adapter that often are lagging behind in the + detection code in python part. + On every occasion that a gdbm store is probed by the python adapter, + the probe fails, because gdbm file version is newer. + Using gdbm directly from C would work, because there is backward + compatibility, but not from python! + The .shelve file is discarded and a new one created (with new + signature) and it works until it is probed again... + The possible consequences are memory leaks and broken sessions. + """ + + cache_stats_name = 'web2py_cache_statistics' + + def __init__(self, request=None): + """Initializes the object + + Args: + request: the global request object + """ + raise NotImplementedError + + def __call__(self, key, f, + time_expire=DEFAULT_TIME_EXPIRE): + """ + Tries to retrieve the value corresponding to `key` from the cache if the + object exists and if it did not expire, else it calls the function `f` + and stores the output in the cache corresponding to `key`. It always + returns the function that is returned. + + Args: + key(str): the key of the object to be stored or retrieved + f(function): the function whose output is to be cached. + + If `f` is `None` the cache is cleared. + time_expire(int): expiration of the cache in seconds. + + It's used to compare the current time with the time + when the requested object was last saved in cache. It does not + affect future requests. Setting `time_expire` to 0 or negative + value forces the cache to refresh. + """ + raise NotImplementedError + + def clear(self, regex=None): + """ + Clears the cache of all keys that match the provided regular expression. + If no regular expression is provided, it clears all entries in cache. + + Args: + regex: if provided, only keys matching the regex will be cleared, + otherwise all keys are cleared. + """ + + raise NotImplementedError + + def increment(self, key, value=1): + """ + Increments the cached value for the given key by the amount in value + + Args: + key(str): key for the cached object to be incremeneted + value(int): amount of the increment (defaults to 1, can be negative) + """ + raise NotImplementedError + + def _clear(self, storage, regex): + """ + Auxiliary function called by `clear` to search and clear cache entries + """ + r = re.compile(regex) + for key in storage: + if r.match(str(key)): + del storage[key] + break + + +class CacheInRam(CacheAbstract): + """ + Ram based caching + + This is implemented as global (per process, shared by all threads) + dictionary. + A mutex-lock mechanism avoid conflicts. + """ + + locker = thread.allocate_lock() + meta_storage = {} + + def __init__(self, request=None): + self.initialized = False + self.request = request + self.storage = {} + + def initialize(self): + if self.initialized: + return + else: + self.initialized = True + self.locker.acquire() + request = self.request + if request: + app = request.application + else: + app = '' + if not app in self.meta_storage: + self.storage = self.meta_storage[app] = { + CacheAbstract.cache_stats_name: {'hit_total': 0, 'misses': 0}} + else: + self.storage = self.meta_storage[app] + self.locker.release() + + def clear(self, regex=None): + self.initialize() + self.locker.acquire() + storage = self.storage + if regex is None: + storage.clear() + else: + self._clear(storage, regex) + + if not CacheAbstract.cache_stats_name in storage.keys(): + storage[CacheAbstract.cache_stats_name] = { + 'hit_total': 0, 'misses': 0} + + self.locker.release() + + def __call__(self, key, f, + time_expire=DEFAULT_TIME_EXPIRE, + destroyer=None): + """ + Attention! cache.ram does not copy the cached object. + It just stores a reference to it. Turns out the deepcopying the object + has some problems: + + - would break backward compatibility + - would be limiting because people may want to cache live objects + - would work unless we deepcopy no storage and retrival which would make + things slow. + + Anyway. You can deepcopy explicitly in the function generating the value + to be cached. + """ + self.initialize() + + dt = time_expire + now = time.time() + + self.locker.acquire() + item = self.storage.get(key, None) + if item and f is None: + del self.storage[key] + if destroyer: + destroyer(item[1]) + self.storage[CacheAbstract.cache_stats_name]['hit_total'] += 1 + self.locker.release() + + if f is None: + return None + if item and (dt is None or item[0] > now - dt): + return item[1] + elif item and (item[0] < now - dt) and destroyer: + destroyer(item[1]) + value = f() + + self.locker.acquire() + self.storage[key] = (now, value) + self.storage[CacheAbstract.cache_stats_name]['misses'] += 1 + self.locker.release() + return value + + def increment(self, key, value=1): + self.initialize() + self.locker.acquire() + try: + if key in self.storage: + value = self.storage[key][1] + value + self.storage[key] = (time.time(), value) + except BaseException, e: + self.locker.release() + raise e + self.locker.release() + return value + + +class CacheOnDisk(CacheAbstract): + """ + Disk based cache + + This is implemented as a shelve object and it is shared by multiple web2py + processes (and threads) as long as they share the same filesystem. + + Disk cache provides persistance when web2py is started/stopped but it slower + than `CacheInRam` + + Values stored in disk cache must be pickable. + """ + + class PersistentStorage(object): + """ + Implements a key based storage in disk. + """ + def __init__(self, folder): + self.folder = folder + # Check the best way to do atomic file replacement. + if sys.version_info >= (3, 3): + self.replace = os.replace + elif sys.platform == "win32": + import ctypes + from ctypes import wintypes + ReplaceFile = ctypes.windll.kernel32.ReplaceFileW + ReplaceFile.restype = wintypes.BOOL + ReplaceFile.argtypes = [ + wintypes.LPWSTR, + wintypes.LPWSTR, + wintypes.LPWSTR, + wintypes.DWORD, + wintypes.LPVOID, + wintypes.LPVOID, + ] + + def replace_windows(src, dst): + if not ReplaceFile(dst, src, None, 0, 0, 0): + os.rename(src, dst) + + self.replace = replace_windows + else: + # POSIX rename() is always atomic + self.replace = os.rename + + + def __setitem__(self, key, value): + tmp_name, tmp_path = tempfile.mkstemp(dir=self.folder) + tmp = os.fdopen(tmp_name, 'wb') + try: + pickle.dump((time.time(), value), tmp, pickle.HIGHEST_PROTOCOL) + finally: + tmp.close() + fullfilename = os.path.join(self.folder, recfile.generate(key)) + if not os.path.exists(os.path.dirname(fullfilename)): + os.makedirs(os.path.dirname(fullfilename)) + self.replace(tmp_path, fullfilename) + + + def __getitem__(self, key): + if recfile.exists(key, path=self.folder): + timestamp, value = pickle.load(recfile.open(key, 'rb', path=self.folder)) + return value + else: + raise KeyError + + def __contains__(self, key): + return recfile.exists(key, path=self.folder) + + + def __delitem__(self, key): + recfile.remove(key, path=self.folder) + + + def __iter__(self): + for dirpath, dirnames, filenames in os.walk(self.folder): + for filename in filenames: + yield filename + + + def get(self, key, default=None): + try: + return self[key] + except KeyError: + return default + + + def clear(self): + for key in self: + del self[key] + + def __init__(self, request=None, folder=None): + self.initialized = False + self.request = request + self.folder = folder + self.storage = None + + + def initialize(self): + if self.initialized: + return + else: + self.initialized = True + + folder = self.folder + request = self.request + + # Lets test if the cache folder exists, if not + # we are going to create it + folder = os.path.join(folder or request.folder, 'cache') + + if not os.path.exists(folder): + os.mkdir(folder) + + self.storage = CacheOnDisk.PersistentStorage(folder) + + if not CacheAbstract.cache_stats_name in self.storage: + self.storage[CacheAbstract.cache_stats_name] = {'hit_total': 0, 'misses': 0} + + + def __call__(self, key, f, + time_expire=DEFAULT_TIME_EXPIRE): + self.initialize() + + dt = time_expire + item = self.storage.get(key) + self.storage[CacheAbstract.cache_stats_name]['hit_total'] += 1 + + if item and f is None: + del self.storage[key] + + if f is None: + return None + + now = time.time() + + if item and ((dt is None) or (item[0] > now - dt)): + value = item[1] + else: + value = f() + self.storage[key] = (now, value) + self.storage[CacheAbstract.cache_stats_name]['misses'] += 1 + + return value + + def clear(self, regex=None): + self.initialize() + storage = self.storage + if regex is None: + storage.clear() + else: + self._clear(storage, regex) + + if not CacheAbstract.cache_stats_name in storage: + storage[CacheAbstract.cache_stats_name] = { + 'hit_total': 0, 'misses': 0} + + + def increment(self, key, value=1): + self.initialize() + self.storage[key] += value + return value + + + +class CacheAction(object): + def __init__(self, func, key, time_expire, cache, cache_model): + self.__name__ = func.__name__ + self.__doc__ = func.__doc__ + self.func = func + self.key = key + self.time_expire = time_expire + self.cache = cache + self.cache_model = cache_model + + def __call__(self, *a, **b): + if not self.key: + key2 = self.__name__ + ':' + repr(a) + ':' + repr(b) + else: + key2 = self.key.replace('%(name)s', self.__name__)\ + .replace('%(args)s', str(a)).replace('%(vars)s', str(b)) + cache_model = self.cache_model + if not cache_model or isinstance(cache_model, str): + cache_model = getattr(self.cache, cache_model or 'ram') + return cache_model(key2, + lambda a=a, b=b: self.func(*a, **b), + self.time_expire) + + +class Cache(object): + """ + Sets up generic caching, creating an instance of both CacheInRam and + CacheOnDisk. + In case of GAE will make use of gluon.contrib.gae_memcache. + + - self.ram is an instance of CacheInRam + - self.disk is an instance of CacheOnDisk + """ + + autokey = ':%(name)s:%(args)s:%(vars)s' + + def __init__(self, request): + """ + Args: + request: the global request object + """ + # GAE will have a special caching + if have_settings and settings.global_settings.web2py_runtime_gae: + from gluon.contrib.gae_memcache import MemcacheClient + self.ram = self.disk = MemcacheClient(request) + else: + # Otherwise use ram (and try also disk) + self.ram = CacheInRam(request) + try: + self.disk = CacheOnDisk(request) + except IOError: + logger.warning('no cache.disk (IOError)') + except AttributeError: + # normally not expected anymore, as GAE has already + # been accounted for + logger.warning('no cache.disk (AttributeError)') + + def action(self, time_expire=DEFAULT_TIME_EXPIRE, cache_model=None, + prefix=None, session=False, vars=True, lang=True, + user_agent=False, public=True, valid_statuses=None, + quick=None): + """Better fit for caching an action + + Warning: + Experimental! + + Currently only HTTP 1.1 compliant + reference : http://code.google.com/p/doctype-mirror/wiki/ArticleHttpCaching + + Args: + time_expire(int): same as @cache + cache_model(str): same as @cache + prefix(str): add a prefix to the calculated key + session(bool): adds response.session_id to the key + vars(bool): adds request.env.query_string + lang(bool): adds T.accepted_language + user_agent(bool or dict): if True, adds is_mobile and is_tablet to the key. + Pass a dict to use all the needed values (uses str(.items())) + (e.g. user_agent=request.user_agent()). Used only if session is + not True + public(bool): if False forces the Cache-Control to be 'private' + valid_statuses: by default only status codes starting with 1,2,3 will be cached. + pass an explicit list of statuses on which turn the cache on + quick: Session,Vars,Lang,User-agent,Public: + fast overrides with initials, e.g. 'SVLP' or 'VLP', or 'VLP' + """ + from gluon import current + from gluon.http import HTTP + def wrap(func): + def wrapped_f(): + if current.request.env.request_method != 'GET': + return func() + if time_expire: + cache_control = 'max-age=%(time_expire)s, s-maxage=%(time_expire)s' % dict(time_expire=time_expire) + if quick: + session_ = True if 'S' in quick else False + vars_ = True if 'V' in quick else False + lang_ = True if 'L' in quick else False + user_agent_ = True if 'U' in quick else False + public_ = True if 'P' in quick else False + else: + session_, vars_, lang_, user_agent_, public_ = session, vars, lang, user_agent, public + 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' + if cache_model: + #figure out the correct cache key + cache_key = [current.request.env.path_info, current.response.view] + if session_: + cache_key.append(current.response.session_id) + elif user_agent_: + if user_agent_ is True: + cache_key.append("%(is_mobile)s_%(is_tablet)s" % current.request.user_agent()) + else: + cache_key.append(str(user_agent_.items())) + if vars_: + cache_key.append(current.request.env.query_string) + if lang_: + cache_key.append(current.T.accepted_language) + cache_key = hashlib.md5('__'.join(cache_key)).hexdigest() + if prefix: + cache_key = prefix + cache_key + try: + #action returns something + rtn = cache_model(cache_key, lambda : func(), time_expire=time_expire) + http, status = None, current.response.status + except HTTP, e: + #action raises HTTP (can still be valid) + rtn = cache_model(cache_key, lambda : e.body, time_expire=time_expire) + http, status = HTTP(e.status, rtn, **e.headers), e.status + else: + #action raised a generic exception + http = None + else: + #no server-cache side involved + try: + #action returns something + rtn = func() + http, status = None, current.response.status + except HTTP, e: + #action raises HTTP (can still be valid) + status = e.status + http = HTTP(e.status, e.body, **e.headers) + else: + #action raised a generic exception + http = None + send_headers = False + if http and isinstance(valid_statuses, list): + if status in valid_statuses: + send_headers = True + elif valid_statuses is None: + if str(status)[0] in '123': + send_headers = True + if send_headers: + headers = { + 'Pragma' : None, + 'Expires' : expires, + 'Cache-Control' : cache_control + } + current.response.headers.update(headers) + if cache_model and not send_headers: + #we cached already the value, but the status is not valid + #so we need to delete the cached value + cache_model(cache_key, None) + if http: + if send_headers: + http.headers.update(current.response.headers) + raise http + return rtn + wrapped_f.__name__ = func.__name__ + wrapped_f.__doc__ = func.__doc__ + return wrapped_f + return wrap + + def __call__(self, + key=None, + time_expire=DEFAULT_TIME_EXPIRE, + cache_model=None): + """ + Decorator function that can be used to cache any function/method. + + Args: + key(str) : the key of the object to be store or retrieved + time_expire(int) : expiration of the cache in seconds + `time_expire` is used to compare the current time with the time + when the requested object was last saved in cache. + It does not affect future requests. + Setting `time_expire` to 0 or negative value forces the cache to + refresh. + cache_model(str): can be "ram", "disk" or other (like "memcache"). + Defaults to "ram" + + When the function `f` is called, web2py tries to retrieve + the value corresponding to `key` from the cache if the + object exists and if it did not expire, else it calles the function `f` + and stores the output in the cache corresponding to `key`. In the case + the output of the function is returned. + + Example: :: + + @cache('key', 5000, cache.ram) + def f(): + return time.ctime() + + Note: + If the function `f` is an action, we suggest using + @cache.action instead + """ + + def tmp(func, cache=self, cache_model=cache_model): + return CacheAction(func, key, time_expire, self, cache_model) + return tmp + + @staticmethod + def with_prefix(cache_model, prefix): + """ + allow replacing cache.ram with cache.with_prefix(cache.ram,'prefix') + it will add prefix to all the cache keys used. + """ + return lambda key, f, time_expire=DEFAULT_TIME_EXPIRE, prefix=prefix:\ + cache_model(prefix + key, f, time_expire) + + +def lazy_cache(key=None, time_expire=None, cache_model='ram'): + """ + Can be used to cache any function including ones in modules, + as long as the cached function is only called within a web2py request + + If a key is not provided, one is generated from the function name + `time_expire` defaults to None (no cache expiration) + + If cache_model is "ram" then the model is current.cache.ram, etc. + """ + def decorator(f, key=key, time_expire=time_expire, cache_model=cache_model): + key = key or repr(f) + + def g(*c, **d): + from gluon import current + return current.cache(key, time_expire, cache_model)(f)(*c, **d) + g.__name__ = f.__name__ + return g + return decorator From c1c3621bf3240ae77b4da5770d25c07eaec208bd Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 4 Sep 2014 22:28:51 -0500 Subject: [PATCH 13/58] using recfile for sessions for speed --- VERSION | 2 +- gluon/globals.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index bce9addb..b347c241 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.04.22.27.48 +Version 2.9.6-stable+timestamp.2014.09.04.22.28.47 diff --git a/gluon/globals.py b/gluon/globals.py index 3c2a0f55..072b73e2 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -25,6 +25,7 @@ from gluon.serializers import json, custom_json import gluon.settings as settings from gluon.utils import web2py_uuid, secure_dumps, secure_loads from gluon.settings import global_settings +from gluon import recfile import hashlib import portalocker import cPickle @@ -824,7 +825,7 @@ class Session(Storage): 'sessions', response.session_id) try: response.session_file = \ - open(response.session_filename, 'rb+') + recfile.open(response.session_filename, 'rb+') portalocker.lock(response.session_file, portalocker.LOCK_EX) response.session_locked = True @@ -1146,7 +1147,7 @@ class Session(Storage): session_folder = os.path.dirname(response.session_filename) if not os.path.exists(session_folder): os.mkdir(session_folder) - response.session_file = open(response.session_filename, 'wb') + response.session_file = recfile.open(response.session_filename, 'wb') portalocker.lock(response.session_file, portalocker.LOCK_EX) response.session_locked = True if response.session_file: From 7e50bd6050241e68f60c47f925ab5b93549cd8cd Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 4 Sep 2014 22:30:19 -0500 Subject: [PATCH 14/58] R-2.9.7 --- VERSION | 2 +- gluon/dal.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b347c241..f247f5e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.04.22.28.47 +Version 2.9.6-stable+timestamp.2014.09.04.22.30.15 diff --git a/gluon/dal.py b/gluon/dal.py index b305ec29..5981eb39 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -198,7 +198,6 @@ if PYTHON_VERSION[:2] < (2, 7): else: from collections import OrderedDict - CALLABLETYPES = (types.LambdaType, types.FunctionType, types.BuiltinFunctionType, types.MethodType, types.BuiltinMethodType) From 3bd44d4d84f52a1b8a0d5984293cd35101830a1b Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 4 Sep 2014 22:31:42 -0500 Subject: [PATCH 15/58] R-2.9.7 --- Makefile | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 400d9950..33a52a74 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ update: echo "remember that pymysql was tweaked" src: ### Use semantic versioning - echo 'Version 2.9.6-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.9.7-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index f247f5e3..b94bf07b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.6-stable+timestamp.2014.09.04.22.30.15 +Version 2.9.7-stable+timestamp.2014.09.04.22.31.38 From 327b1cbfdd512e8cf579eb1e404bd66412c43947 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 4 Sep 2014 22:37:12 -0500 Subject: [PATCH 16/58] R-2.9.7 --- CHANGELOG | 5 ++++- VERSION | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4b107989..032b5e4b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,13 @@ -## 2.9.6 +## 2.9.6-2.9.7 +- fixed support of GAE + SQL - fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions. - support for SAML2 (with pysaml2) - Sphinx documentation (thanks Niphlod) - improved scheduler (thanks Niphlod) - increased security +- better cache.dick (thanks Leonel) +- sessions are stored in subfolders for speed - postgres support for "INSERT ... RETURING ..." - ldap support for Certificate Authority (thanks Maggs and Shane) - improved support for S/Mime X.509 (thanks Gyuris) diff --git a/VERSION b/VERSION index b94bf07b..1fd3c547 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.7-stable+timestamp.2014.09.04.22.31.38 +Version 2.9.7-stable+timestamp.2014.09.04.22.37.07 From 95b54857a3cb19aad609714663afe381026bb7f9 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 5 Sep 2014 08:12:03 -0500 Subject: [PATCH 17/58] fixed separator in trunk --- gluon/sqlhtml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 98ff1031..3da10e35 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1289,7 +1289,7 @@ class SQLFORM(FORM): xfields.append( (self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_ROW_SUFFIX, LABEL( - T(delete_label), separator, + T(delete_label), sep, _for=self.FIELDKEY_DELETE_RECORD, _id=self.FIELDKEY_DELETE_RECORD + \ SQLFORM.ID_LABEL_SUFFIX), From 7fa8f1fa08ad2b6d9a898ebaadd2e00d9e2f86e4 Mon Sep 17 00:00:00 2001 From: ilvalle Date: Fri, 5 Sep 2014 16:17:36 +0200 Subject: [PATCH 18/58] fix web2py.js with show_if and grid --- applications/admin/static/js/web2py.js | 7 +++++-- applications/examples/static/js/web2py.js | 7 +++++-- applications/welcome/static/js/web2py.js | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index e11610cb..4219060f 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -545,8 +545,11 @@ }; $('[data-show-trigger]', target).each(function () { var name = $(this).attr('data-show-trigger'); - if(!triggers[name]) triggers[name] = []; - triggers[name].push($(this).attr('id')); + // The field exists only when creating/editing a row + if ($('#' + name).length) { + if(!triggers[name]) triggers[name] = []; + triggers[name].push($(this).attr('id')); + } }); for(var name in triggers) { $('#' + name, target).change(show_if).keyup(show_if); diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index e11610cb..4219060f 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -545,8 +545,11 @@ }; $('[data-show-trigger]', target).each(function () { var name = $(this).attr('data-show-trigger'); - if(!triggers[name]) triggers[name] = []; - triggers[name].push($(this).attr('id')); + // The field exists only when creating/editing a row + if ($('#' + name).length) { + if(!triggers[name]) triggers[name] = []; + triggers[name].push($(this).attr('id')); + } }); for(var name in triggers) { $('#' + name, target).change(show_if).keyup(show_if); diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index e11610cb..4219060f 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -545,8 +545,11 @@ }; $('[data-show-trigger]', target).each(function () { var name = $(this).attr('data-show-trigger'); - if(!triggers[name]) triggers[name] = []; - triggers[name].push($(this).attr('id')); + // The field exists only when creating/editing a row + if ($('#' + name).length) { + if(!triggers[name]) triggers[name] = []; + triggers[name].push($(this).attr('id')); + } }); for(var name in triggers) { $('#' + name, target).change(show_if).keyup(show_if); From 1ea27f7f15ee466306db9de14c545e192221fd72 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 5 Sep 2014 16:47:20 -0500 Subject: [PATCH 19/58] linked readthedocs --- README.markdown | 5 ++++- VERSION | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 0a9558e6..15a2f6ae 100644 --- a/README.markdown +++ b/README.markdown @@ -6,7 +6,6 @@ It is written and programmable in Python. LGPLv3 License Learn more at http://web2py.com - ## Google App Engine deployment cp examples/app.yaml ./ @@ -14,6 +13,10 @@ Learn more at http://web2py.com Then edit ./app.yaml and replace "yourappname" with yourappname. +## Documentation (readthedocs.org) + +[![Docs Status](https://readthedocs.org/projects/web2py/badge/?version=latest)](http://web2py.rtfd.org/) + ## Tests [![Build Status](https://travis-ci.org/web2py/web2py.png)](https://travis-ci.org/web2py/web2py) diff --git a/VERSION b/VERSION index 1fd3c547..648d3016 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.7-stable+timestamp.2014.09.04.22.37.07 +Version 2.9.7-stable+timestamp.2014.09.05.16.47.13 From 83bda542ad8f324016c2be706fec170ae00513f3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 6 Sep 2014 18:10:54 -0500 Subject: [PATCH 20/58] fixed opening get_session for new session files --- VERSION | 2 +- gluon/fileutils.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 648d3016..c104fc75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.7-stable+timestamp.2014.09.05.16.47.13 +Version 2.9.7-stable+timestamp.2014.09.06.18.10.46 diff --git a/gluon/fileutils.py b/gluon/fileutils.py index 46f4611c..121ad99e 100644 --- a/gluon/fileutils.py +++ b/gluon/fileutils.py @@ -20,7 +20,7 @@ import datetime import logging from http import HTTP from gzip import open as gzopen - +from recfile import generate __all__ = [ 'parse_version', @@ -400,6 +400,8 @@ def get_session(request, other_application='admin'): session_id = request.cookies['session_id_' + other_application].value session_filename = os.path.join( up(request.folder), other_application, 'sessions', session_id) + if not os.path.exists(session_filename): + session_filename = generate(session_filename) osession = storage.load_storage(session_filename) except Exception, e: osession = storage.Storage() From 4bcd905f4f349ad0e4af82c52904ecbce99b0ef7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 6 Sep 2014 22:57:26 -0500 Subject: [PATCH 21/58] fixed appadmin/check_credentials problem --- VERSION | 2 +- gluon/recfile.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c104fc75..6b957cff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.7-stable+timestamp.2014.09.06.18.10.46 +Version 2.9.7-stable+timestamp.2014.09.06.22.57.21 diff --git a/gluon/recfile.py b/gluon/recfile.py index a0ba462b..e2865d34 100755 --- a/gluon/recfile.py +++ b/gluon/recfile.py @@ -1,12 +1,18 @@ import os, uuid def generate(filename, depth=2, base=512): + if os.path.sep in filename: + path, filename = os.path.split(filename) + else: + path = None dummyhash = sum(ord(c)*256**(i % 4) for i,c in enumerate(filename)) % base**depth folders = [] for level in range(depth-1,-1,-1): code, dummyhash = divmod(dummyhash, base**level) folders.append("%03x" % code) folders.append(filename) + if path: + folders.insert(0,path) return os.path.join(*folders) def exists(filename, path=None): From 99087ab37abbba3a7cb918c36eb64c960ee66569 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 6 Sep 2014 23:09:44 -0500 Subject: [PATCH 22/58] R-2.9.8 --- CHANGELOG | 2 +- Makefile | 2 +- VERSION | 2 +- scripts/sessions2trash.py | 15 +++++++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 032b5e4b..9d5c5890 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -## 2.9.6-2.9.7 +## 2.9.6 - 2.9.8 - fixed support of GAE + SQL - fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions. diff --git a/Makefile b/Makefile index 33a52a74..3f319bb5 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ update: echo "remember that pymysql was tweaked" src: ### Use semantic versioning - echo 'Version 2.9.7-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.9.8-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index 6b957cff..9baa31e4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.7-stable+timestamp.2014.09.06.22.57.21 +Version 2.9.8-stable+timestamp.2014.09.06.23.09.41 diff --git a/scripts/sessions2trash.py b/scripts/sessions2trash.py index 6e11b2a0..e07e731b 100755 --- a/scripts/sessions2trash.py +++ b/scripts/sessions2trash.py @@ -29,6 +29,12 @@ Typical usage: """ from __future__ import with_statement + +import sys +import os +print os.path.join(*__file__.split(os.sep)[:-2] or ['.']) +sys.path.append(os.path.join(*__file__.split(os.sep)[:-2] or ['.'])) + from gluon import current from gluon.storage import Storage from optparse import OptionParser @@ -37,6 +43,7 @@ import datetime import os import stat import time +import glob EXPIRATION_MINUTES = 60 SLEEP_MINUTES = 5 @@ -157,6 +164,9 @@ class SessionFile(object): def delete(self): try: os.unlink(self.filename) + path = os.path.dirname(filename) + if not path.endswith('sessions') and len(os.listdir(path))==0: + os.rmdir(path) except: pass @@ -191,10 +201,11 @@ def single_loop(expiration=None, force=False, verbose=False): except: expiration = EXPIRATION_MINUTES * 60 - set_db = SessionSetDb(expiration, force, verbose) set_files = SessionSetFiles(expiration, force, verbose) - set_db.trash() set_files.trash() + set_db = SessionSetDb(expiration, force, verbose) + set_db.trash() + def main(): """Main processing.""" From 94aab906d59aea5006c824c20694c54cc9073260 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 8 Sep 2014 08:10:58 -0500 Subject: [PATCH 23/58] fixed serialization of Storage objects --- VERSION | 2 +- gluon/storage.py | 7 +++++++ gluon/tools.py | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 9baa31e4..a5b3515a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.8-stable+timestamp.2014.09.06.23.09.41 +Version 2.9.8-stable+timestamp.2014.09.08.08.10.53 diff --git a/gluon/storage.py b/gluon/storage.py index 89c88dca..7bf1bf95 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -13,6 +13,7 @@ Provides: """ import cPickle +import copy_reg import gluon.portalocker as portalocker __all__ = ['List', 'Storage', 'Settings', 'Messages', @@ -129,6 +130,12 @@ class Storage(dict): values = self.getlist(key) return values[-1] if values else default + +def pickle_storage(s): + return Storage, (dict(s),) + +copy_reg.pickle(Storage, pickle_storage) + PICKABLE = (str, int, long, float, bool, list, dict, tuple, set) diff --git a/gluon/tools.py b/gluon/tools.py index 64d57f91..a1fada8e 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2710,7 +2710,8 @@ class Auth(object): extra_fields = [ Field("password_two", "password", requires=IS_EQUAL_TO( request.post_vars.get(passfield,None), - error_message=self.messages.mismatched_password))] + error_message=self.messages.mismatched_password), + label=current.T("Confirm Password"))] else: extra_fields = [] form = SQLFORM(table_user, From 853beae9c654abf6f2f287228ecc41f26573522f Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 8 Sep 2014 08:12:37 -0500 Subject: [PATCH 24/58] R-2.9.9 --- Makefile | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3f319bb5..9c6235b6 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ update: echo "remember that pymysql was tweaked" src: ### Use semantic versioning - echo 'Version 2.9.8-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.9.9-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index a5b3515a..db523a80 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.8-stable+timestamp.2014.09.08.08.10.53 +Version 2.9.9-stable+timestamp.2014.09.08.08.12.34 From b98687239ccda54d76c14b8c60a71b42a6ee4368 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 8 Sep 2014 19:18:55 -0500 Subject: [PATCH 25/58] ASSIGNJS --- VERSION | 2 +- gluon/html.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index db523a80..d07564d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.08.08.12.34 +Version 2.9.9-stable+timestamp.2014.09.08.19.18.48 diff --git a/gluon/html.py b/gluon/html.py index 50ca9054..1a493a20 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -31,6 +31,7 @@ from gluon.storage import Storage from gluon.utils import web2py_uuid, simple_hash, compare from gluon.highlight import highlight + regex_crlf = re.compile('\r|\n') join = ''.join @@ -43,6 +44,7 @@ entitydefs.setdefault('apos', u"'".encode('utf-8')) __all__ = [ 'A', + 'ASSIGNJS', 'B', 'BEAUTIFY', 'BODY', @@ -2825,6 +2827,14 @@ class MARKMIN(XmlComponent): def __str__(self): return self.xml() +def ASSIGNJS(**kargs): + from serializers import json + s = "" + for key, value in kargs.items(): + s+='var %s = %s;\n' % (key, json(value)) + return XML(s) + + if __name__ == '__main__': import doctest doctest.testmod() From c3cd32cc4fda223fe4a85c39a85aff74d3217401 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 10 Sep 2014 08:26:23 -0500 Subject: [PATCH 26/58] possible fix to rss --- VERSION | 2 +- gluon/serializers.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index d07564d7..90dd25e9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.08.19.18.48 +Version 2.9.9-stable+timestamp.2014.09.10.08.26.15 diff --git a/gluon/serializers.py b/gluon/serializers.py index 0323aa80..563a3c0b 100644 --- a/gluon/serializers.py +++ b/gluon/serializers.py @@ -163,15 +163,18 @@ def ics(events, title=None, link=None, timeshift=0, calname=True, def rss(feed): if not 'entries' in feed and 'items' in feed: feed['entries'] = feed['items'] + def safestr(obj, key, default=''): + return str(obj[key]).encode('utf-8', 'replace') if key in obj else default + now = datetime.datetime.now() - rss = rss2.RSS2(title=str(feed.get('title', '(notitle)').encode('utf-8', 'replace')), - link=str(feed.get('link', None).encode('utf-8', 'replace')), - description=str(feed.get('description', '').encode('utf-8', 'replace')), + rss = rss2.RSS2(title=safestr(feed,'title'), + link=safestr(feed,'link'), + description=safestr(feed,'description'), lastBuildDate=feed.get('created_on', now), items=[rss2.RSSItem( - title=str(entry.get('title', '(notitle)').encode('utf-8', 'replace')), - link=str(entry.get('link', None).encode('utf-8', 'replace')), - description=str(entry.get('description', '').encode('utf-8', 'replace')), + title=safestr(entry,'title','(notitle)'), + link=safestr(entry,'link'), + description=safestr(entry,'description'), pubDate=entry.get('created_on', now) ) for entry in feed.get('entries', [])]) return rss.to_xml(encoding='utf-8') From 61d5a776d49b96bf6290566005583238db38c800 Mon Sep 17 00:00:00 2001 From: niphlod Date: Wed, 10 Sep 2014 18:08:09 +0200 Subject: [PATCH 27/58] new structure in revised README --- README.markdown | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 15a2f6ae..e18a1361 100644 --- a/README.markdown +++ b/README.markdown @@ -39,11 +39,10 @@ That's it!!! VERSION > this web2py version web2py.py > the startup script anyserver.py > to run with third party servers - wsgihandler.py > handler to connect to WSGI ... > other handlers and example files gluon/ > the core libraries contrib/ > third party libraries - tests/ > unittests + tests/ > unittests applications/ > are the apps admin/ > web based IDE ... @@ -67,6 +66,9 @@ That's it!!! examples/ > example config files, mv .. and customize extras/ > other files which are required for building web2py scripts/ > utility and installation scripts + handlers/ + wsgihandler.py > handler to connect to WSGI + ... > handlers for Fast-CGI, SCGI, Gevent, etc site-packages/ > additional optional modules logs/ > log files will go in there deposit/ > a place where web2py stores apps temporarily From bd87879cde97885d16d0877be1222f5ff2763e8f Mon Sep 17 00:00:00 2001 From: niphlod Date: Wed, 10 Sep 2014 18:24:52 +0200 Subject: [PATCH 28/58] added test for storage pickling --- gluon/tests/test_storage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gluon/tests/test_storage.py b/gluon/tests/test_storage.py index ea9a6698..989b1b18 100644 --- a/gluon/tests/test_storage.py +++ b/gluon/tests/test_storage.py @@ -37,6 +37,7 @@ def fix_sys_path(): fix_sys_path() from storage import Storage +import pickle class TestStorage(unittest.TestCase): @@ -96,6 +97,13 @@ class TestStorage(unittest.TestCase): self.assertEquals(s.a, None) self.assertEquals(s['a'], None) self.assertTrue('a' in s) + + def test_pickling(self): + """ Test storage pickling """ + s = Storage(a=1) + sd = pickle.dumps(s, pickle.HIGHEST_PROTOCOL) + news = pickle.loads(sd) + self.assertEqual(news.a, 1) if __name__ == '__main__': unittest.main() From 6403878f95f624dcf0e0f302e54c64aaaed0b696 Mon Sep 17 00:00:00 2001 From: niphlod Date: Wed, 10 Sep 2014 19:12:10 +0200 Subject: [PATCH 29/58] refactored pickle everywhere but Session, removed unused imports --- gluon/cache.py | 1 - gluon/contrib/generics.py | 4 ---- gluon/contrib/redis_cache.py | 7 +++++-- gluon/contrib/redis_session.py | 3 --- gluon/html.py | 13 ++++++++----- gluon/newcron.py | 13 ++++++++----- gluon/restricted.py | 13 ++++++++----- gluon/storage.py | 9 ++++++--- gluon/tools.py | 9 ++++++--- gluon/utils.py | 3 +-- 10 files changed, 42 insertions(+), 33 deletions(-) diff --git a/gluon/cache.py b/gluon/cache.py index 087fc6c7..24024caa 100644 --- a/gluon/cache.py +++ b/gluon/cache.py @@ -20,7 +20,6 @@ caching will be provided by the GAE memcache (see gluon.contrib.gae_memcache) """ import time -import shutil import thread import os import sys diff --git a/gluon/contrib/generics.py b/gluon/contrib/generics.py index e4fdd70b..abaa95f6 100644 --- a/gluon/contrib/generics.py +++ b/gluon/contrib/generics.py @@ -1,12 +1,8 @@ # fix response -import re import os -import cPickle -import gluon.serializers from gluon import current, HTTP from gluon.html import markmin_serializer, TAG, HTML, BODY, UL, XML, H1 -from gluon.contenttype import contenttype from gluon.contrib.fpdf import FPDF, HTMLMixin from gluon.sanitizer import sanitize from gluon.contrib.markmin.markmin2latex import markmin2latex diff --git a/gluon/contrib/redis_cache.py b/gluon/contrib/redis_cache.py index 4475a82b..4d4d4664 100644 --- a/gluon/contrib/redis_cache.py +++ b/gluon/contrib/redis_cache.py @@ -6,7 +6,10 @@ import redis from redis.exceptions import ConnectionError from gluon import current from gluon.cache import CacheAbstract -import cPickle as pickle +try: + import cPickle as pickle +except: + import pickle import time import re import logging @@ -165,7 +168,7 @@ class RedisClient(object): expireat = int(time.time() + time_expire) + 120 bucket_key = "%s:%s" % (cache_set_key, expireat / 60) value = f() - value_ = pickle.dumps(value) + value_ = pickle.dumps(value, pickle.HIGHEST_PROTOCOL) if time_expire == 0: time_expire = 1 self.r_server.setex(key, value_, time_expire) diff --git a/gluon/contrib/redis_session.py b/gluon/contrib/redis_session.py index d7bc419d..2789af33 100644 --- a/gluon/contrib/redis_session.py +++ b/gluon/contrib/redis_session.py @@ -3,12 +3,9 @@ Developed by niphlod@gmail.com """ import redis -from redis.exceptions import ConnectionError from gluon import current from gluon.storage import Storage -import cPickle as pickle import time -import re import logging import thread diff --git a/gluon/html.py b/gluon/html.py index 1a493a20..ee491479 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -21,7 +21,10 @@ import sanitizer import itertools import decoder import copy_reg -import cPickle +try: + import cPickle as pickle +except: + import pickle import marshal from HTMLParser import HTMLParser @@ -1242,13 +1245,13 @@ class CAT(DIV): def TAG_unpickler(data): - return cPickle.loads(data) + return pickle.loads(data) def TAG_pickler(data): d = DIV() d.__dict__ = data.__dict__ - marshal_dump = cPickle.dumps(d) + marshal_dump = pickle.dumps(d, pickle.HIGHEST_PROTOCOL) return (TAG_unpickler, (marshal_dump,)) @@ -2828,12 +2831,12 @@ class MARKMIN(XmlComponent): return self.xml() def ASSIGNJS(**kargs): - from serializers import json + from gluon.serializers import json s = "" for key, value in kargs.items(): s+='var %s = %s;\n' % (key, json(value)) return XML(s) - + if __name__ == '__main__': import doctest diff --git a/gluon/newcron.py b/gluon/newcron.py index 96e1e917..8e6497b9 100644 --- a/gluon/newcron.py +++ b/gluon/newcron.py @@ -21,7 +21,10 @@ import datetime import platform import portalocker import fileutils -import cPickle +try: + import cPickle as pickle +except: + import pickle from gluon.settings import global_settings logger = logging.getLogger("web2py.cron") @@ -139,7 +142,7 @@ class Token(object): ret = None portalocker.lock(self.master, portalocker.LOCK_EX) try: - (start, stop) = cPickle.load(self.master) + (start, stop) = pickle.load(self.master) except: (start, stop) = (0, 1) if startup or self.now - start > locktime: @@ -149,7 +152,7 @@ class Token(object): logger.warning('WEB2PY CRON: Stale cron.master detected') logger.debug('WEB2PY CRON: Acquiring lock') self.master.seek(0) - cPickle.dump((self.now, 0), self.master) + pickle.dump((self.now, 0), self.master) self.master.flush() finally: portalocker.unlock(self.master) @@ -166,10 +169,10 @@ class Token(object): portalocker.lock(self.master, portalocker.LOCK_EX) logger.debug('WEB2PY CRON: Releasing cron lock') self.master.seek(0) - (start, stop) = cPickle.load(self.master) + (start, stop) = pickle.load(self.master) if start == self.now: # if this is my lock self.master.seek(0) - cPickle.dump((self.now, time.time()), self.master) + pickle.dump((self.now, time.time()), self.master) portalocker.unlock(self.master) self.master.close() diff --git a/gluon/restricted.py b/gluon/restricted.py index bcb78163..de7d8afb 100644 --- a/gluon/restricted.py +++ b/gluon/restricted.py @@ -11,7 +11,10 @@ Restricted environment to execute application's code """ import sys -import cPickle +try: + import cPickle as pickle +except: + import pickle import traceback import types import os @@ -55,7 +58,7 @@ class TicketStorage(Storage): try: table = self._get_table(self.db, self.tablename, request.application) table.insert(ticket_id=ticket_id, - ticket_data=cPickle.dumps(ticket_data), + ticket_data=pickle.dumps(ticket_data, pickle.HIGHEST_PROTOCOL), created_datetime=request.now) self.db.commit() message = 'In FILE: %(layer)s\n\n%(traceback)s\n' @@ -68,7 +71,7 @@ class TicketStorage(Storage): def _store_on_disk(self, request, ticket_id, ticket_data): ef = self._error_file(request, ticket_id, 'wb') try: - cPickle.dump(ticket_data, ef) + pickle.dump(ticket_data, ef) finally: ef.close() @@ -103,13 +106,13 @@ class TicketStorage(Storage): except IOError: return {} try: - return cPickle.load(ef) + return pickle.load(ef) finally: ef.close() else: table = self._get_table(self.db, self.tablename, app) rows = self.db(table.ticket_id == ticket_id).select() - return cPickle.loads(rows[0].ticket_data) if rows else {} + return pickle.loads(rows[0].ticket_data) if rows else {} class RestrictedError(Exception): diff --git a/gluon/storage.py b/gluon/storage.py index 7bf1bf95..b8eba182 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -12,7 +12,10 @@ Provides: - Storage; like dictionary allowing also for `obj.foo` for `obj['foo']` """ -import cPickle +try: + import cPickle as pickle +except: + import pickle import copy_reg import gluon.portalocker as portalocker @@ -159,7 +162,7 @@ def load_storage(filename): fp = None try: fp = portalocker.LockedFile(filename, 'rb') - storage = cPickle.load(fp) + storage = pickle.load(fp) finally: if fp: fp.close() @@ -170,7 +173,7 @@ def save_storage(storage, filename): fp = None try: fp = portalocker.LockedFile(filename, 'wb') - cPickle.dump(dict(storage), fp) + pickle.dump(dict(storage), fp) finally: if fp: fp.close() diff --git a/gluon/tools.py b/gluon/tools.py index a1fada8e..fc63da2f 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -11,7 +11,10 @@ Auth, Mail, PluginManager and various utilities """ import base64 -import cPickle +try: + import cPickle as pickle +except: + import pickle import datetime import thread import logging @@ -3327,7 +3330,7 @@ class Auth(object): user = table_user(user_id) if not user: raise HTTP(401, "Not Authorized") - auth.impersonator = cPickle.dumps(session) + auth.impersonator = pickle.dumps(session, pickle.HIGHEST_PROTOCOL) auth.user.update( table_user._filter_fields(user, True)) self.user = auth.user @@ -3338,7 +3341,7 @@ class Auth(object): elif user_id in (0, '0'): if self.is_impersonating(): session.clear() - session.update(cPickle.loads(auth.impersonator)) + session.update(pickle.loads(auth.impersonator)) self.user = session.auth.user self.update_groups() self.run_login_onaccept() diff --git a/gluon/utils.py b/gluon/utils.py index 60a4ff02..914cb0cf 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -23,7 +23,6 @@ import logging import socket import base64 import zlib -import types _struct_2_long_long = struct.Struct('=QQ') @@ -160,7 +159,7 @@ def pad(s, n=32, padchar=' '): def secure_dumps(data, encryption_key, hash_key=None, compression_level=None): if not hash_key: hash_key = sha1(encryption_key).hexdigest() - dump = pickle.dumps(data) + dump = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) if compression_level: dump = zlib.compress(dump, compression_level) key = pad(encryption_key[:32]) From c3478f660a540fad3b6331f22c81e8777d5dd139 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 10 Sep 2014 13:57:54 -0500 Subject: [PATCH 30/58] fixed pickling of session --- gluon/globals.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gluon/globals.py b/gluon/globals.py index 072b73e2..a01bc447 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -34,6 +34,7 @@ from types import DictionaryType import cStringIO import datetime import re +import copy_reg import Cookie import os import sys @@ -1176,3 +1177,8 @@ class Session(Storage): del response.session_file except: pass + +def pickle_session(s): + return Session, (dict(s),) + +copy_reg.pickle(Session, pickle_session) From cef72027817ab7718ef3b79d08ae29e2e4a6acba Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 11 Sep 2014 12:09:43 -0500 Subject: [PATCH 31/58] fixed is_crypt in tools, thanks Anthony --- VERSION | 2 +- gluon/tools.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 90dd25e9..0153a229 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.10.08.26.15 +Version 2.9.9-stable+timestamp.2014.09.11.12.09.36 diff --git a/gluon/tools.py b/gluon/tools.py index fc63da2f..b7f4abc6 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -3191,11 +3191,14 @@ class Auth(object): if log is DEFAULT: log = self.messages['change_password_log'] passfield = self.settings.password_field - is_crypt = copy.copy([t for t in table_user[passfield].requires - if isinstance(t,CRYPT)][0]) - is_crypt.min_length = 0 + requires = table_user[passfield].requires + if not isinstance(requires,(list, tuple)): + requires = [requires] + requires = filter(lambda t:isinstance(t,CRYPT), requires) + if requires: + requires[0].min_length = 0 form = SQLFORM.factory( - Field('old_password', 'password', requires=[is_crypt], + Field('old_password', 'password', requires=requires, label=self.messages.old_password), Field('new_password', 'password', label=self.messages.new_password, From 5c9796ac722c9da81f9d02f1c889347f01d6b481 Mon Sep 17 00:00:00 2001 From: niphlod Date: Thu, 11 Sep 2014 22:51:23 +0200 Subject: [PATCH 32/58] refactored pickling of sessions --- gluon/contrib/shell.py | 13 +++++++------ gluon/globals.py | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py index 0a224100..8a571e42 100755 --- a/gluon/contrib/shell.py +++ b/gluon/contrib/shell.py @@ -31,12 +31,13 @@ An interactive, stateful AJAX shell that runs Python code on the server. import logging import new -import os -import cPickle +try: + import cPickle as pickle +except: + import pickle import sys import traceback import types -import wsgiref.handlers import StringIO import threading locker = threading.RLock() @@ -100,7 +101,7 @@ class History: name: the name of the global to remove value: any picklable value """ - blob = cPickle.dumps(value) + blob = pickle.dumps(value, pickle.HIGHEST_PROTOCOL) if name in self.global_names: index = self.global_names.index(name) @@ -159,7 +160,7 @@ def represent(obj): code below to determine whether the object changes over time. """ try: - return cPickle.dumps(obj) + return pickle.dumps(obj, pickle.HIGHEST_PROTOCOL) except: return repr(obj) @@ -258,7 +259,7 @@ def run(history, statement, env={}): if not name.startswith('__'): try: history.set_global(name, val) - except (TypeError, cPickle.PicklingError), ex: + except (TypeError, pickle.PicklingError), ex: UNPICKLABLE_TYPES.append(type(val)) history.add_unpicklable(statement, new_globals.keys()) diff --git a/gluon/globals.py b/gluon/globals.py index a01bc447..17893e56 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -28,7 +28,10 @@ from gluon.settings import global_settings from gluon import recfile import hashlib import portalocker -import cPickle +try: + import cPickle as pickle +except: + import pickle from pickle import Pickler, MARK, DICT, EMPTY_DICT from types import DictionaryType import cStringIO @@ -830,7 +833,7 @@ class Session(Storage): portalocker.lock(response.session_file, portalocker.LOCK_EX) response.session_locked = True - self.update(cPickle.load(response.session_file)) + self.update(pickle.load(response.session_file)) response.session_file.seek(0) oc = response.session_filename.split('/')[-1].split('-')[0] if check_client and response.session_client != oc: @@ -895,7 +898,7 @@ class Session(Storage): if row: # rows[0].update_record(locked=True) # Unpickle the data - session_data = cPickle.loads(row.session_data) + session_data = pickle.loads(row.session_data) self.update(session_data) response.session_new = False else: @@ -907,7 +910,7 @@ class Session(Storage): else: response.session_id = None response.session_new = True - # if there is no session id yet, we'll need to create a + # if there is no session id yet, we'll need to create a # new session else: response.session_new = True @@ -925,7 +928,7 @@ class Session(Storage): response.cookies[response.session_id_name]['expires'] = \ cookie_expires.strftime(FMT) - session_pickled = cPickle.dumps(self) + session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) response.session_hash = hashlib.md5(session_pickled).hexdigest() if self.flash: @@ -1084,7 +1087,7 @@ class Session(Storage): return True def _unchanged(self, response): - session_pickled = cPickle.dumps(self) + session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) response.session_pickled = session_pickled session_hash = hashlib.md5(session_pickled).hexdigest() return response.session_hash == session_hash @@ -1111,7 +1114,7 @@ class Session(Storage): else: unique_key = response.session_db_unique_key - session_pickled = response.session_pickled or cPickle.dumps(self) + session_pickled = response.session_pickled or pickle.dumps(self, pickle.HIGHEST_PROTOCOL) dd = dict(locked=False, client_ip=response.session_client, @@ -1152,7 +1155,7 @@ class Session(Storage): portalocker.lock(response.session_file, portalocker.LOCK_EX) response.session_locked = True if response.session_file: - session_pickled = response.session_pickled or cPickle.dumps(self) + session_pickled = response.session_pickled or pickle.dumps(self, pickle.HIGHEST_PROTOCOL) response.session_file.write(session_pickled) response.session_file.truncate() finally: From 0863bb3ecac009cc0e705e7793f18d14119769ef Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 12 Sep 2014 11:36:26 -0500 Subject: [PATCH 33/58] case insensitive autocomplete again --- VERSION | 2 +- gluon/sqlhtml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 0153a229..194af333 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.11.12.09.36 +Version 2.9.9-stable+timestamp.2014.09.12.11.36.19 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 3da10e35..104a1445 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -652,7 +652,7 @@ class AutocompleteWidget(object): if settings and settings.global_settings.web2py_runtime_gae: rows = self.db(field.__ge__(self.request.vars[self.keyword]) & field.__lt__(self.request.vars[self.keyword] + u'\ufffd')).select(orderby=self.orderby, limitby=self.limitby, *(self.fields+self.help_fields)) else: - rows = self.db(field.like(self.request.vars[self.keyword] + '%')).select(orderby=self.orderby, limitby=self.limitby, distinct=self.distinct, *(self.fields+self.help_fields)) + rows = self.db(field.like(self.request.vars[self.keyword] + '%', case_sensitive=False)).select(orderby=self.orderby, limitby=self.limitby, distinct=self.distinct, *(self.fields+self.help_fields)) if rows: if self.is_reference: id_field = self.fields[1] From cd2920c2cf956ba98607ad0dd5403d9a10d03659 Mon Sep 17 00:00:00 2001 From: Ricardo Pedroso Date: Fri, 12 Sep 2014 22:38:44 +0100 Subject: [PATCH 34/58] fix infinite loop in request_password --- gluon/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/tools.py b/gluon/tools.py index b7f4abc6..f4f54f6d 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -3011,7 +3011,7 @@ class Auth(object): if self.settings.prevent_password_reset_attacks: key = request.vars.key - if not key and len(request.args)>0: + if not key and len(request.args)>1: key = request.args[-1] if key: session._reset_password_key = key From 0a571338b67b85c97a31f7707f5838a3e712f394 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sat, 13 Sep 2014 01:38:57 +0200 Subject: [PATCH 35/58] Fixed #1810: DAL.select(left=...) causes "Unknown column 't1.i1' in 'on clause'" According to the MySQL 5.5 manual [1], comma-separated table references in joins should be wrapped in parenthesis or JOIN should be used instead of comma. Further explanation from the manual: The ON clause takes precedence since a couple of versions so the operands for the ON clause change: SELECT * FROM t1, t2 JOIN t3 ON (t1.i1 = t3.i3); The operands for the ON are t2 and t3. t1.i1 is not known at this point. [1] https://dev.mysql.com/doc/refman/5.5/en/join.html --- gluon/dal.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gluon/dal.py b/gluon/dal.py index 5981eb39..32fe453c 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1767,12 +1767,17 @@ class BaseAdapter(ConnectionPool): sql_w = ' WHERE ' + self.expand(query) if query else '' if inner_join and not left: - sql_t = ', '.join([self.table_alias(t) + # Wrap table references with parenthesis (approach 1) + # sql_t = ', '.join([self.table_alias(t) + # for t in iexcluded + itables_to_merge.keys()]) + # sql_t = '(%s)' % sql_t + # or approach 2: Use 'JOIN' instead comma: + sql_t = ' JOIN '.join([self.table_alias(t) for t in iexcluded + itables_to_merge.keys()]) for t in ijoinon: sql_t += ' %s %s' % (icommand, t) elif not inner_join and left: - sql_t = ', '.join([self.table_alias(t) + sql_t = ' JOIN '.join([self.table_alias(t) for t in excluded + tables_to_merge.keys()]) if joint: sql_t += ' %s %s' % (command, @@ -1785,7 +1790,7 @@ class BaseAdapter(ConnectionPool): tables_in_joinon = set(joinont + ijoinont) tables_not_in_joinon = \ all_tables_in_query.difference(tables_in_joinon) - sql_t = ','.join([self.table_alias(t) for t in tables_not_in_joinon]) + sql_t = ' JOIN '.join([self.table_alias(t) for t in tables_not_in_joinon]) for t in ijoinon: sql_t += ' %s %s' % (icommand, t) if joint: From 94a0b1aec598ca167525bb849d920f278abea9d3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 12 Sep 2014 20:17:49 -0500 Subject: [PATCH 36/58] fixed json field representation --- gluon/dal.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gluon/dal.py b/gluon/dal.py index 5981eb39..f9d0f653 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2037,13 +2037,13 @@ class BaseAdapter(ConnectionPool): else: obj = str(obj) elif fieldtype == 'json': - if not self.native_json: - if have_serializers: - obj = serializers.json(obj) - elif simplejson: - obj = simplejson.dumps(obj) - else: - raise RuntimeError("missing simplejson") + # always pass a string JSON string + if have_serializers: + obj = serializers.json(obj) + elif simplejson: + obj = simplejson.dumps(obj) + else: + raise RuntimeError("missing simplejson") if not isinstance(obj, bytes): obj = bytes(obj) try: From d29a108ad70b1f4c183cc12e41965202bd3579c5 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 12 Sep 2014 20:28:46 -0500 Subject: [PATCH 37/58] better native_json naming convention --- VERSION | 2 +- gluon/dal.py | 13 ++++++------- gluon/validators.py | 8 ++++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index 194af333..57afd7ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.12.11.36.19 +Version 2.9.9-stable+timestamp.2014.09.12.20.28.40 diff --git a/gluon/dal.py b/gluon/dal.py index f9d0f653..7635ac57 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -720,7 +720,7 @@ class BaseAdapter(ConnectionPool): __metaclass__ = AdapterMeta - native_json = False + driver_auto_json_loads = False driver = None driver_name = None drivers = () # list of drivers from which to pick @@ -2174,8 +2174,8 @@ class BaseAdapter(ConnectionPool): def parse_double(self, value, field_type): return float(value) - def parse_json(self, value, field_type): - if not self.native_json: + def parse_json(self, value, field_type): + if not self.driver_auto_json_loads: if not isinstance(value, basestring): raise RuntimeError('json data not a string') if isinstance(value, unicode): @@ -2924,7 +2924,7 @@ class PostgreSQLAdapter(BaseAdapter): else: supports_json = None if supports_json: self.types["json"] = "JSON" - self.native_json = True + self.driver_auto_json_loads = True else: LOGGER.debug("Your database version does not support the JSON data type (using TEXT instead)") def LIKE(self, first, second): @@ -5702,7 +5702,6 @@ def cleanup(text): class MongoDBAdapter(NoSQLAdapter): - native_json = True drivers = ('pymongo', ) uploads_in_blob = False @@ -5725,7 +5724,7 @@ class MongoDBAdapter(NoSQLAdapter): 'reference': long, 'list:string': list, 'list:integer': list, - 'list:reference': list, + 'list:reference': list, } error_messages = {"javascript_needed": "This must yet be replaced" + @@ -7360,7 +7359,7 @@ def sqlhtml_validators(field): if field_type in (('string', 'text', 'password')): requires.append(validators.IS_LENGTH(field_length)) elif field_type == 'json': - requires.append(validators.IS_EMPTY_OR(validators.IS_JSON(native_json=field.db._adapter.native_json))) + requires.append(validators.IS_EMPTY_OR(validators.IS_JSON())) elif field_type == 'double' or field_type == 'float': requires.append(validators.IS_FLOAT_IN_RANGE(-1e100, 1e100)) elif field_type == 'integer': diff --git a/gluon/validators.py b/gluon/validators.py index ba98ae64..92f9a1ca 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -372,14 +372,18 @@ class IS_JSON(Validator): if self.native_json: simplejson.loads(value) # raises error in case of malformed json return (value, None) # the serialized value is not passed - return (simplejson.loads(value), None) + else: + return (simplejson.loads(value), None) except JSONErrors: return (value, translate(self.error_message)) def formatter(self,value): if value is None: return None - return simplejson.dumps(value) + if self.native_json: + return value + else: + return simplejson.dumps(value) class IS_IN_SET(Validator): From d81f4606db9385188ba645a88fb6fb4161cf5386 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 13 Sep 2014 10:35:54 -0500 Subject: [PATCH 38/58] fixed mongodb json? --- VERSION | 2 +- gluon/dal.py | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index 57afd7ac..53a1674c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.12.20.28.40 +Version 2.9.9-stable+timestamp.2014.09.13.10.35.47 diff --git a/gluon/dal.py b/gluon/dal.py index 7635ac57..54097f42 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -720,7 +720,7 @@ class BaseAdapter(ConnectionPool): __metaclass__ = AdapterMeta - driver_auto_json_loads = False + driver_auto_json = [] driver = None driver_name = None drivers = () # list of drivers from which to pick @@ -2037,13 +2037,14 @@ class BaseAdapter(ConnectionPool): else: obj = str(obj) elif fieldtype == 'json': - # always pass a string JSON string - if have_serializers: - obj = serializers.json(obj) - elif simplejson: - obj = simplejson.dumps(obj) - else: - raise RuntimeError("missing simplejson") + if not 'dumps' in self.driver_auto_json: + # always pass a string JSON string + if have_serializers: + obj = serializers.json(obj) + elif simplejson: + obj = simplejson.dumps(obj) + else: + raise RuntimeError("missing simplejson") if not isinstance(obj, bytes): obj = bytes(obj) try: @@ -2175,7 +2176,7 @@ class BaseAdapter(ConnectionPool): return float(value) def parse_json(self, value, field_type): - if not self.driver_auto_json_loads: + if not 'loads' in self.driver_auto_json: if not isinstance(value, basestring): raise RuntimeError('json data not a string') if isinstance(value, unicode): @@ -2924,7 +2925,7 @@ class PostgreSQLAdapter(BaseAdapter): else: supports_json = None if supports_json: self.types["json"] = "JSON" - self.driver_auto_json_loads = True + self.driver_auto_json = ['loads'] else: LOGGER.debug("Your database version does not support the JSON data type (using TEXT instead)") def LIKE(self, first, second): @@ -5703,6 +5704,7 @@ def cleanup(text): class MongoDBAdapter(NoSQLAdapter): drivers = ('pymongo', ) + driver_auto_json_loads = ['loads','dumps'] uploads_in_blob = False From da195b787d6533c874bfbae8a7608a0ce8afcfa6 Mon Sep 17 00:00:00 2001 From: Jason Brower Date: Sat, 13 Sep 2014 20:26:03 +0300 Subject: [PATCH 39/58] Improve the graphing to show the name of the application. --- applications/welcome/controllers/appadmin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index 7a26aaa2..8283b9f2 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -582,7 +582,7 @@ def bg_graph_model(): if hasattr(db[tablename],'_meta_graphmodel'): meta_graphmodel = db[tablename]._meta_graphmodel else: - meta_graphmodel = dict(group='Undefined', color='#ECECEC') + meta_graphmodel = dict(group=request.application, color='#ECECEC') group = meta_graphmodel['group'].replace(' ', '') if not subgraphs.has_key(group): From b991f2926ff903615b5b1d9baf40982dd87e8644 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 13 Sep 2014 18:55:03 -0500 Subject: [PATCH 40/58] fixed typo in driver_auto_json --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 53a1674c..24370613 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.13.10.35.47 +Version 2.9.9-stable+timestamp.2014.09.13.18.54.57 diff --git a/gluon/dal.py b/gluon/dal.py index 54097f42..09a41a03 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5704,7 +5704,7 @@ def cleanup(text): class MongoDBAdapter(NoSQLAdapter): drivers = ('pymongo', ) - driver_auto_json_loads = ['loads','dumps'] + driver_auto_json = ['loads','dumps'] uploads_in_blob = False From ecc6e5dc5ec6f53d21b770db60dcb3a92664c9f3 Mon Sep 17 00:00:00 2001 From: Niphlod Date: Sun, 14 Sep 2014 16:01:22 +0200 Subject: [PATCH 41/58] added more tests for json Field --- gluon/tests/test_dal.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gluon/tests/test_dal.py b/gluon/tests/test_dal.py index 8c95b7af..e1147534 100644 --- a/gluon/tests/test_dal.py +++ b/gluon/tests/test_dal.py @@ -129,6 +129,7 @@ class TestFields(unittest.TestCase): isinstance(f.formatter(datetime.datetime.now()), str) def testRun(self): + """Test all field types and their return values""" db = DAL(DEFAULT_URI, check_reserved=['all']) for ft in ['string', 'text', 'password', 'upload', 'blob']: db.define_table('tt', Field('aa', ft, default='')) @@ -148,8 +149,22 @@ class TestFields(unittest.TestCase): self.assertEqual(db().select(db.tt.aa)[0].aa, True) db.tt.drop() db.define_table('tt', Field('aa', 'json', default={})) - self.assertEqual(db.tt.insert(aa={}), 1) - self.assertEqual(db().select(db.tt.aa)[0].aa, {}) + # test different python objects for correct serialization in json + objs = [ + {'a' : 1, 'b' : 2}, + [1, 2, 3], + 'abc', + True, + False, + None, + 11, + 14.3, + long(11) + ] + for obj in objs: + rtn_id = db.tt.insert(aa=obj) + rtn = db(db.tt.id == rtn_id).select().first().aa + self.assertEqual(obj, rtn) db.tt.drop() db.define_table('tt', Field('aa', 'date', default=datetime.date.today())) From c4a4ee27c42e4e3b2458981888d6db6400657006 Mon Sep 17 00:00:00 2001 From: Niphlod Date: Sun, 14 Sep 2014 16:39:54 +0200 Subject: [PATCH 42/58] postgresql: identifies what adapter auto-loads json values --- gluon/dal.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gluon/dal.py b/gluon/dal.py index 09a41a03..2deedb08 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2917,16 +2917,21 @@ class PostgreSQLAdapter(BaseAdapter): # (to be added to after_connection) if self.driver_name == "pg8000": supports_json = self.connection.server_version >= "9.2.0" - elif (self.driver_name == "psycopg2") and \ - (self.driver.__version__ >= "2.0.12"): + elif (self.driver_name == "psycopg2" and + self.driver.__version__ >= "2.0.12"): supports_json = self.connection.server_version >= 90200 elif self.driver_name == "zxJDBC": supports_json = self.connection.dbversion >= "9.2.0" - else: supports_json = None + else: + supports_json = None if supports_json: self.types["json"] = "JSON" - self.driver_auto_json = ['loads'] - else: LOGGER.debug("Your database version does not support the JSON data type (using TEXT instead)") + if (self.driver_name == "psycopg2" and + self.driver.__version__ >= '2.5.0'): + self.driver_auto_json = ['loads'] + else: + LOGGER.debug("Your database version does not support the JSON" + " data type (using TEXT instead)") def LIKE(self, first, second): args = (self.expand(first), self.expand(second, 'string')) From ce897b35699662968754450db3440a1bb5f833e8 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Sep 2014 11:58:16 -0500 Subject: [PATCH 43/58] added custom represent to GoogleDatastoreAdapter, thanks Alan --- VERSION | 2 +- gluon/dal.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 24370613..f52853a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.13.18.54.57 +Version 2.9.9-stable+timestamp.2014.09.14.11.58.10 diff --git a/gluon/dal.py b/gluon/dal.py index 09a41a03..a37923ae 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5053,6 +5053,17 @@ class GoogleDatastoreAdapter(NoSQLAdapter): def parse_id(self, value, field_type): return value + def represent(self, obj, fieldtype): + if fieldtype == "json": + if have_serializers: + return serializers.json(obj) + elif simplejson: + return simplejson.dumps(obj) + else: + raise Exception("Could not dump json object (missing json library)") + else: + return NoSQLAdapter.represent(self, obj, fieldtype) + def create_table(self, table, migrate=True, fake_migrate=False, polymodel=None): myfields = {} for field in table: From 6a75132d54592330be75b06dd64f2c240509e3f2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Sep 2014 14:57:12 -0500 Subject: [PATCH 44/58] CROSS JOIN, thanks jotbe --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 2 +- applications/examples/controllers/appadmin.py | 2 +- gluon/dal.py | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index f52853a2..b206bb9e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.14.11.58.10 +Version 2.9.9-stable+timestamp.2014.09.14.14.57.06 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 7a26aaa2..8283b9f2 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -582,7 +582,7 @@ def bg_graph_model(): if hasattr(db[tablename],'_meta_graphmodel'): meta_graphmodel = db[tablename]._meta_graphmodel else: - meta_graphmodel = dict(group='Undefined', color='#ECECEC') + meta_graphmodel = dict(group=request.application, color='#ECECEC') group = meta_graphmodel['group'].replace(' ', '') if not subgraphs.has_key(group): diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index 7a26aaa2..8283b9f2 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -582,7 +582,7 @@ def bg_graph_model(): if hasattr(db[tablename],'_meta_graphmodel'): meta_graphmodel = db[tablename]._meta_graphmodel else: - meta_graphmodel = dict(group='Undefined', color='#ECECEC') + meta_graphmodel = dict(group=request.application, color='#ECECEC') group = meta_graphmodel['group'].replace(' ', '') if not subgraphs.has_key(group): diff --git a/gluon/dal.py b/gluon/dal.py index aab001c3..24b6f0fd 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1766,18 +1766,20 @@ class BaseAdapter(ConnectionPool): query = self.common_filter(query, tablenames_for_common_filters) sql_w = ' WHERE ' + self.expand(query) if query else '' + JOIN = ' CROSS JOIN ' + if inner_join and not left: # Wrap table references with parenthesis (approach 1) # sql_t = ', '.join([self.table_alias(t) # for t in iexcluded + itables_to_merge.keys()]) # sql_t = '(%s)' % sql_t # or approach 2: Use 'JOIN' instead comma: - sql_t = ' JOIN '.join([self.table_alias(t) + sql_t = JOIN.join([self.table_alias(t) for t in iexcluded + itables_to_merge.keys()]) for t in ijoinon: sql_t += ' %s %s' % (icommand, t) elif not inner_join and left: - sql_t = ' JOIN '.join([self.table_alias(t) + sql_t = JOIN.join([self.table_alias(t) for t in excluded + tables_to_merge.keys()]) if joint: sql_t += ' %s %s' % (command, @@ -1790,7 +1792,7 @@ class BaseAdapter(ConnectionPool): tables_in_joinon = set(joinont + ijoinont) tables_not_in_joinon = \ all_tables_in_query.difference(tables_in_joinon) - sql_t = ' JOIN '.join([self.table_alias(t) for t in tables_not_in_joinon]) + sql_t = JOIN.join([self.table_alias(t) for t in tables_not_in_joinon]) for t in ijoinon: sql_t += ' %s %s' % (icommand, t) if joint: From 75f2b90151a2f231071758105e1a4dd2fc4c963e Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Sep 2014 15:28:48 -0500 Subject: [PATCH 45/58] ilike, thanks Niphlod --- VERSION | 2 +- gluon/dal.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b206bb9e..d4c7e23c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.14.14.57.06 +Version 2.9.9-stable+timestamp.2014.09.14.15.28.44 diff --git a/gluon/dal.py b/gluon/dal.py index 24b6f0fd..4ccb04f8 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -9810,6 +9810,9 @@ class Expression(object): op = case_sensitive and db._adapter.LIKE or db._adapter.ILIKE return Query(db, op, self, value) + def ilike(self, value): + return self.like(case_sensitive=False) + def regexp(self, value): db = self.db return Query(db, db._adapter.REGEXP, self, value) From 05a92e86f7469c076373a38bea31d2e811db4b7b Mon Sep 17 00:00:00 2001 From: niphlod Date: Sun, 14 Sep 2014 22:38:57 +0200 Subject: [PATCH 46/58] fixed wording and bug on contains(), made smart_query use ilike instead of like --- gluon/dal.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gluon/dal.py b/gluon/dal.py index 4ccb04f8..3855386a 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2182,7 +2182,7 @@ class BaseAdapter(ConnectionPool): def parse_double(self, value, field_type): return float(value) - def parse_json(self, value, field_type): + def parse_json(self, value, field_type): if not 'loads' in self.driver_auto_json: if not isinstance(value, basestring): raise RuntimeError('json data not a string') @@ -2851,7 +2851,7 @@ class PostgreSQLAdapter(BaseAdapter): self.srid = srid self.find_or_make_work_folder() self._last_insert = None # for INSERT ... RETURNING ID - + ruri = uri.split('://', 1)[1] m = self.REGEX_URI.match(ruri) if not m: @@ -2918,7 +2918,7 @@ class PostgreSQLAdapter(BaseAdapter): else: self.execute("select lastval()") return int(self.cursor.fetchone()[0]) - + def try_json(self): # check JSON data type support # (to be added to after_connection) @@ -3620,7 +3620,7 @@ class MSSQL4Adapter(MSSQLAdapter): Requires MSSQL >= 2012, uses `OFFSET ... ROWS ... FETCH NEXT ... ROWS ONLY` """ - + types = { 'boolean': 'BIT', 'string': 'VARCHAR(%(length)s)', @@ -4613,7 +4613,7 @@ class DatabaseStoredFile: sql = "CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content TEXT, PRIMARY KEY(path));" db.executesql(sql) DatabaseStoredFile.web2py_filesystems.add(db._uri) - + def __init__(self, db, filename, mode): if not db._adapter.dbengine in ('mysql', 'postgres', 'sqlite'): raise RuntimeError("only MySQL/Postgres/SQLite can store metadata .table files in database for now") @@ -7770,7 +7770,7 @@ def smart_query(fields, text): elif op == 'notbelongs': new_query = ~field.belongs(value.split(',')) elif field.type in ('text', 'string', 'json'): if op == 'contains': new_query = field.contains(value) - elif op == 'like': new_query = field.like(value) + elif op == 'like': new_query = field.ilike(value) elif op == 'startswith': new_query = field.startswith(value) elif op == 'endswith': new_query = field.endswith(value) else: raise RuntimeError("Invalid operation") @@ -9860,14 +9860,12 @@ class Expression(object): def contains(self, value, all=False, case_sensitive=False): """ - The case_sensitive parameters is only useful for PostgreSQL - For other RDMBs it is ignored and contains is always case insensitive For MongoDB and GAE contains is always case sensitive """ db = self.db if isinstance(value, (list, tuple)): - subqueries = [self.contains(str(v).strip(), case_sensitive=case_sensitive) - for v in value if str(v).strip()] + subqueries = [self.contains(v, case_sensitive=case_sensitive) + for v in value if v] if not subqueries: return self.contains('') else: From e38565345cf89903c9203e3df5182c08ff81d956 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Sep 2014 16:01:47 -0500 Subject: [PATCH 47/58] no more split in contains, thanks Niphlod --- VERSION | 2 +- gluon/dal.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d4c7e23c..d18e38f1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.14.15.28.44 +Version 2.9.9-stable+timestamp.2014.09.14.16.01.43 diff --git a/gluon/dal.py b/gluon/dal.py index 3855386a..9d5e0fa0 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -9864,8 +9864,8 @@ class Expression(object): """ db = self.db if isinstance(value, (list, tuple)): - subqueries = [self.contains(v, case_sensitive=case_sensitive) - for v in value if v] + subqueries = [self.contains(str(v), case_sensitive=case_sensitive) + for v in value if str(v)] if not subqueries: return self.contains('') else: From 0120ad5b951887632b07c20bf2dd6faad080eee2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Sep 2014 16:37:09 -0500 Subject: [PATCH 48/58] upgraded simplejson --- CHANGELOG | 4 ++-- VERSION | 2 +- applications/admin/static/js/jquery.js | 9 ++++----- applications/examples/static/js/jquery.js | 9 ++++----- applications/welcome/static/js/jquery.js | 8 ++++---- gluon/contrib/simplejson/__init__.py | 4 +--- gluon/contrib/simplejson/decoder.py | 2 -- gluon/contrib/simplejson/encoder.py | 2 -- gluon/contrib/simplejson/ordered_dict.py | 1 - gluon/contrib/simplejson/scanner.py | 2 -- 10 files changed, 16 insertions(+), 27 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9d5c5890..51a2177c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -## 2.9.6 - 2.9.8 +## 2.9.6 - 2.9.10 - fixed support of GAE + SQL - fixed a typo in the license of some login_methods code. It is now LGPL consistently with the rest of the web2py code. This change applied to all previous web2py versions. @@ -6,7 +6,7 @@ - Sphinx documentation (thanks Niphlod) - improved scheduler (thanks Niphlod) - increased security -- better cache.dick (thanks Leonel) +- better cache.disk (thanks Leonel) - sessions are stored in subfolders for speed - postgres support for "INSERT ... RETURING ..." - ldap support for Certificate Authority (thanks Maggs and Shane) diff --git a/VERSION b/VERSION index d18e38f1..a7084265 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.14.16.01.43 +Version 2.9.9-stable+timestamp.2014.09.14.16.37.05 diff --git a/applications/admin/static/js/jquery.js b/applications/admin/static/js/jquery.js index ce1b6b6e..ab28a247 100644 --- a/applications/admin/static/js/jquery.js +++ b/applications/admin/static/js/jquery.js @@ -1,5 +1,4 @@ -/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license -*/ -(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
t
",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t -}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); -u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("