From d5749db0cd8a5a67ca9e8b2c255c82e1d04a97a9 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 14 Oct 2012 18:29:17 -0500
Subject: [PATCH 01/49] cron disabled by default unless -H

---
 VERSION         |  2 +-
 gluon/widget.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index 968fa96d..80582709 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-14 16:40:34) dev
+Version 2.1.0 (2012-10-14 18:29:10) dev
diff --git a/gluon/widget.py b/gluon/widget.py
index 241e9fff..b3bfe65d 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -804,10 +804,10 @@ def console():
                       default=False,
                       help=msg)
 
-    parser.add_option('-N',
-                      '--no-cron',
+    parser.add_option('-H',
+                      '--run-cron',
                       action='store_true',
-                      dest='nocron',
+                      dest='runcron',
                       default=False,
                       help='do not start cron automatically')
 
@@ -904,7 +904,7 @@ def console():
 
     if options.cronjob:
         global_settings.cronjob = True  # tell the world
-        options.nocron = True   # don't start cron jobs
+        options.run = False   # don't start cron jobs
         options.plain = True    # cronjobs use a plain shell
         options.nobanner = True
         options.nogui = True
@@ -1083,13 +1083,13 @@ def start(cron=True):
         return
 
 
-    # ## if -N or not cron disable cron in this *process*
+    # ## if -H cron is enabled in this *process*
     # ## if --softcron use softcron
     # ## use hardcron in all other cases
-    if cron and not options.nocron and options.softcron:
+    if cron and options.runcron and options.softcron:
         print 'Using softcron (but this is not very efficient)'
         global_settings.web2py_crontype = 'soft'
-    elif cron and not options.nocron:
+    elif cron and options.runcron:
         logger.debug('Starting hardcron...')
         global_settings.web2py_crontype = 'hard'
         newcron.hardcron(options.folder).start()

From 64151a2c3ec28c7f1822d854acfda253fa01c3cb Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 14 Oct 2012 20:07:54 -0500
Subject: [PATCH 02/49] reverted custom_install tests

---
 VERSION                |  2 +-
 gluon/custom_import.py | 30 +++++++++++-------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/VERSION b/VERSION
index 80582709..49db9ebe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-14 18:29:10) dev
+Version 2.1.0 (2012-10-14 20:07:50) dev
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index b924ae83..4ab746d8 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -13,7 +13,7 @@ NATIVE_IMPORTER = __builtin__.__import__
 TRACK_CHANGES = False
 INVALID_MODULES = set(sys.modules.keys()).union(('','gluon','applications','custom_import'))
 
-# backward compatibility API
+# backward compatibility API 
 def custom_import_install():
     __builtin__.__import__ = custom_importer
 
@@ -22,17 +22,14 @@ def track_changes(track=True):
     global TRACK_CHANGES
     TRACK_CHANGES = track
 
-def is_tracking_changes():
+def is_tracking_changes():    
     return TRACK_CHANGES
 
-class CustomImportException(ImportError):
-    pass
-
 def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
     """
     The web2py custom importer. Like the standard Python importer but it
     tries to transform import statements as something like
-    "import applications.app_name.modules.x".
+    "import applications.app_name.modules.x". 
     If the import failed, fall back on naive_importer
     """
 
@@ -46,8 +43,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
     if hasattr(current,'request') \
             and level<=0 \
             and not name.split('.')[0] in INVALID_MODULES \
-            and isinstance(globals, dict):
-        import_tb = None
+            and isinstance(globals, dict):            
         try:
             items = current.request.folder.split(os.path.sep)
             if not items[-1]: items = items[:-1]
@@ -56,26 +52,22 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
                 # import like "import x" or "import x.y"
                 result = None
                 for itemname in name.split("."):
+                    new_mod = base_importer(
+                        modules_prefix, globals,locals, [itemname], level)
+                    try:
+                        result = result or new_mod.__dict__[itemname]
+                    except KeyError, e:
+                        raise ImportError, 'Cannot import module %s' % str(e)
                     modules_prefix += "." + itemname
-                    base_importer(
-                         modules_prefix, globals,locals, [], level)
                 return result
             else:
                 # import like "from x import a, b, ..."
                 pname = modules_prefix + "." + name
                 return base_importer(pname, globals, locals, fromlist, level)
         except ImportError, e1:
-            import_tb = sys.exc_info()[2]
-            try:
-                return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
-            except ImportError, e3:
-                raise ImportError, e1, import_tb.tb_next # there an import error in the module
+            pass # the module does not exist
         except Exception, e2:
             raise e2 # there is an error in the module
-        finally:
-            if import_tb:
-                import_tb = None
-
     return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
 
 

From 8607b09e64854f73ccf2050f257115895ffaea63 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 05:33:21 -0500
Subject: [PATCH 03/49] -Y starts cron

---
 VERSION         | 2 +-
 gluon/widget.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 49db9ebe..295ffe02 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-14 20:07:50) dev
+Version 2.1.0 (2012-10-15 05:33:14) dev
diff --git a/gluon/widget.py b/gluon/widget.py
index b3bfe65d..af9c2e47 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -804,12 +804,12 @@ def console():
                       default=False,
                       help=msg)
 
-    parser.add_option('-H',
+    parser.add_option('-Y',
                       '--run-cron',
                       action='store_true',
                       dest='runcron',
                       default=False,
-                      help='do not start cron automatically')
+                      help='start the background cron process')
 
     parser.add_option('-J',
                       '--cronjob',

From b6429ca5fdbdc826e2fe071da927f5e64065c7bc Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 05:46:57 -0500
Subject: [PATCH 04/49] better errors in custom_import, thanks Michele

---
 VERSION                |  2 +-
 gluon/custom_import.py | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index 295ffe02..cb56b666 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-15 05:33:14) dev
+Version 2.1.0 (2012-10-15 05:46:52) dev
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index 4ab746d8..af44308b 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -11,25 +11,30 @@ from gluon import current
 
 NATIVE_IMPORTER = __builtin__.__import__
 TRACK_CHANGES = False
-INVALID_MODULES = set(sys.modules.keys()).union(('','gluon','applications','custom_import'))
+INVALID_MODULES = set(('','gluon','applications','custom_import'))
 
-# backward compatibility API 
+# backward compatibility API
 def custom_import_install():
-    __builtin__.__import__ = custom_importer
+    if __builtin__.__import__ != custom_importer:
+        INVALID_MODULES = INVALID_MODULES.union(sys.modules.keys())
+        __builtin__.__import__ = custom_importer
 
 def track_changes(track=True):
     assert track in (True,False), "must be True or False"
     global TRACK_CHANGES
     TRACK_CHANGES = track
 
-def is_tracking_changes():    
+def is_tracking_changes():
     return TRACK_CHANGES
 
+class CustomImportException(ImportError):
+    pass
+
 def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
     """
     The web2py custom importer. Like the standard Python importer but it
     tries to transform import statements as something like
-    "import applications.app_name.modules.x". 
+    "import applications.app_name.modules.x".
     If the import failed, fall back on naive_importer
     """
 
@@ -43,7 +48,8 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
     if hasattr(current,'request') \
             and level<=0 \
             and not name.split('.')[0] in INVALID_MODULES \
-            and isinstance(globals, dict):            
+            and isinstance(globals, dict):
+        import_tb = None
         try:
             items = current.request.folder.split(os.path.sep)
             if not items[-1]: items = items[:-1]
@@ -65,9 +71,17 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
                 pname = modules_prefix + "." + name
                 return base_importer(pname, globals, locals, fromlist, level)
         except ImportError, e1:
-            pass # the module does not exist
+            import_tb = sys.exc_info()[2]
+            try:
+                return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
+            except ImportError, e3:
+                raise ImportError, e1, import_tb # there an import error in the module
         except Exception, e2:
             raise e2 # there is an error in the module
+        finally:
+            if import_tb:
+                import_tb = None
+
     return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
 
 

From 9b7e944dea7801fa2e8dc259c16c6bd6e85450e6 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 05:55:45 -0500
Subject: [PATCH 05/49] improved custom_inport with app-level track changes

---
 VERSION                |  2 +-
 gluon/custom_import.py | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index cb56b666..9a1203ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-15 05:46:52) dev
+Version 2.1.0 (2012-10-15 05:55:41) dev
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index af44308b..6db23d2e 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -10,22 +10,20 @@ import traceback
 from gluon import current
 
 NATIVE_IMPORTER = __builtin__.__import__
-TRACK_CHANGES = False
 INVALID_MODULES = set(('','gluon','applications','custom_import'))
 
 # backward compatibility API
 def custom_import_install():
     if __builtin__.__import__ != custom_importer:
-        INVALID_MODULES = INVALID_MODULES.union(sys.modules.keys())
+        INVALID_MODULES.update(sys.modules.keys())
         __builtin__.__import__ = custom_importer
 
 def track_changes(track=True):
     assert track in (True,False), "must be True or False"
-    global TRACK_CHANGES
-    TRACK_CHANGES = track
+    current.request._custom_import_track_changes = track
 
 def is_tracking_changes():
-    return TRACK_CHANGES
+    return current.request._custom_import_track_changes
 
 class CustomImportException(ImportError):
     pass
@@ -42,7 +40,13 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
     locals = locals or {}
     fromlist = fromlist or []
 
-    base_importer = TRACK_IMPORTER if TRACK_CHANGES else NATIVE_IMPORTER
+    try:
+        if current.request._custom_import_track_changes:
+            base_importer = TRACK_IMPORTER
+        else:
+            base_importer = NATIVE_IMPORTER
+    except: # there is no current.request (should never happen)
+        base_importer = NATIVE_IMPORTER
 
     # if not relative and not from applications:
     if hasattr(current,'request') \

From 8e14d1c92e95f846a2c2866f2f9e6def7a4ff878 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 06:15:33 -0500
Subject: [PATCH 06/49] updated changelog

---
 CHANGELOG | 42 ++++++++++++++++++++++++++----------------
 VERSION   |  2 +-
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8a8548d1..49a97ad1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,25 +1,35 @@
 ## 2.1.0
 
-- if apps are accidentally deleted there is copy left in deposit folder
-- db.table.field.epoch() counts seconds from epoch
-- fixed many aith.wiki problems
-- better welcome layout, thanks Paolo
-- db.define_table(...,redefine=True)
-- DAL, Row, and Rows object can now be pickled/unpickled, thanks to zombie DAL.
-- admin uses codemirror
-- support for auth.wiki(render='html')
-- upgraded jQuery 1.8
-- upgraded Bootstrap 2.1
-- fixed problem with dropbox_account.py
-- cache.with_prefix(cache.ram,'prefix')
-- mail.send(...,sender='Mr X <%(sender)s>')
-- allow entropy computation in IS_STRONG and web2py.js, thanks Jonathan and Niphlod
-- renamed luon/contrib/comet_messaging.py -> gluon/contrib/websocket_messaging.py
-- DAL support for SQL CASE, example: db().select(...query.case('true','false))
+- overall faster web2py
+- when apps are deleted, a w2p copy left in deposit folder
+- change in cron (it is now disabled by default). removed -N option and introduced -Y.
 - faster web2py_uuid() and request initialization logic, thanks Michele
 - static asset management, thanks Niphlod
 - improved mobile admin
 - request.requires_https and Auth(secure=True), thanks Yarin and Niphlod
+- better custom_import (works per app and is faster), thanks Michele
+- redis_sesssion.py, thanks Niphlod
+- allow entropy computation in IS_STRONG and web2py.js, thanks Jonathan and Niphlod
+- fixed many aith.wiki problems
+- support for auth.wiki(render='html')
+- better welcome layout, thanks Paolo
+- db.define_table(...,redefine=True)
+- DAL, Row, and Rows object can now be pickled/unpickled, thanks to zombie DAL.
+- admin uses codemirror
+- allow syntax auth = Auth(db).define_tables()
+- better auth.wiki with preview, thanks Alan
+- better auth.impersonate, thanks Alan
+- upgraded jQuery 1.8
+- upgraded Bootstrap 2.1
+- fixed problem with dropbox_account.py
+- many fixes to cache.ram, cache.disk, memcache and gae_memcache
+- cache.with_prefix(cache.ram,'prefix')
+- db.table.field.epoch() counts seconds from epoch
+- DAL support for SQL CASE, example: db().select(...query.case('true','false))
+- DAL(...,do_connect=False) allows faking connections
+- DAL(...,auto_import=True) now retieves some fiel attributes
+- mail can specify a sender: mail.send(...,sender='Mr X <%(sender)s>')
+- renamed gluon/contrib/comet_messaging.py -> gluon/contrib/websocket_messaging.py
 
 ## 2.0.1-11
 
diff --git a/VERSION b/VERSION
index 9a1203ec..e545d9c1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-15 05:55:41) dev
+Version 2.1.0 (2012-10-15 06:15:29) dev

From 36810aaccc878d74052e3eb103f738caa7c70f99 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 06:36:44 -0500
Subject: [PATCH 07/49] fixed error for missing driver

---
 VERSION      | 2 +-
 gluon/dal.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index e545d9c1..206f0fea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-15 06:15:29) dev
+Version 2.1.0 (2012-10-15 06:36:40) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index 31e068c6..175e3faa 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -691,7 +691,7 @@ class BaseAdapter(ConnectionPool):
             self.driver_name = drivers_available[0]
             self.driver = globals().get(self.driver_name)
         else:
-            raise RuntimeError, "no driver available %s", self.drivers
+            raise RuntimeError, "no driver available %s" % self.drivers
 
 
     def __init__(self, db,uri,pool_size=0, folder=None, db_codec='UTF-8',

From c2b6c645ef8d0be46e79bb9cf6497ac83bdf37e5 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 06:40:55 -0500
Subject: [PATCH 08/49] R-2.1.1

---
 Makefile | 2 +-
 VERSION  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0a7acd84..6df4f910 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.1.0 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION
+	echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index 206f0fea..8413750a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-15 06:36:40) dev
+Version 2.1.1 (2012-10-15 06:40:52) stable

From 9f7fd68728125d8e8e7488ca2c6658279f29f538 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 07:43:23 -0500
Subject: [PATCH 09/49] better markmin with links in links, thanks Vladyslav

---
 Makefile                              |  2 +-
 VERSION                               |  2 +-
 gluon/contrib/markmin/markmin2html.py | 31 +++++++++++++++++++--------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 6df4f910..8b7bb471 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
+	echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index 8413750a..c7420dbe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 06:40:52) stable
+Version 2.1.1 (2012-10-15 07:43:19) dev
diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py
index 78b29748..94084b0b 100755
--- a/gluon/contrib/markmin/markmin2html.py
+++ b/gluon/contrib/markmin/markmin2html.py
@@ -545,14 +545,14 @@ regex_bq_headline=re.compile('^(?:(\.+|\++|\-+)(\.)?\s+)?(-{3}-*)$')
 regex_tq=re.compile('^(-{3}-*)(?::(?P<c>[a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P<p>[a-zA-Z][_a-zA-Z\-\d]*)\])?)?$')
 regex_proto = re.compile(r'(?<!["\w>/=])(?P<p>\w+):(?P<k>\w+://[\w\d\-+=?%&/:.]+)', re.M)
 regex_auto = re.compile(r'(?<!["\w>/=])(?P<k>\w+://[\w\d\-+_=?%&/:.]+)',re.M)
-regex_link=re.compile(r'('+LINK+r')|\[\[(?P<s>.+?)\]\]')
-regex_link_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?(?:\s+(?P<p>popup))?\s*$')
-regex_media_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?\s+(?P<p>img|IMG|left|right|center|video|audio)(?:\s+(?P<w>\d+px))?\s*$')
+regex_link=re.compile(r'('+LINK+r')|\[\[(?P<s>.+?)\]\]',re.S)
+regex_link_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?(?:\s+(?P<p>popup))?\s*$',re.S)
+regex_media_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?\s+(?P<p>img|IMG|left|right|center|video|audio)(?:\s+(?P<w>\d+px))?\s*$',re.S)
 
-regex_markmin_escape = re.compile(r"(\\*)(['`:*~\\[\]{}@\$+\-.#])")
-regex_backslash = re.compile(r"\\(['`:*~\\[\]{}@\$+\-.#])")
-ttab_in  = maketrans("'`:*~\\[]{}@$+-.#", '\x0b\x0c\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b')
-ttab_out = maketrans('\x0b\x0c\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b',"'`:*~\\[]{}@$+-.#")
+regex_markmin_escape = re.compile(r"(\\*)(['`:*~\\[\]{}@\$+\-.#\n])")
+regex_backslash = re.compile(r"\\(['`:*~\\[\]{}@\$+\-.#\n])")
+ttab_in  = maketrans("'`:*~\\[]{}@$+-.#\n", '\x0b\x0c\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x05')
+ttab_out = maketrans('\x0b\x0c\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x05',"'`:*~\\[]{}@$+-.#\n")
 
 def markmin_escape(text):
     """ insert \\ before markmin control characters: '`:*~[]{}@$ """
@@ -686,6 +686,15 @@ def render(text,
     >>> render("----\\nhello world\\n----\\n")
     '<blockquote>hello world</blockquote>'
 
+    >>> render('[[http://example.com]]')
+    '<p><span class="anchor" id="markmin_http://example.com"></span></p>'
+
+    >>> render('[[ http://example.com]]')
+    '<p><a href="http://example.com">http://example.com</a></p>'
+
+    >>> render('[[bookmark [http://example.com] ]]')
+    '<p><span class="anchor" id="markmin_bookmark"><a href="http://example.com">http://example.com</a></span></p>'
+
     >>> render('[[this is a link http://example.com]]')
     '<p><a href="http://example.com">this is a link</a></p>'
 
@@ -701,6 +710,9 @@ def render(text,
     >>> render("[[Your browser doesn't support <audio> HTML5 tag http://example.com audio]]")
     '<p><audio controls="controls"><source src="http://example.com" />Your browser doesn\\'t support &lt;audio&gt; HTML5 tag</audio></p>'
 
+    >>> render("[[Your\\nbrowser\\ndoesn't\\nsupport\\n<audio> HTML5 tag http://exam\\\\\\nple.com\\naudio]]")
+    '<p><audio controls="controls"><source src="http://example.com" />Your browser doesn\\'t support &lt;audio&gt; HTML5 tag</audio></p>'
+
     >>> render('[[this is a **link** http://example.com]]')
     '<p><a href="http://example.com">this is a <strong>link</strong></a></p>'
 
@@ -850,6 +862,7 @@ def render(text,
     pp='\n' if pretty_print else ''
     text = str(text or '')
     text = regex_backslash.sub(lambda m: m.group(1).translate(ttab_in), text)
+    text = text.replace('\x05','') # concatenate strings separeted by \\n
 
     if URL is not None:
         text = replace_at_urls(text,URL)
@@ -1254,8 +1267,8 @@ def render(text,
             k = escape(k)
             title = ' title="%s"' % a.replace(META, DISABLED_META) if a else ''
             target = ' target="_blank"' if p == 'popup' else ''
-            t = render(t, {}, {}, 'br', URL, environment, latex, autolinks,
-                       protolinks, class_prefix, id_prefix, pretty_print) if t else k
+            t = render(t, {}, {}, 'br', URL, environment, latex, None,
+                       None, class_prefix, id_prefix, pretty_print) if t else k
             return '<a href="%(k)s"%(title)s%(target)s>%(t)s</a>' \
                    % dict(k=k, title=title, target=target, t=t)
         if t == 'NEWLINE' and not a:

From f7c0f0341b55bb30a9ab953ee1f3e55e3809b7ee Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 14:44:04 -0500
Subject: [PATCH 10/49] who page

---
 VERSION                                      | 2 +-
 applications/examples/views/default/who.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index c7420dbe..4cac973f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 07:43:19) dev
+Version 2.1.1 (2012-10-15 14:43:43) dev
diff --git a/applications/examples/views/default/who.html b/applications/examples/views/default/who.html
index 64eef3bf..23fc8e2b 100644
--- a/applications/examples/views/default/who.html
+++ b/applications/examples/views/default/who.html
@@ -29,6 +29,7 @@
 </li><li>Alvaro Justen (dynamical translations)
 </li><li>Anders Roos (file locking)
 </li><li>Andrew Willimott (documentation, TeraData support)
+</li><li>Andriy Kornatskyy (benchmarks and profiling)
 </li><li>Angelo Compagnucci (mobile devices)
 </li><li>Anthony Bastardi (book, poweredby site, multiple contributions)
 </li><li>Arun K. Rajeevan (plugin_wiki)

From d5381d7b36cb9c40d8ac6c7b13252340ca894a8c Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 14:48:45 -0500
Subject: [PATCH 11/49] fixed make pip

---
 Makefile | 4 ++--
 VERSION  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8b7bb471..28c222ed 100644
--- a/Makefile
+++ b/Makefile
@@ -130,5 +130,5 @@ pip:
 	# after upload clean Web2py sources with rm -R ./dist
 	# http://guide.python-distribute.org/creation.html
 	python setup.py sdist
-	python setup.py register
-	python setup.py sdist upload
+	sudo python setup.py register
+	sudo python setup.py sdist upload
diff --git a/VERSION b/VERSION
index 4cac973f..231b2e09 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 14:43:43) dev
+Version 2.1.1 (2012-10-15 14:48:33) dev

From e2e843d2ed223db783e266887059b9cd28296e9e Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 16:28:51 -0500
Subject: [PATCH 12/49] more languages patches, thanks Vladyslav

---
 VERSION                              | 2 +-
 applications/admin/languages/uk.py   | 7 ++++++-
 applications/welcome/languages/uk.py | 1 +
 gluon/languages.py                   | 9 +++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 231b2e09..8e7f6c2c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 14:48:33) dev
+Version 2.1.1 (2012-10-15 16:28:43) dev
diff --git a/applications/admin/languages/uk.py b/applications/admin/languages/uk.py
index b70f3a8c..afd690fb 100644
--- a/applications/admin/languages/uk.py
+++ b/applications/admin/languages/uk.py
@@ -34,10 +34,12 @@
 'App does not exist or your are not authorized': 'Додаток не існує, або ви не авторизовані',
 'appadmin': 'Aдм.панель',
 'appadmin is disabled because insecure channel': "адмін.панель відключено через використання ненадійного каналу зв'язку",
+'Application': 'Додаток (Application)',
 'application "%s" uninstalled': 'додаток "%s" вилучено',
 'application %(appname)s installed with md5sum: %(digest)s': 'додаток %(appname)s встановлено з md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'В демо-режимі генерувати додатки не можна',
 'application compiled': 'додаток скомпільовано',
+'Application exists already': 'Додаток вже існує',
 'application is compiled and cannot be designed': 'додаток скомпільований. налаштування змінювати не можна',
 'Application name:': 'Назва додатку:',
 'are not used': 'не використовуються',
@@ -160,6 +162,7 @@
 'Error snapshot': 'Розгорнутий знімок стану (Error snapshot)',
 'Error ticket': 'Позначка (ticket) про помилку',
 'Errors': 'Помилки',
+'Errors in form, please check it out.': 'Помилка у формі, будь-ласка перевірте її.',
 'Exception %(extype)s: %(exvalue)s': 'Виключення %(extype)s: %(exvalue)s',
 'Exception %s': 'Виключення %s',
 'Exception instance attributes': 'Атрибути примірника класу Exception (виключення)',
@@ -388,6 +391,7 @@
 'There are no models': 'Моделей, наразі, нема',
 'There are no modules': 'Модулів поки що нема',
 'There are no plugins': 'Жодної втулки, наразі, не встановлено',
+'There are no private files': 'Приватних файлів поки що нема',
 'There are no static files': 'Статичних файлів, наразі, нема',
 'There are no translators': 'Перекладів нема',
 'There are no translators, only default language is supported': 'Перекладів нема, підтримується тільки мова оригіналу',
@@ -418,6 +422,7 @@
 'Traceback': 'Стек викликів (Traceback)',
 'Translation strings for the application': 'Пари рядків <оригінал>:<переклад> для вибраної мови',
 'try something like': 'спробуйте щось схоже на',
+'Try the mobile interface': 'Спробуйте мобільний інтерфейс',
 'try view': 'дивитись результат',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'наберіть тут будь-які команди ладнача PDB і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Наберіть тут будь-які вирази Python і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
@@ -463,7 +468,7 @@
 'Views': 'Відображення (Views)',
 'views': 'відображення',
 'WARNING:': 'ПОПЕРЕДЖЕННЯ:',
-'Web Framework': 'Web Framework',
+'Web Framework': 'Веб-каркас (Web Framework)',
 'web2py apps to deploy': 'Готові до розгортання додатки web2py',
 'web2py Debugger': 'Ладнач web2py',
 'web2py downgrade': 'повернення на попередню версію web2py',
diff --git a/applications/welcome/languages/uk.py b/applications/welcome/languages/uk.py
index 453745c9..9597e58e 100644
--- a/applications/welcome/languages/uk.py
+++ b/applications/welcome/languages/uk.py
@@ -89,6 +89,7 @@
 'export as csv file': 'експортувати як файл csv',
 'FAQ': 'ЧаПи (FAQ)',
 'First name': "Ім'я",
+'Forgot username?': "Забули ім'я користувача?",
 'Forms and Validators': 'Форми та коректність даних',
 'Free Applications': 'Вільні додатки',
 'Group %(group_id)s created': 'Групу %(group_id)s створено',
diff --git a/gluon/languages.py b/gluon/languages.py
index 0b669d6b..d493cb26 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -35,7 +35,8 @@ pjoin = os.path.join
 pexists = os.path.exists
 pdirname = os.path.dirname
 isdir = os.path.isdir
-is_gae = settings.global_settings.web2py_runtime_gae
+is_writable = not (settings.global_settings.web2py_runtime_gae or
+                   settings.global_settings.languages_readonly)
 
 DEFAULT_LANGUAGE = 'en'
 DEFAULT_LANGUAGE_NAME = 'English'
@@ -274,7 +275,7 @@ def write_plural_dict(filename, contents):
             fp.write('%s: %s,\n' % (repr(Utf8(key)), forms))
         fp.write('}\n')
     except (IOError, OSError):
-        if not is_gae:
+        if is_writable:
             logging.warning('Unable to write to file %s' % filename)
         return
     finally:
@@ -537,7 +538,7 @@ class translator(object):
                     form = self.construct_plural_form(word, id)
                     forms[id-1] = form
                     self.plural_dict[word] = forms
-                    if self.plural_file and not is_gae:
+                    if self.plural_file and is_writable:
                         write_plural_dict(self.plural_file,
                                           self.plural_dict)
                     return form
@@ -723,7 +724,7 @@ class translator(object):
         # guess translation same as original
         self.t[key] = mt = self.default_t.get(key, message)
         # update language file for latter translation
-        if self.language_file != self.default_language_file and not is_gae:
+        if self.language_file != self.default_language_file and is_writable:
             write_dict(self.language_file, self.t)
         return regex_backslash.sub(
             lambda m: m.group(1).translate(ttab_in), mt)

From 6b9ebb6dc5be01f6a9696dca24eda19ee4c469ea Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 19:39:25 -0500
Subject: [PATCH 13/49] fixed issue with storing Row in session

---
 VERSION      | 2 +-
 gluon/dal.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 8e7f6c2c..8b570c0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 16:28:43) dev
+Version 2.1.1 (2012-10-15 19:39:19) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index 175e3faa..087be33b 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -6417,10 +6417,10 @@ class Row(object):
 
     def __str__(self):
         ### this could be made smarter
-        return '<Row %s>' % self.__dict__
+        return '<Row %s>' % self.as_dict()
 
     def __repr__(self):
-        return '<Row %s>' % self.__dict__
+        return '<Row %s>' % self.as_dict()
 
     def __int__(self):
         return object.__getattribute__(self,'id')

From ab95dfa7cdbfbce18c6d28caad82947e3af947ab Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 20:43:51 -0500
Subject: [PATCH 14/49] fixed problem with session __hash

---
 VERSION          |  2 +-
 gluon/globals.py | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 8b570c0e..78f53867 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 19:39:19) dev
+Version 2.1.1 (2012-10-15 20:43:47) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index a9fcd07b..79fa3bd7 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -608,7 +608,8 @@ class Session(Storage):
         rcookies = response.cookies
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
-        self.__hash = hashlib.md5(str(self)).digest()
+        pickle = cPickle.dumps(self)
+        self.__hash = hashlib.md5(pickle).digest()
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 
@@ -653,16 +654,20 @@ class Session(Storage):
 
         # don't save if no change to session
         __hash = self.__hash
+        pickle = None
         if __hash is not None:
             del self.__hash
-            if __hash == hashlib.md5(str(self)).digest():
+            pickle = cPickle.dumps(self)
+            if __hash == hashlib.md5(pickle).digest():
                 return
+        else:
+            pickle = cPickle.dumps(self)
 
         (record_id_name, table, record_id, unique_key) = \
             response._dbtable_and_field
         dd = dict(locked=False, client_ip=request.client.replace(':','.'),
                   modified_datetime=request.now,
-                  session_data=cPickle.dumps(dict(self)),
+                  session_data=pickle,
                   unique_key=unique_key)
         if record_id:
             table._db(table.id == record_id).update(**dd)
@@ -680,9 +685,11 @@ class Session(Storage):
 
         # don't save if no change to session
         __hash = self.__hash
+        pickle = None
         if __hash is not None:
             del self.__hash
-            if __hash == hashlib.md5(str(self)).digest():
+            pickle = cPickle.dumps(self)
+            if __hash == hashlib.md5(pickle).digest():
                 self._close(response)
                 return
 
@@ -700,7 +707,8 @@ class Session(Storage):
             response.session_locked = True
 
         if response.session_file:
-            cPickle.dump(dict(self), response.session_file)
+            if not pickle: pickle = cPickle.dumps(self)
+            response.session_file.write(pickle)
             response.session_file.truncate()
             self._close(response)
 

From 3a1ba53a4b86f0da79be3da78b63509fce401c7f Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Oct 2012 21:49:43 -0500
Subject: [PATCH 15/49] reverting some test but session.__hash needs work

---
 VERSION          |  2 +-
 gluon/globals.py | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/VERSION b/VERSION
index 78f53867..ef4d7a46 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 20:43:47) dev
+Version 2.1.1 (2012-10-15 21:49:38) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index 79fa3bd7..a9fcd07b 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -608,8 +608,7 @@ class Session(Storage):
         rcookies = response.cookies
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
-        pickle = cPickle.dumps(self)
-        self.__hash = hashlib.md5(pickle).digest()
+        self.__hash = hashlib.md5(str(self)).digest()
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 
@@ -654,20 +653,16 @@ class Session(Storage):
 
         # don't save if no change to session
         __hash = self.__hash
-        pickle = None
         if __hash is not None:
             del self.__hash
-            pickle = cPickle.dumps(self)
-            if __hash == hashlib.md5(pickle).digest():
+            if __hash == hashlib.md5(str(self)).digest():
                 return
-        else:
-            pickle = cPickle.dumps(self)
 
         (record_id_name, table, record_id, unique_key) = \
             response._dbtable_and_field
         dd = dict(locked=False, client_ip=request.client.replace(':','.'),
                   modified_datetime=request.now,
-                  session_data=pickle,
+                  session_data=cPickle.dumps(dict(self)),
                   unique_key=unique_key)
         if record_id:
             table._db(table.id == record_id).update(**dd)
@@ -685,11 +680,9 @@ class Session(Storage):
 
         # don't save if no change to session
         __hash = self.__hash
-        pickle = None
         if __hash is not None:
             del self.__hash
-            pickle = cPickle.dumps(self)
-            if __hash == hashlib.md5(pickle).digest():
+            if __hash == hashlib.md5(str(self)).digest():
                 self._close(response)
                 return
 
@@ -707,8 +700,7 @@ class Session(Storage):
             response.session_locked = True
 
         if response.session_file:
-            if not pickle: pickle = cPickle.dumps(self)
-            response.session_file.write(pickle)
+            cPickle.dump(dict(self), response.session_file)
             response.session_file.truncate()
             self._close(response)
 

From 30ec8e645b73547d607e8545f7f690a125565a02 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Tue, 16 Oct 2012 06:15:45 -0500
Subject: [PATCH 16/49] sessions in secure cookies,
 session.connect(cookie_key='mypassword')

---
 VERSION                    |   2 +-
 gluon/contrib/webclient.py |   9 +--
 gluon/globals.py           | 161 ++++++++++++++++++-------------------
 gluon/main.py              |   2 +-
 gluon/utils.py             |  36 +++++++++
 5 files changed, 122 insertions(+), 88 deletions(-)

diff --git a/VERSION b/VERSION
index ef4d7a46..d82d3359 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 21:49:38) dev
+Version 2.1.1 (2012-10-16 06:15:40) dev
diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py
index b4ab242b..8791ff1d 100644
--- a/gluon/contrib/webclient.py
+++ b/gluon/contrib/webclient.py
@@ -136,12 +136,11 @@ class WebClient(object):
                 raise error
 
         # parse headers into cookies
+        self.cookies = {}
         if 'set-cookie' in self.headers:
-            self.cookies = dict(
-                item[:item.find(';')].split('=') for item in \
-                    self.headers['set-cookie'].split(','))
-        else:
-            self.cookies = {}
+            for item in self.headers['set-cookie'].split(','):
+                key,value = item[:item.find(';')].split('=')
+            self.cookies[key.strip()]=value.strip()
 
         # check is a new session id has been issued, symptom of broken session
         if self.session_regex is not None:
diff --git a/gluon/globals.py b/gluon/globals.py
index a9fcd07b..51d06fe6 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -23,7 +23,7 @@ from http import HTTP, redirect
 from fileutils import up
 from serializers import json, custom_json
 import settings
-from utils import web2py_uuid
+from utils import web2py_uuid, secure_dumps, secure_loads
 from settings import global_settings
 import hashlib
 import portalocker
@@ -39,11 +39,6 @@ import threading
 import hmac
 import base64
 
-try:
-    from Crypto.Cipher import AES
-except ImportError:
-    from contrib import aes as AES
-
 try:
     from gluon.contrib.minify import minify
     have_minify = True
@@ -463,8 +458,8 @@ class Session(Storage):
 
     def connect(
         self,
-        request,
-        response,
+        request=None,
+        response=None,
         db=None,
         tablename='web2py_session',
         masterapp=None,
@@ -478,6 +473,8 @@ class Session(Storage):
         and it is used to determine a session prefix.
         separate can be True and it is set to session_name[-2:]
         """
+        if request is None: request = current.request
+        if response is None: response = current.response
         if separate == True:
             separate = lambda session_name: session_name[-2:]
         self._unlock(response)
@@ -487,34 +484,32 @@ class Session(Storage):
         
         # Load session data from cookie
         cookies = request.cookies
-            
+
+        if response.session_id_name in cookies:
+            response.session_id = \
+                cookies[response.session_id_name].value
+        else:
+            response.session_id = None
+
         if cookie_key:
+            response.session_storage_type = 'cookie'
             response.session_cookie_key = cookie_key
-            response.session_cookie_key2 = hashlib.md5(cookie_key).digest()
-            cookie_name = masterapp.lower()+'_session_data'
+            response.session_cookie_hkey = hashlib.md5(cookie_key).hexdigest()
+            cookie_name = 'session_data_'+masterapp.lower()
             response.session_cookie_name = cookie_name
             if cookie_name in cookies:
                 cookie_value = cookies[cookie_name].value
-                cookie_parts = cookie_value.split(":")
-                enc = cookie_parts[2]
-                cipher = AES.new(cookie_key)
-                decrypted = cipher.decrypt(base64.b64decode(enc)).rstrip('{')
-                check = hmac.new(response.session_cookie_key2,enc).hexdigest()
-                if cookie_parts[0] == check:
-                    session_data = cPickle.loads(decrypted)
+                session_data = secure_loads(cookie_value, cookie_key)
+                if session_data:
                     self.update(session_data)
-            else:
-                return
-
-        if not db:
+        elif not db:
+            response.session_storage_type = 'file'
             if global_settings.db_sessions is True \
                     or masterapp in global_settings.db_sessions:
                 return
             response.session_new = False
             client = request.client and request.client.replace(':', '.')
-            if response.session_id_name in cookies:
-                response.session_id = \
-                    cookies[response.session_id_name].value
+            if response.session_id:
                 if regex_session_id.match(response.session_id):
                     response.session_filename = \
                         os.path.join(up(request.folder), masterapp,
@@ -553,9 +548,9 @@ class Session(Storage):
                                  'sessions', response.session_id)
                 response.session_new = True
         else:
+            response.session_storage_type = 'db'
             if global_settings.db_sessions is not True:
                 global_settings.db_sessions.add(masterapp)
-            response.session_db = True
             if response.session_file:
                 self._close(response)
             if settings.global_settings.web2py_runtime_gae:
@@ -584,9 +579,7 @@ class Session(Storage):
             try:
 
                 # Get session data out of the database
-                # Key comes from the cookie
-                key = cookies[response.session_id_name].value
-                (record_id, unique_key) = key.split(':')
+                (record_id, unique_key) = response.session_id.split(':')
                 if record_id == '0':
                     raise Exception, 'record_id == 0'
                         # Select from database
@@ -602,13 +595,13 @@ class Session(Storage):
                 record_id = None
                 unique_key = web2py_uuid()
                 session_data = {}
-            response._dbtable_and_field = \
-                (response.session_id_name, table, record_id, unique_key)
             response.session_id = '%s:%s' % (record_id, unique_key)
+            response.session_db_table = table
+            response.session_db_record_id = record_id
+            response.session_db_unique_key = unique_key
         rcookies = response.cookies
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
-        self.__hash = hashlib.md5(str(self)).digest()
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 
@@ -636,31 +629,38 @@ class Session(Storage):
         self._forget = True
 
     def _try_store_in_cookie(self, request, response):
-        pad = lambda s: s + (32 - len(s) % 32) * '{'
-        data = cPickle.dumps(dict(self))
-        cipher = AES.new(response.session_cookie_key)
-        encrypted_data = base64.b64encode(cipher.encrypt(pad(data)))
-        signature = hmac.new(response.session_cookie_key2,encrypted_data)\
-            .hexdigest()
-        value = signature+':'+encrypted_data
+        if response.session_storage_type!='cookie': return False
+        value = secure_dumps(dict(self),response.session_cookie_key)
         response.cookies[response.session_cookie_name] = value
         response.cookies[response.session_cookie_name]['path'] = '/'
+        return True
+
+    def _unchanged(self):
+        previous_session_hash = self.pop('_session_hash',None)
+        if not previous_session_hash and not self:
+            return True
+        session_pickled = cPickle.dumps(dict(self))
+        session_hash = hashlib.md5(session_pickled).hexdigest()
+        if previous_session_hash == session_hash:
+            return True
+        else:
+            self._session_hash = session_hash
+            return False
 
     def _try_store_in_db(self, request, response):
-        # don't save if file-based sessions, no session id, or session being forgotten
-        if not response.session_db or not response.session_id or self._forget:
-            return
+        # don't save if file-based sessions,
+        # no session id, or session being forgotten
+        # or no changes to session
+        if response.session_storage_type!='db' or not response.session_id \
+                or self._forget or self._unchanged():
+            return False
 
-        # don't save if no change to session
-        __hash = self.__hash
-        if __hash is not None:
-            del self.__hash
-            if __hash == hashlib.md5(str(self)).digest():
-                return
+        table = response.session_db_table
+        record_id = response.session_db_record_id
+        unique_key = response.session_db_unique_key
 
-        (record_id_name, table, record_id, unique_key) = \
-            response._dbtable_and_field
-        dd = dict(locked=False, client_ip=request.client.replace(':','.'),
+        dd = dict(locked=False,
+                  client_ip=request.client.replace(':','.'),
                   modified_datetime=request.now,
                   session_data=cPickle.dumps(dict(self)),
                   unique_key=unique_key)
@@ -668,41 +668,40 @@ class Session(Storage):
             table._db(table.id == record_id).update(**dd)
         else:
             record_id = table.insert(**dd)
-        response.cookies[response.session_id_name] = '%s:%s'\
-             % (record_id, unique_key)
-        response.cookies[response.session_id_name]['path'] = '/'
 
-    def _try_store_on_disk(self, request, response):
+        cookies, session_id_name = response.cookies, response.session_id_name
+        cookies[session_id_name] = '%s:%s' % (record_id, unique_key)
+        cookies[session_id_name]['path'] = '/'
+        return True
 
-        # don't save if sessions not not file-based
-        if response.session_db:
-            return
+    def _try_store_in_cookie_or_file(self, request, response):
+        return \
+            self._try_store_in_cookie(request,response) or \
+            self._try_store_in_file(request,response)
 
-        # don't save if no change to session
-        __hash = self.__hash
-        if __hash is not None:
-            del self.__hash
-            if __hash == hashlib.md5(str(self)).digest():
-                self._close(response)
-                return
+    def _try_store_in_file(self, request, response):
+        if response.session_storage_type!='file':
+            return False
 
-        if not response.session_id or self._forget:
-            self._close(response)
-            return
-
-        if response.session_new:
-            # Tests if the session sub-folder exists, if not, create it
-            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')
-            portalocker.lock(response.session_file, portalocker.LOCK_EX)
-            response.session_locked = True
-
-        if response.session_file:
-            cPickle.dump(dict(self), response.session_file)
-            response.session_file.truncate()
+        try:
+            if not response.session_id or self._forget or self._unchanged():
+                return False
+
+            if response.session_new:
+                # Tests if the session sub-folder exists, if not, create it
+                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')
+                portalocker.lock(response.session_file, portalocker.LOCK_EX)
+                response.session_locked = True
+
+            if response.session_file:
+                cPickle.dump(dict(self), response.session_file)
+                response.session_file.truncate()
+        finally:
             self._close(response)
+        return True
 
     def _unlock(self, response):
         if response and response.session_file and response.session_locked:
diff --git a/gluon/main.py b/gluon/main.py
index 066d0015..f3d9db4f 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -558,7 +558,7 @@ def wsgibase(environ, responder):
                 # this must be done after trying to commit database!
                 # ##################################################
                     
-                session._try_store_on_disk(request, response)
+                session._try_store_in_cookie_or_file(request, response)
                 
                 if request.cid:
                     if response.flash:
diff --git a/gluon/utils.py b/gluon/utils.py
index 13314c5e..9334ec1a 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -21,6 +21,14 @@ import os
 import re
 import logging
 import socket
+import cPickle
+import base64
+
+try:
+    from Crypto.Cipher import AES
+except ImportError:
+    from contrib import aes as AES
+
 try:
     from contrib.pbkdf2 import pbkdf2_hex
     HAVE_PBKDF2 = True
@@ -94,6 +102,34 @@ DIGEST_ALG_BY_SIZE = {
     512/4: 'sha512',
     }
 
+def pad(s,n=32,padchar='.'):
+    return s + (32 - len(s) % 32) * padchar
+
+def secure_dumps(data,encryption_key,hash_key=None):
+    if not hash_key:
+        hash_key = hashlib.sha1(encryption_key).hexdigest()
+    dump = cPickle.dumps(data)
+    key = pad(encryption_key[:32])
+    cipher = AES.new(key,IV=key)
+    encrypted_data = base64.b16encode(cipher.encrypt(pad(dump)))
+    signature = hmac.new(hash_key,encrypted_data).hexdigest()
+    return signature+':'+encrypted_data
+
+def secure_loads(data,encryption_key,hash_key=None):
+    if not hash_key:
+        hash_key = hashlib.sha1(encryption_key).hexdigest()
+    signature, encrypted_data = data.split(':',1)
+    actual_signature = hmac.new(hash_key,encrypted_data).hexdigest()
+    if signature!=actual_signature:
+        return None
+    key = pad(encryption_key[:32])
+    cipher = AES.new(key,IV=key)
+    try:
+        data = cipher.decrypt(base64.b16decode(encrypted_data))
+        data = data.rstrip(' ')
+        return cPickle.loads(data)
+    except (TypeError,cPickle.UnpicklingError):
+        return None
 
 ### compute constant CTOKENS
 def initialize_urandom():

From ecaed07a3da2a29c9284a98ba5d542742e868633 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Tue, 16 Oct 2012 06:19:39 -0500
Subject: [PATCH 17/49] fixed bug with auth.impersonate(0)

---
 VERSION        | 2 +-
 gluon/tools.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index d82d3359..822882fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 06:15:40) dev
+Version 2.1.1 (2012-10-16 06:19:35) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 8023171b..7f9eb83f 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2750,6 +2750,7 @@ class Auth(object):
             session.clear()
             session.update(cPickle.loads(auth.impersonator))
             self.user = session.auth.user
+            return None
         if requested_id is DEFAULT and not request.post_vars:
             return SQLFORM.factory(Field('user_id', 'integer'))
         return SQLFORM(table_user, user.id, readonly=True)

From b6a496aae5da83de082e35fc7182765b24e3802d Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Tue, 16 Oct 2012 07:10:33 -0500
Subject: [PATCH 18/49] improved session data in cookie

---
 VERSION          |  2 +-
 gluon/globals.py | 48 +++++++++++++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/VERSION b/VERSION
index 822882fd..b1cef285 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 06:19:35) dev
+Version 2.1.1 (2012-10-16 07:10:29) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index 51d06fe6..a6057e58 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -481,27 +481,33 @@ class Session(Storage):
         if not masterapp:
             masterapp = request.application
         response.session_id_name = 'session_id_%s' % masterapp.lower()
+        response.session_data_name = 'session_data_%s' % masterapp.lower()
         
         # Load session data from cookie
         cookies = request.cookies
 
+        # check if there is a session_id in cookies
         if response.session_id_name in cookies:
             response.session_id = \
                 cookies[response.session_id_name].value
         else:
             response.session_id = None
 
+        # check if there is session data in cookies
+        if response.session_data_name in cookies:
+            session_cookie_data = cookies[response.session_data_name].value
+        else:
+            session_cookie_data = None
+                
+        # if we are supposed to use cookie based session data
         if cookie_key:
             response.session_storage_type = 'cookie'
             response.session_cookie_key = cookie_key
-            response.session_cookie_hkey = hashlib.md5(cookie_key).hexdigest()
-            cookie_name = 'session_data_'+masterapp.lower()
-            response.session_cookie_name = cookie_name
-            if cookie_name in cookies:
-                cookie_value = cookies[cookie_name].value
-                session_data = secure_loads(cookie_value, cookie_key)
-                if session_data:
-                    self.update(session_data)
+            if session_cookie_data:
+                data = secure_loads(session_cookie_data,cookie_key)
+                if data:
+                    self.update(data)
+        # else if we are supposed to use file based sessions
         elif not db:
             response.session_storage_type = 'file'
             if global_settings.db_sessions is True \
@@ -516,7 +522,8 @@ class Session(Storage):
                             'sessions', response.session_id)
                 else:
                     response.session_id = None
-            if response.session_id:
+            # do not try load the data from file is these was data in cookie
+            if response.session_id and not session_cookie_data:
                 try:
                     response.session_file = \
                         open(response.session_filename, 'rb+')
@@ -547,6 +554,7 @@ class Session(Storage):
                     os.path.join(up(request.folder), masterapp,
                                  'sessions', response.session_id)
                 response.session_new = True
+        # else the session goes in db
         else:
             response.session_storage_type = 'db'
             if global_settings.db_sessions is not True:
@@ -583,14 +591,15 @@ class Session(Storage):
                 if record_id == '0':
                     raise Exception, 'record_id == 0'
                         # Select from database
-                rows = db(table.id == record_id).select()
-                # Make sure the session data exists in the database
-                if len(rows) == 0 or rows[0].unique_key != unique_key:
-                    raise Exception, 'No record'
-                # rows[0].update_record(locked=True)
-                # Unpickle the data
-                session_data = cPickle.loads(rows[0].session_data)
-                self.update(session_data)
+                if not request.session_cookie_data:
+                    rows = db(table.id == record_id).select()
+                    # Make sure the session data exists in the database
+                    if len(rows) == 0 or rows[0].unique_key != unique_key:
+                        raise Exception, 'No record'
+                    # rows[0].update_record(locked=True)
+                    # Unpickle the data
+                    session_data = cPickle.loads(rows[0].session_data)
+                    self.update(session_data)
             except Exception:
                 record_id = None
                 unique_key = web2py_uuid()
@@ -602,6 +611,7 @@ class Session(Storage):
         rcookies = response.cookies
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
+        # TODO: if not session data in cookie, delete seession_data_name cookie
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 
@@ -631,8 +641,8 @@ class Session(Storage):
     def _try_store_in_cookie(self, request, response):
         if response.session_storage_type!='cookie': return False
         value = secure_dumps(dict(self),response.session_cookie_key)
-        response.cookies[response.session_cookie_name] = value
-        response.cookies[response.session_cookie_name]['path'] = '/'
+        response.cookies[response.session_data_name] = value
+        response.cookies[response.session_data_name]['path'] = '/'
         return True
 
     def _unchanged(self):

From d404e405085d4e38c9af2f9bdf5d201838b24ba0 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Tue, 16 Oct 2012 07:44:22 -0500
Subject: [PATCH 19/49] improved session data in cookie

---
 VERSION          | 2 +-
 gluon/globals.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index b1cef285..e416da33 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 07:10:29) dev
+Version 2.1.1 (2012-10-16 07:44:17) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index a6057e58..dfa7481d 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -523,7 +523,7 @@ class Session(Storage):
                 else:
                     response.session_id = None
             # do not try load the data from file is these was data in cookie
-            if response.session_id and not session_cookie_data:
+            if response.session_id: #TODO and not session_cookie_data:
                 try:
                     response.session_file = \
                         open(response.session_filename, 'rb+')
@@ -591,7 +591,7 @@ class Session(Storage):
                 if record_id == '0':
                     raise Exception, 'record_id == 0'
                         # Select from database
-                if not request.session_cookie_data:
+                if True: # TODO: not session_cookie_data:
                     rows = db(table.id == record_id).select()
                     # Make sure the session data exists in the database
                     if len(rows) == 0 or rows[0].unique_key != unique_key:
@@ -612,6 +612,8 @@ class Session(Storage):
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
         # TODO: if not session data in cookie, delete seession_data_name cookie
+        #if session_cookie_data:
+        #    rcookies[response.session_data_name]
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 

From 9a6ce11f090acf429e6cb23b793b21ec1b58119b Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 10:25:28 -0500
Subject: [PATCH 20/49] users can switch between sessions storage types

---
 VERSION          |  2 +-
 gluon/globals.py | 19 ++++++++++++-------
 gluon/utils.py   |  2 ++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index e416da33..8ffb2002 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 07:44:17) dev
+Version 2.1.1 (2012-10-16 10:25:18) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index dfa7481d..29a4deff 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -36,8 +36,9 @@ import os
 import sys
 import traceback
 import threading
-import hmac
-import base64
+
+PAST = 'Sat, 1-Jan-1971 00:00:00'
+FUTURE = 'Tue, 1-Dec-2999 23:59:59'
 
 try:
     from gluon.contrib.minify import minify
@@ -523,7 +524,7 @@ class Session(Storage):
                 else:
                     response.session_id = None
             # do not try load the data from file is these was data in cookie
-            if response.session_id: #TODO and not session_cookie_data:
+            if response.session_id and not session_cookie_data:
                 try:
                     response.session_file = \
                         open(response.session_filename, 'rb+')
@@ -591,7 +592,7 @@ class Session(Storage):
                 if record_id == '0':
                     raise Exception, 'record_id == 0'
                         # Select from database
-                if True: # TODO: not session_cookie_data:
+                if not session_cookie_data:
                     rows = db(table.id == record_id).select()
                     # Make sure the session data exists in the database
                     if len(rows) == 0 or rows[0].unique_key != unique_key:
@@ -611,9 +612,12 @@ class Session(Storage):
         rcookies = response.cookies
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
-        # TODO: if not session data in cookie, delete seession_data_name cookie
-        #if session_cookie_data:
-        #    rcookies[response.session_data_name]
+        # if not cookie_key, but session_data_name in cookies
+        # expire session_data_name from cookies
+        if session_cookie_data:
+            rcookies[response.session_data_name] = 'expired'
+            rcookies[response.session_data_name]['path'] = '/'
+            rcookies[response.session_data_name]['expires'] = PAST
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 
@@ -645,6 +649,7 @@ class Session(Storage):
         value = secure_dumps(dict(self),response.session_cookie_key)
         response.cookies[response.session_data_name] = value
         response.cookies[response.session_data_name]['path'] = '/'
+        response.cookies[response.session_data_name]['expires'] = FUTURE
         return True
 
     def _unchanged(self):
diff --git a/gluon/utils.py b/gluon/utils.py
index 9334ec1a..a160cc6e 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -116,6 +116,8 @@ def secure_dumps(data,encryption_key,hash_key=None):
     return signature+':'+encrypted_data
 
 def secure_loads(data,encryption_key,hash_key=None):
+    if not ':' in data:
+        return None
     if not hash_key:
         hash_key = hashlib.sha1(encryption_key).hexdigest()
     signature, encrypted_data = data.split(':',1)

From 41c40974a318169ca4a22455bcf702cbec1dc8b3 Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 10:34:36 -0500
Subject: [PATCH 21/49] fixed issue 1092, thanks nicozanf

---
 VERSION        | 2 +-
 gluon/shell.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 8ffb2002..5ee5440e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 10:25:18) dev
+Version 2.1.1 (2012-10-16 10:34:32) dev
diff --git a/gluon/shell.py b/gluon/shell.py
index 4a336ba4..2ad019fa 100644
--- a/gluon/shell.py
+++ b/gluon/shell.py
@@ -172,11 +172,11 @@ def run(
     adir = os.path.join('applications', a)
     if not os.path.exists(adir):
         if sys.stdin and not sys.stdin.name == '/dev/null':
-            c = raw_input('application %s does not exist, create (y/n)?' % a)
+            confirm = raw_input('application %s does not exist, create (y/n)?' % a)
         else:
             logging.warn('application does not exist and will not be created')
             return
-        if c.lower() in ['y', 'yes']:
+        if confirm.lower() in ['y', 'yes']:
 
             os.mkdir(adir)
             w2p_unpack('welcome.w2p', adir)

From 67840e948124a32b93b6a613a6f3eedb5bcf7604 Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 10:54:33 -0500
Subject: [PATCH 22/49] current.T.is_writable=False no languages write, thanks
 Fran

---
 VERSION            | 2 +-
 gluon/languages.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 5ee5440e..e12e943f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 10:34:32) dev
+Version 2.1.1 (2012-10-16 10:54:30) dev
diff --git a/gluon/languages.py b/gluon/languages.py
index d493cb26..397fabd9 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -417,6 +417,7 @@ class translator(object):
         self.folder = request.folder
         self.langpath = pjoin(self.folder, 'languages')
         self.http_accept_language = request.env.http_accept_language
+        self.is_writable = is_writable
         # filled in self.force():
         #------------------------
         # self.cache
@@ -538,7 +539,7 @@ class translator(object):
                     form = self.construct_plural_form(word, id)
                     forms[id-1] = form
                     self.plural_dict[word] = forms
-                    if self.plural_file and is_writable:
+                    if self.plural_file and self.is_writable:
                         write_plural_dict(self.plural_file,
                                           self.plural_dict)
                     return form
@@ -724,7 +725,7 @@ class translator(object):
         # guess translation same as original
         self.t[key] = mt = self.default_t.get(key, message)
         # update language file for latter translation
-        if self.language_file != self.default_language_file and is_writable:
+        if self.language_file != self.default_language_file and self.is_writable:
             write_dict(self.language_file, self.t)
         return regex_backslash.sub(
             lambda m: m.group(1).translate(ttab_in), mt)

From c13b4f18f729b946c052c0c820257538e65a7cca Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 11:08:42 -0500
Subject: [PATCH 23/49] fixed auth.impersonating again, thanks Ricardo

---
 VERSION        | 2 +-
 gluon/tools.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index e12e943f..100f8195 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 10:54:30) dev
+Version 2.1.1 (2012-10-16 11:08:39) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 7f9eb83f..80a1924b 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2746,10 +2746,11 @@ class Auth(object):
                     callback(form)
             log = self.messages.impersonate_log
             self.log_event(log,dict(id=current_id, other_id=auth.user.id))
-        elif user_id in (0, '0') and self.is_impersonating():
-            session.clear()
-            session.update(cPickle.loads(auth.impersonator))
-            self.user = session.auth.user
+        elif user_id in (0, '0'):
+            if self.is_impersonating():
+                session.clear()
+                session.update(cPickle.loads(auth.impersonator))
+                self.user = session.auth.user
             return None
         if requested_id is DEFAULT and not request.post_vars:
             return SQLFORM.factory(Field('user_id', 'integer'))

From f6789eaf39face7e1d126bfe6efc77c29b9efa7c Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 11:14:52 -0500
Subject: [PATCH 24/49] session cookie data no expires by default

---
 VERSION          | 2 +-
 gluon/globals.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 100f8195..b04cf02b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 11:08:39) dev
+Version 2.1.1 (2012-10-16 11:14:48) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index 29a4deff..afec83fe 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -468,6 +468,7 @@ class Session(Storage):
         separate = None,
         check_client=False,
         cookie_key=None,
+        cookie_expires=FUTURE,
         ):
         """
         separate can be separate=lambda(session_name): session_name[-2:]
@@ -504,6 +505,7 @@ class Session(Storage):
         if cookie_key:
             response.session_storage_type = 'cookie'
             response.session_cookie_key = cookie_key
+            response.session_data_expires = cookie_expires
             if session_cookie_data:
                 data = secure_loads(session_cookie_data,cookie_key)
                 if data:
@@ -647,9 +649,12 @@ class Session(Storage):
     def _try_store_in_cookie(self, request, response):
         if response.session_storage_type!='cookie': return False
         value = secure_dumps(dict(self),response.session_cookie_key)
+        response.cookies.pop(response.session_data_name,None)            
         response.cookies[response.session_data_name] = value
         response.cookies[response.session_data_name]['path'] = '/'
-        response.cookies[response.session_data_name]['expires'] = FUTURE
+        expires = response.session_data_expires
+        if expires: 
+            response.cookies[response.session_data_name]['expires'] = expires
         return True
 
     def _unchanged(self):

From addbb78151e54d0124497aead3916fb4f1f563eb Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 11:23:41 -0500
Subject: [PATCH 25/49] customizable session cookie expriration

---
 VERSION          |  2 +-
 gluon/globals.py | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index b04cf02b..e652961c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 11:14:48) dev
+Version 2.1.1 (2012-10-16 11:23:37) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index afec83fe..18b78321 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -37,6 +37,7 @@ import sys
 import traceback
 import threading
 
+FMT = '%a, %d-%b-%Y %H:%M:%S PST'
 PAST = 'Sat, 1-Jan-1971 00:00:00'
 FUTURE = 'Tue, 1-Dec-2999 23:59:59'
 
@@ -468,7 +469,7 @@ class Session(Storage):
         separate = None,
         check_client=False,
         cookie_key=None,
-        cookie_expires=FUTURE,
+        cookie_expires=None,
         ):
         """
         separate can be separate=lambda(session_name): session_name[-2:]
@@ -484,6 +485,7 @@ class Session(Storage):
             masterapp = request.application
         response.session_id_name = 'session_id_%s' % masterapp.lower()
         response.session_data_name = 'session_data_%s' % masterapp.lower()
+        response.session_cookie_expires = cookie_expires
         
         # Load session data from cookie
         cookies = request.cookies
@@ -505,7 +507,6 @@ class Session(Storage):
         if cookie_key:
             response.session_storage_type = 'cookie'
             response.session_cookie_key = cookie_key
-            response.session_data_expires = cookie_expires
             if session_cookie_data:
                 data = secure_loads(session_cookie_data,cookie_key)
                 if data:
@@ -614,6 +615,8 @@ class Session(Storage):
         rcookies = response.cookies
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
+        if cookie_expires:
+            rcookies[response.session_id_name]['expires'] = cookie_expires.strftime(FMT)
         # if not cookie_key, but session_data_name in cookies
         # expire session_data_name from cookies
         if session_cookie_data:
@@ -648,13 +651,15 @@ class Session(Storage):
 
     def _try_store_in_cookie(self, request, response):
         if response.session_storage_type!='cookie': return False
+        name = response.session_data_name
         value = secure_dumps(dict(self),response.session_cookie_key)
-        response.cookies.pop(response.session_data_name,None)            
-        response.cookies[response.session_data_name] = value
-        response.cookies[response.session_data_name]['path'] = '/'
-        expires = response.session_data_expires
+        expires = response.session_cookie_expires
+        rcookies = response.cookies 
+        rcookies.pop(name,None)            
+        rcookies[name] = value
+        rcookies[name]['path'] = '/'
         if expires: 
-            response.cookies[response.session_data_name]['expires'] = expires
+            rcookies[name]['expires'] = expires.strftime(FMT)
         return True
 
     def _unchanged(self):

From 013c94cdf64d839adb4e95fbc6cb1f820f66f7a6 Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Tue, 16 Oct 2012 11:47:16 -0500
Subject: [PATCH 26/49] inlined sluggify

---
 VERSION          | 2 +-
 gluon/rewrite.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index e652961c..1375695b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 11:23:37) dev
+Version 2.1.1 (2012-10-16 11:47:13) dev
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 1dd01e55..f276ff47 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -596,7 +596,7 @@ def regex_url_in(request, environ):
     routes = THREAD_LOCAL.routes
     if routes.routes_in:
         environ = regex_filter_in(environ)
-    request.env.update((sluggify(k),v) for k,v in environ.iteritems())
+    request.env.update((k.lower().replace('.','_'),v) for k,v in environ.iteritems())
 
     # ##################################################
     # serve if a static file
@@ -1026,7 +1026,7 @@ class MapUrlIn(object):
     def sluggify(self):
         ""
         self.request.env.update(
-            (sluggify(k),v) for k,v in self.env.iteritems())
+            (k.lower().replace('.','_'),v) for k,v in self.env.iteritems())
 
     def update_request(self):
         '''

From 161b2271b3313933e8b5d8d32c9c24fcc6b3ae68 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 17 Oct 2012 09:13:48 -0500
Subject: [PATCH 27/49] T.is_writable, thanks Fran

---
 VERSION            |  2 +-
 gluon/languages.py | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 1375695b..30ff6dd0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-16 11:47:13) dev
+Version 2.1.1 (2012-10-17 09:13:38) dev
diff --git a/gluon/languages.py b/gluon/languages.py
index 397fabd9..1601f3af 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -35,8 +35,7 @@ pjoin = os.path.join
 pexists = os.path.exists
 pdirname = os.path.dirname
 isdir = os.path.isdir
-is_writable = not (settings.global_settings.web2py_runtime_gae or
-                   settings.global_settings.languages_readonly)
+is_gae = settings.global_settings.web2py_runtime_gae
 
 DEFAULT_LANGUAGE = 'en'
 DEFAULT_LANGUAGE_NAME = 'English'
@@ -275,7 +274,7 @@ def write_plural_dict(filename, contents):
             fp.write('%s: %s,\n' % (repr(Utf8(key)), forms))
         fp.write('}\n')
     except (IOError, OSError):
-        if is_writable:
+        if not is_gae:
             logging.warning('Unable to write to file %s' % filename)
         return
     finally:
@@ -417,7 +416,7 @@ class translator(object):
         self.folder = request.folder
         self.langpath = pjoin(self.folder, 'languages')
         self.http_accept_language = request.env.http_accept_language
-        self.is_writable = is_writable
+        self.is_writable = not is_gae
         # filled in self.force():
         #------------------------
         # self.cache
@@ -539,7 +538,7 @@ class translator(object):
                     form = self.construct_plural_form(word, id)
                     forms[id-1] = form
                     self.plural_dict[word] = forms
-                    if self.plural_file and self.is_writable:
+                    if self.is_writable and self.plural_file:
                         write_plural_dict(self.plural_file,
                                           self.plural_dict)
                     return form
@@ -725,7 +724,7 @@ class translator(object):
         # guess translation same as original
         self.t[key] = mt = self.default_t.get(key, message)
         # update language file for latter translation
-        if self.language_file != self.default_language_file and self.is_writable:
+        if self.is_writable and self.language_file != self.default_language_file:
             write_dict(self.language_file, self.t)
         return regex_backslash.sub(
             lambda m: m.group(1).translate(ttab_in), mt)

From ca3d050a0bd8caa00d115698642c5c67b82652ba Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 17 Oct 2012 12:04:19 -0500
Subject: [PATCH 28/49] fixed problem with session in cookie, thanks Niphlod

---
 VERSION          |  2 +-
 gluon/globals.py |  6 ++++--
 gluon/utils.py   | 17 +++++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index 30ff6dd0..bd8fb753 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-17 09:13:38) dev
+Version 2.1.1 (2012-10-17 12:04:15) dev
diff --git a/gluon/globals.py b/gluon/globals.py
index 18b78321..d601b65e 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -470,6 +470,7 @@ class Session(Storage):
         check_client=False,
         cookie_key=None,
         cookie_expires=None,
+        compression_level=None
         ):
         """
         separate can be separate=lambda(session_name): session_name[-2:]
@@ -507,8 +508,9 @@ class Session(Storage):
         if cookie_key:
             response.session_storage_type = 'cookie'
             response.session_cookie_key = cookie_key
+            response.session_cookie_compression_level = compression_level
             if session_cookie_data:
-                data = secure_loads(session_cookie_data,cookie_key)
+                data = secure_loads(session_cookie_data,cookie_key,compression_level=compression_level)
                 if data:
                     self.update(data)
         # else if we are supposed to use file based sessions
@@ -652,7 +654,7 @@ class Session(Storage):
     def _try_store_in_cookie(self, request, response):
         if response.session_storage_type!='cookie': return False
         name = response.session_data_name
-        value = secure_dumps(dict(self),response.session_cookie_key)
+        value = secure_dumps(dict(self),response.session_cookie_key, compression_level=response.session_cookie_compression_level)
         expires = response.session_cookie_expires
         rcookies = response.cookies 
         rcookies.pop(name,None)            
diff --git a/gluon/utils.py b/gluon/utils.py
index a160cc6e..ecc957bc 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -23,6 +23,7 @@ import logging
 import socket
 import cPickle
 import base64
+import zlib
 
 try:
     from Crypto.Cipher import AES
@@ -105,17 +106,19 @@ DIGEST_ALG_BY_SIZE = {
 def pad(s,n=32,padchar='.'):
     return s + (32 - len(s) % 32) * padchar
 
-def secure_dumps(data,encryption_key,hash_key=None):
+def secure_dumps(data,encryption_key,hash_key=None,compression_level=None):
     if not hash_key:
         hash_key = hashlib.sha1(encryption_key).hexdigest()
     dump = cPickle.dumps(data)
+    if compression_level:
+        dump = zlib.compress(dump, compression_level)
     key = pad(encryption_key[:32])
-    cipher = AES.new(key,IV=key)
-    encrypted_data = base64.b16encode(cipher.encrypt(pad(dump)))
+    cipher = AES.new(key,IV=key[:16])
+    encrypted_data = base64.urlsafe_b64encode(cipher.encrypt(pad(dump)))
     signature = hmac.new(hash_key,encrypted_data).hexdigest()
     return signature+':'+encrypted_data
 
-def secure_loads(data,encryption_key,hash_key=None):
+def secure_loads(data,encryption_key,hash_key=None, compression_level=None):
     if not ':' in data:
         return None
     if not hash_key:
@@ -125,10 +128,12 @@ def secure_loads(data,encryption_key,hash_key=None):
     if signature!=actual_signature:
         return None
     key = pad(encryption_key[:32])
-    cipher = AES.new(key,IV=key)
+    cipher = AES.new(key,IV=key[:16])
     try:
-        data = cipher.decrypt(base64.b16decode(encrypted_data))
+        data = cipher.decrypt(base64.urlsafe_b64decode(encrypted_data))
         data = data.rstrip(' ')
+        if compression_level:
+            data = zlib.decompress(data)
         return cPickle.loads(data)
     except (TypeError,cPickle.UnpicklingError):
         return None

From 1ea379180a755ed556d5e5f12fa82d75518cf557 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 17 Oct 2012 14:30:02 -0500
Subject: [PATCH 29/49] fixed appadmin bug and excessive session saving

---
 VERSION                                       | 2 +-
 applications/admin/controllers/appadmin.py    | 3 ++-
 applications/examples/controllers/appadmin.py | 3 ++-
 applications/welcome/controllers/appadmin.py  | 3 ++-
 gluon/globals.py                              | 7 +++++--
 gluon/storage.py                              | 1 -
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index bd8fb753..98b824e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-17 12:04:15) dev
+Version 2.1.1 (2012-10-17 14:29:55) dev
diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py
index c25fed29..bc8ae060 100644
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -200,13 +200,14 @@ def select():
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
                 _action=URL(r=request,args=request.args))
+
+    tb = None
     if form.accepts(request.vars, formname=None):
         regex = re.compile(request.args[0] + '\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
         try:
-            tb = None
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py
index c25fed29..bc8ae060 100644
--- a/applications/examples/controllers/appadmin.py
+++ b/applications/examples/controllers/appadmin.py
@@ -200,13 +200,14 @@ def select():
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
                 _action=URL(r=request,args=request.args))
+
+    tb = None
     if form.accepts(request.vars, formname=None):
         regex = re.compile(request.args[0] + '\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
         try:
-            tb = None
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py
index c25fed29..bc8ae060 100644
--- a/applications/welcome/controllers/appadmin.py
+++ b/applications/welcome/controllers/appadmin.py
@@ -200,13 +200,14 @@ def select():
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
                 _action=URL(r=request,args=request.args))
+
+    tb = None
     if form.accepts(request.vars, formname=None):
         regex = re.compile(request.args[0] + '\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
         try:
-            tb = None
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
diff --git a/gluon/globals.py b/gluon/globals.py
index d601b65e..7092f330 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -111,8 +111,10 @@ class Request(Storage):
     def user_agent(self):
         from gluon.contrib import user_agent_parser
         session = current.session
-        user_agent = session._user_agent = session._user_agent or \
+        user_agent = session._user_agent or \
             user_agent_parser.detect(self.env.http_user_agent)
+        if session:
+            session._user_agent = user_agent
         user_agent = Storage(user_agent)
         for key,value in user_agent.items():
             if isinstance(value,dict):
@@ -666,7 +668,8 @@ class Session(Storage):
 
     def _unchanged(self):
         previous_session_hash = self.pop('_session_hash',None)
-        if not previous_session_hash and not self:
+        if not previous_session_hash and not \
+                any(value is not None for value in self.itervalues()):
             return True
         session_pickled = cPickle.dumps(dict(self))
         session_hash = hashlib.md5(session_pickled).hexdigest()
diff --git a/gluon/storage.py b/gluon/storage.py
index 4a1900d5..92851139 100644
--- a/gluon/storage.py
+++ b/gluon/storage.py
@@ -48,7 +48,6 @@ class Storage(dict):
     __getstate__ = lambda self: None
     __copy__ = lambda self: Storage(self)
     
-    
     def getlist(self,key):
         """
         Return a Storage value as a list.

From 5af380223a14cadcbf261fe63f2fde90802c6b0d Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 17 Oct 2012 14:33:52 -0500
Subject: [PATCH 30/49] remove excessive session saving with caching of
 mobile_agent

---
 VERSION        | 2 +-
 gluon/tools.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 98b824e6..d5b27e90 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-17 14:29:55) dev
+Version 2.1.1 (2012-10-17 14:33:49) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 80a1924b..917d5257 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1080,7 +1080,7 @@ class Auth(object):
                 auth.last_visit = request.now
         else:
             self.user = None
-            session.auth = None
+            if session.auth: del session.auth
         # ## what happens after login?
 
         self.next = current.request.vars._next

From 39c94b8dcf0e555a988b80bf58f7d3bbd3e067b7 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 17 Oct 2012 16:01:29 -0500
Subject: [PATCH 31/49] faster scheduler, thanks Niphlod

---
 VERSION            |  2 +-
 gluon/scheduler.py | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/VERSION b/VERSION
index d5b27e90..01586272 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-17 14:33:49) dev
+Version 2.1.1 (2012-10-17 16:01:25) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 41fa79c1..0c21aac0 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -404,7 +404,7 @@ class TYPE(object):
 
 class Scheduler(MetaScheduler):
     def __init__(self,db,tasks=None,migrate=True,
-                 worker_name=None,group_names=None,heartbeat=HEARTBEAT,
+                 worker_name=None,group_names=['main'],heartbeat=HEARTBEAT,
                  max_empty_runs=0, discard_results=False, utc_time=False):
 
         MetaScheduler.__init__(self)
@@ -429,15 +429,21 @@ class Scheduler(MetaScheduler):
         current._scheduler = self
 
         self.define_tables(db,migrate=migrate)
-
+        
     def now(self):
         return self.utc_time and datetime.datetime.utcnow() or datetime.datetime.now()
 
-    def define_tables(self,db,migrate):
+    def set_requirements(self, scheduler_task):
         from gluon import current
+        if hasattr(current,'request'):
+            scheduler_task.application_name.default= '%s/%s' % (
+            current.request.application, current.request.controller
+            )
+    
+    def define_tables(self,db,migrate):
         from gluon.dal import DEFAULT
         logging.debug('defining tables (migrate=%s)' % migrate)
-        now = self.now()
+        now = self.now
         db.define_table(
             'scheduler_task',
             Field('application_name',requires=IS_NOT_EMPTY(),
@@ -473,11 +479,9 @@ class Scheduler(MetaScheduler):
             Field('times_failed','integer',default=0,writable=False),
             Field('last_run_time','datetime',writable=False,readable=False),
             Field('assigned_worker_name',default='',writable=False),
+            on_define=self.set_requirements,
             migrate=migrate,format='%(task_name)s')
-        if hasattr(current,'request'):
-            db.scheduler_task.application_name.default= '%s/%s' % (
-                current.request.application, current.request.controller
-            )
+        
 
         db.define_table(
             'scheduler_run',
@@ -500,7 +504,8 @@ class Scheduler(MetaScheduler):
             Field('is_ticker', 'boolean', default=False, writable=False),
             Field('group_names', 'list:string', default=self.group_names),
             migrate=migrate)
-        db.commit()
+        if migrate:
+            db.commit()
 
     def loop(self,worker_name=None):
         signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))

From 72739ebb970f79b998ea38e23943e1ad137f1584 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 17 Oct 2012 17:00:50 -0500
Subject: [PATCH 32/49] better openshift error

---
 VERSION                                     | 2 +-
 applications/admin/controllers/openshift.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 01586272..d84f8406 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-17 16:01:25) dev
+Version 2.1.1 (2012-10-17 17:00:46) dev
diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py
index 88945f74..479923d9 100644
--- a/applications/admin/controllers/openshift.py
+++ b/applications/admin/controllers/openshift.py
@@ -1,5 +1,9 @@
 import os
-from distutils import dir_util
+try:
+    from distutils import dir_util
+except ImportError:
+    session.flash = T('requires distutils, but not installed')
+    redirect(URL('default','site'))
 try:
     from git import *
 except ImportError:

From c3c5df6394eab45e0d1c4d2452431c254ec9e06f Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 18 Oct 2012 13:02:19 -0500
Subject: [PATCH 33/49] scheduler.queue_task(...), thanks Niphlod

---
 VERSION            |   2 +-
 gluon/scheduler.py | 138 ++++++++++++++++++++++++++++++---------------
 2 files changed, 95 insertions(+), 45 deletions(-)

diff --git a/VERSION b/VERSION
index d84f8406..8ce028c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-17 17:00:46) dev
+Version 2.1.1 (2012-10-18 13:02:13) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 0c21aac0..6a9d3ce5 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -87,6 +87,7 @@ try:
 except:
     from simplejson import loads, dumps
 
+logger = logging.getLogger('web2py.scheduler')
 
 from gluon import DAL, Field, IS_NOT_EMPTY, IS_IN_SET, IS_NOT_IN_DB, IS_INT_IN_RANGE, IS_DATETIME
 from gluon.utils import web2py_uuid
@@ -115,7 +116,7 @@ CALLABLETYPES = (types.LambdaType, types.FunctionType,
 
 class Task(object):
     def __init__(self,app,function,timeout,args='[]',vars='{}',**kwargs):
-        logging.debug(' new task allocated: %s.%s' % (app,function))
+        logger.debug(' new task allocated: %s.%s' % (app,function))
         self.app = app
         self.function = function
         self.timeout = timeout
@@ -127,11 +128,11 @@ class Task(object):
 
 class TaskReport(object):
     def __init__(self,status,result=None,output=None,tb=None):
-        logging.debug('    new task report: %s' % status)
+        logger.debug('    new task report: %s' % status)
         if tb:
-            logging.debug('   traceback: %s' % tb)
+            logger.debug('   traceback: %s' % tb)
         else:
-            logging.debug('   result: %s' % result)
+            logger.debug('   result: %s' % result)
         self.status = status
         self.result = result
         self.output = output
@@ -173,7 +174,7 @@ def _decode_dict(dct):
 
 def executor(queue,task, out):
     """ the background process """
-    logging.debug('    task started')
+    logger.debug('    task started')
 
     class LogOutput(object):
         """Facility to log output at intervals"""
@@ -248,7 +249,7 @@ class MetaScheduler(threading.Thread):
         queue = multiprocessing.Queue(maxsize=1)
         p = multiprocessing.Process(target=executor,args=(queue,task,out))
         self.process = p
-        logging.debug('   task starting')
+        logger.debug('   task starting')
         p.start()
 
         task_output = ""
@@ -266,7 +267,7 @@ class MetaScheduler(threading.Thread):
                 not task.timeout or time.time()-start < task.timeout):
                 if tout:
                     try:
-                        logging.debug(' partial output saved')
+                        logger.debug(' partial output saved')
                         db(sr.id==task.run_id).update(output = task_output)
                         db.commit()
                     except:
@@ -276,7 +277,7 @@ class MetaScheduler(threading.Thread):
                 while not out.empty():
                     tout += out.get()
                 if tout:
-                    logging.debug(' partial output: "%s"' % str(tout))
+                    logger.debug(' partial output: "%s"' % str(tout))
                     if CLEAROUT in tout:
                         task_output = tout[tout.rfind(CLEAROUT)+len(CLEAROUT):]
                     else:
@@ -285,12 +286,12 @@ class MetaScheduler(threading.Thread):
             p.terminate()
             p.join()
             self.have_heartbeat = False
-            logging.debug('    task stopped by general exception')
+            logger.debug('    task stopped by general exception')
             tr = TaskReport(STOPPED)
         else:
             if p.is_alive():
                 p.terminate()
-                logging.debug('    task timeout')
+                logger.debug('    task timeout')
                 try:
                     # we try to get a traceback here
                     tr = queue.get(timeout=2)
@@ -300,21 +301,21 @@ class MetaScheduler(threading.Thread):
                     tr = TaskReport(TIMEOUT)
             elif queue.empty():
                 self.have_heartbeat = False
-                logging.debug('    task stopped')
+                logger.debug('    task stopped')
                 tr = TaskReport(STOPPED)
             else:
-                logging.debug('  task completed or failed')
+                logger.debug('  task completed or failed')
                 tr = queue.get()
         tr.output = task_output
         return tr
 
     def die(self):
-        logging.info('die!')
+        logger.info('die!')
         self.have_heartbeat = False
         self.terminate_process()
 
     def give_up(self):
-        logging.info('Giving up as soon as possible!')
+        logger.info('Giving up as soon as possible!')
         self.have_heartbeat = False
 
     def terminate_process(self):
@@ -356,18 +357,18 @@ class MetaScheduler(threading.Thread):
         try:
             self.start_heartbeats()
             while True and self.have_heartbeat:
-                logging.debug('looping...')
+                logger.debug('looping...')
                 task = self.pop_task()
                 if task:
                     self.empty_runs = 0
                     self.report_task(task,self.async(task))
                 else:
                     self.empty_runs += 1
-                    logging.debug('sleeping...')
+                    logger.debug('sleeping...')
                     if self.max_empty_runs != 0:
-                        logging.debug('empty runs %s/%s', self.empty_runs, self.max_empty_runs)
+                        logger.debug('empty runs %s/%s', self.empty_runs, self.max_empty_runs)
                         if self.empty_runs >= self.max_empty_runs:
-                            logging.info('empty runs limit reached, killing myself')
+                            logger.info('empty runs limit reached, killing myself')
                             self.die()
                     self.sleep()
         except KeyboardInterrupt:
@@ -412,7 +413,7 @@ class Scheduler(MetaScheduler):
         self.db = db
         self.db_thread = None
         self.tasks = tasks
-        self.group_names = group_names or ['main']
+        self.group_names = group_names
         self.heartbeat = heartbeat
         self.worker_name = worker_name or socket.gethostname()+'#'+str(os.getpid())
         self.worker_status = RUNNING, 1 #tuple containing status as recorded in
@@ -442,7 +443,7 @@ class Scheduler(MetaScheduler):
     
     def define_tables(self,db,migrate):
         from gluon.dal import DEFAULT
-        logging.debug('defining tables (migrate=%s)' % migrate)
+        logger.debug('defining tables (migrate=%s)' % migrate)
         now = self.now
         db.define_table(
             'scheduler_task',
@@ -513,25 +514,25 @@ class Scheduler(MetaScheduler):
             self.start_heartbeats()
             while True and self.have_heartbeat:
                 if self.worker_status[0] == DISABLED:
-                    logging.debug('Someone stopped me, sleeping until better times come (%s)' % self.worker_status[1])
+                    logger.debug('Someone stopped me, sleeping until better times come (%s)' % self.worker_status[1])
                     self.sleep()
                     continue
-                logging.debug('looping...')
+                logger.debug('looping...')
                 task = self.pop_task()
                 if task:
                     self.empty_runs = 0
                     self.report_task(task,self.async(task))
                 else:
                     self.empty_runs += 1
-                    logging.debug('sleeping...')
+                    logger.debug('sleeping...')
                     if self.max_empty_runs != 0:
-                        logging.debug('empty runs %s/%s', self.empty_runs, self.max_empty_runs)
+                        logger.debug('empty runs %s/%s', self.empty_runs, self.max_empty_runs)
                         if self.empty_runs >= self.max_empty_runs:
-                            logging.info('empty runs limit reached, killing myself')
+                            logger.info('empty runs limit reached, killing myself')
                             self.die()
                     self.sleep()
         except (KeyboardInterrupt, SystemExit):
-            logging.info('catched')
+            logger.info('catched')
             self.die()
 
     def pop_task(self):
@@ -548,7 +549,7 @@ class Scheduler(MetaScheduler):
                     break
                 except:
                     db.rollback()
-                    logging.error('TICKER: error assigning tasks')
+                    logger.error('TICKER: error assigning tasks')
             return None
         db.commit()
         grabbed = db(ts.assigned_worker_name==self.worker_name)\
@@ -559,9 +560,9 @@ class Scheduler(MetaScheduler):
             task.update_record(status=RUNNING,last_run_time=now)
             #noone will touch my task!
             db.commit()
-            logging.debug('   work to do %s' % task.id)
+            logger.debug('   work to do %s' % task.id)
         else:
-            logging.debug('nothing to do')
+            logger.debug('nothing to do')
             return None
         next_run_time = task.last_run_time + datetime.timedelta(seconds=task.period)
         times_run = task.times_run + 1
@@ -571,7 +572,7 @@ class Scheduler(MetaScheduler):
             run_again = False
         run_id = 0
         while True and not self.discard_results:
-            logging.debug('    new scheduler_run record')
+            logger.debug('    new scheduler_run record')
             try:
                 run_id = db.scheduler_run.insert(
                     scheduler_task = task.id,
@@ -582,7 +583,7 @@ class Scheduler(MetaScheduler):
                 break
             except:
                 db.rollback()
-        logging.info('new task %(id)s "%(task_name)s" %(application_name)s.%(function_name)s' % task)
+        logger.info('new task %(id)s "%(task_name)s" %(application_name)s.%(function_name)s' % task)
         return Task(
             app = task.application_name,
             function = task.function_name,
@@ -609,7 +610,7 @@ class Scheduler(MetaScheduler):
                         #result is 'null' as a string if task completed
                         #if it's stopped it's None as NoneType, so we record
                         #the STOPPED "run" anyway
-                        logging.debug(' recording task report in db (%s)' % task_report.status)
+                        logger.debug(' recording task report in db (%s)' % task_report.status)
                         db(db.scheduler_run.id==task.run_id).update(
                             status = task_report.status,
                             stop_time = now,
@@ -617,7 +618,7 @@ class Scheduler(MetaScheduler):
                             output = task_report.output,
                             traceback = task_report.tb)
                     else:
-                        logging.debug(' deleting task report in db because of no result')
+                        logger.debug(' deleting task report in db because of no result')
                         db(db.scheduler_run.id==task.run_id).delete()
                 is_expired = (task.stop_time
                               and task.next_run_time > task.stop_time
@@ -647,7 +648,7 @@ class Scheduler(MetaScheduler):
                             next_run_time = task.next_run_time,
                             status=status)
                 db.commit()
-                logging.info('task completed (%s)' % task_report.status)
+                logger.info('task completed (%s)' % task_report.status)
                 break
             except:
                 db.rollback()
@@ -659,7 +660,7 @@ class Scheduler(MetaScheduler):
 
     def send_heartbeat(self,counter):
         if not self.db_thread:
-            logging.debug('thread building own DAL object')
+            logger.debug('thread building own DAL object')
             self.db_thread = DAL(self.db._uri,folder = self.db._adapter.folder)
             self.define_tables(self.db_thread,migrate=False)
         try:
@@ -679,13 +680,13 @@ class Scheduler(MetaScheduler):
                 if mybackedstatus.status == DISABLED:
                     self.worker_status = DISABLED, self.worker_status[1]#keep sleeping
                     if self.worker_status[1] == MAXHIBERNATION:
-                        logging.debug('........recording heartbeat')
+                        logger.debug('........recording heartbeat')
                         db(sw.worker_name==self.worker_name).update(
                             last_heartbeat = now)
 
                 elif mybackedstatus.status == TERMINATE:
                     self.worker_status = TERMINATE, self.worker_status[1]
-                    logging.debug("Waiting to terminate the current task")
+                    logger.debug("Waiting to terminate the current task")
                     self.give_up()
                     return
                 elif mybackedstatus.status == KILL:
@@ -693,7 +694,7 @@ class Scheduler(MetaScheduler):
                     self.die()
 
                 else:
-                    logging.debug('........recording heartbeat')
+                    logger.debug('........recording heartbeat')
                     db(sw.worker_name==self.worker_name).update(
                         last_heartbeat = now, status = ACTIVE)
                     self.worker_status = ACTIVE, 1  #re-activating the process
@@ -702,7 +703,7 @@ class Scheduler(MetaScheduler):
             if counter % 5 == 0:
                 try:
                     # delete inactive workers
-                    logging.debug('    freeing workers that have not sent heartbeat')
+                    logger.debug('    freeing workers that have not sent heartbeat')
                     inactive_workers = db(
                         ((sw.last_heartbeat<expiration) & (sw.status == ACTIVE)) |
                         ((sw.last_heartbeat<departure) & (sw.status != ACTIVE))
@@ -730,11 +731,11 @@ class Scheduler(MetaScheduler):
         if not ticker:
             db(sw.worker_name == self.worker_name).update(is_ticker = True)
             db(sw.worker_name != self.worker_name).update(is_ticker = False)
-            logging.info("TICKER: I'm a ticker (%s)" % self.worker_name)
+            logger.info("TICKER: I'm a ticker (%s)" % self.worker_name)
             db.commit()
             return True
         else:
-            logging.info("%s is a ticker, I'm a poor worker" % ticker.worker_name)
+            logger.info("%s is a ticker, I'm a poor worker" % ticker.worker_name)
             return False
 
     def assign_tasks(self):
@@ -798,12 +799,61 @@ class Scheduler(MetaScheduler):
         #I didn't report tasks but I'm working nonetheless!!!!
         if len(tasks) > 0:
             self.empty_runs = 0
-        logging.info('TICKER: workers are %s' % len(all_workers))
-        logging.info('TICKER: tasks are %s' % len(tasks))
+        logger.info('TICKER: workers are %s' % len(all_workers))
+        logger.info('TICKER: tasks are %s' % len(tasks))
 
     def sleep(self):
         time.sleep(self.heartbeat*self.worker_status[1]) # should only sleep until next available task
 
+    def queue_task(self, function, args=[], vars={}, **kwargs):
+        if hasattr(function, '__name__'):
+            function = function.__name__
+        targs = 'args' in kwargs and kwargs.pop('args') or dumps(args)
+        tvars = 'vars' in kwargs and kwargs.pop('vars') or dumps(vars)
+        tuuid = 'uuid' in kwargs and kwargs.pop('uuid') or web2py_uuid()
+        tname = 'task_name' in kwargs and kwargs.pop('task_name') or function
+        rtn = self.db.scheduler_task.validate_and_insert(
+             function_name=function,
+             task_name=tname,
+             args=targs,
+             vars=tvars,
+             uuid=tuuid,
+             **kwargs)
+        if not rtn.errors:
+            rtn.uuid = tuuid
+        else:
+            rtn.uuid = None
+        return rtn
+
+    def task_status(self, ref, output=False):
+        from gluon.dal import Query
+        sr, st = self.db.scheduler_run, self.db.scheduler_task
+        if isinstance(ref, int):
+            q = st.id == ref
+        elif isinstance(ref, str):
+            q = st.uuid == ref
+        elif isinstance(ref, Query):
+            q = ref
+        else:
+            raise SyntaxError, "You can retrieve results only by id, uuid or Query"
+        fields = st.ALL
+        left = False
+        orderby = ~st.id
+        if output:
+            fields = st.ALL, sr.ALL
+            left = sr.on(sr.scheduler_task == st.id)
+            orderby = ~st.id|~sr.id
+        row = self.db(q).select(
+            *fields,
+            orderby=orderby,
+            left=left,
+            limitby=(0,1)
+            ).first()
+        if output:
+            row.result = row.scheduler_run.result and \
+                loads(row.scheduler_run.result, object_hook=_decode_dict) or None
+        return row
+
 def main():
     """
     allows to run worker without python web2py.py .... by simply python this.py
@@ -860,7 +910,7 @@ def main():
         tasks = {}
     group_names = [x.strip() for x in options.group_names.split(',')]
 
-    logging.getLogger().setLevel(options.logger_level)
+    logger.getLogger().setLevel(options.logger_level)
 
     print 'groups for this worker: '+', '.join(group_names)
     print 'connecting to database in folder: ' + options.db_folder or './'

From e707cfc67c701197c47f5f2b2e05c801c36c6313 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 18 Oct 2012 13:42:49 -0500
Subject: [PATCH 34/49] codemirror autoresize

---
 VERSION                                    | 2 +-
 applications/admin/views/default/edit.html | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 8ce028c9..0d8e203a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-18 13:02:13) dev
+Version 2.1.1 (2012-10-18 13:42:45) dev
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index 6555ab50..c8b1a93f 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -134,7 +134,7 @@ jQuery(document).ready(function(){
     <textarea style="width: auto; height:400px;direction:ltr;" rows="58" cols="100" -amy-enabled="true" id="body" name="data">{{=data}}</textarea>
     <script>window.eamy = eamy;</script>
     {{elif TEXT_EDITOR == 'codemirror':}}
-    <textarea style="width: auto; height:400px;direction:ltr;" id="body" name="data">{{=data}}</textarea>
+    <textarea style="width: auto; height:auto; direction:ltr;" id="body" name="data">{{=data}}</textarea>
     <script>
       function isFullScreen(instance) {
           return /\bCodeMirror-fullscreen\b/.test(instance.getWrapperElement().className);
@@ -197,6 +197,7 @@ jQuery(document).ready(function(){
          document.getElementById("body"),cm_opts);
       var hlLine = editor.setLineClass(0, "activeline");
       window.mirror = editor;
+      jQuery(function(){jQuery('.CodeMirror-scroll').css("height","auto").css("overflow-x","auto");});
     </script>
     {{elif TEXT_EDITOR == 'ace':}}
     <div id="editor" style="height: 500px; width: auto; position: relative">{{=data}}</div>

From de2337dfe3e6587e5f31b7082961b9fa117c2cd5 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 18 Oct 2012 18:20:51 -0500
Subject: [PATCH 35/49] scheduler.queue_task, thank Niphlod

---
 VERSION            |  2 +-
 gluon/dal.py       |  2 +-
 gluon/scheduler.py | 41 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 0d8e203a..53625f35 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-18 13:42:45) dev
+Version 2.1.1 (2012-10-18 18:20:45) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index 087be33b..05d054ae 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -7815,7 +7815,7 @@ class Table(object):
         for key,value in fields.iteritems():
             value,error = self[key].validate(value)
             if error:
-                response.errors[key] = error
+                response.errors[key] = "%s" % error
             else:
                 new_fields[key] = value
         if not response.errors:
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 6a9d3ce5..00bc2650 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -386,7 +386,7 @@ class TYPE(object):
 
     def __init__(self,myclass=list,parse=False):
         self.myclass = myclass
-        self.parse=parse
+        self.parse = parse
 
     def __call__(self,value):
         from gluon import current
@@ -805,13 +805,29 @@ class Scheduler(MetaScheduler):
     def sleep(self):
         time.sleep(self.heartbeat*self.worker_status[1]) # should only sleep until next available task
 
-    def queue_task(self, function, args=[], vars={}, **kwargs):
+    def queue_task(self, function, pargs=[], pvars={}, **kwargs):
+        """
+        Queue tasks. This takes care of handling the validation of all
+        values.
+        :param function: the function (anything callable with a __name__)
+        :param pargs: "raw" args to be passed to the function. Automatically
+            jsonified.
+        :param pvars: "raw" kwargs to be passed to the function. Automatically
+            jsonified
+        :param kwargs: all the scheduler_task columns. args and vars here should be
+            in json format already, they will override pargs and pvars
+
+        returns a dict just as a normal validate_and_insert, plus a uuid key holding
+        the uuid of the queued task. If validation is not passed, both id and uuid
+        will be None, and you'll get an "error" dict holding the errors found.
+        """
         if hasattr(function, '__name__'):
             function = function.__name__
-        targs = 'args' in kwargs and kwargs.pop('args') or dumps(args)
-        tvars = 'vars' in kwargs and kwargs.pop('vars') or dumps(vars)
+        targs = 'args' in kwargs and kwargs.pop('args') or dumps(pargs)
+        tvars = 'vars' in kwargs and kwargs.pop('vars') or dumps(pvars)
         tuuid = 'uuid' in kwargs and kwargs.pop('uuid') or web2py_uuid()
         tname = 'task_name' in kwargs and kwargs.pop('task_name') or function
+        print 'a', targs
         rtn = self.db.scheduler_task.validate_and_insert(
              function_name=function,
              task_name=tname,
@@ -826,6 +842,21 @@ class Scheduler(MetaScheduler):
         return rtn
 
     def task_status(self, ref, output=False):
+        """
+        Shortcut for task status retrieval
+
+        :param ref: can be
+            - integer --> lookup will be done by scheduler_task.id
+            - string  --> lookup will be done by scheduler_task.uuid
+            - query   --> lookup as you wish (as in db.scheduler_task.task_name == 'test1')
+        :param output: fetch also the scheduler_run record
+
+        Returns a single Row object, for the last queued task
+        If output == True, returns also the last scheduler_run record
+            scheduler_run record is fetched by a left join, so it can
+            have all fields == None
+        
+        """
         from gluon.dal import Query
         sr, st = self.db.scheduler_run, self.db.scheduler_task
         if isinstance(ref, int):
@@ -910,7 +941,7 @@ def main():
         tasks = {}
     group_names = [x.strip() for x in options.group_names.split(',')]
 
-    logger.getLogger().setLevel(options.logger_level)
+    logging.getLogger().setLevel(options.logger_level)
 
     print 'groups for this worker: '+', '.join(group_names)
     print 'connecting to database in folder: ' + options.db_folder or './'

From d552eb2eebc7e78bc602746df193e6c141b0991f Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 09:40:17 -0500
Subject: [PATCH 36/49] fixed some pep8 stuff

---
 VERSION                                       |  2 +-
 __init__.py                                   |  2 ++
 anyserver.py                                  |  1 +
 appengine_config.py                           |  1 +
 applications/admin/controllers/appadmin.py    |  1 +
 applications/admin/controllers/debug.py       | 31 ++++++++---------
 applications/admin/controllers/default.py     | 19 ++++++-----
 applications/admin/controllers/gae.py         |  1 +
 applications/admin/controllers/mercurial.py   |  1 +
 applications/admin/controllers/openshift.py   |  7 ++--
 .../admin/controllers/plugin_jqmobile.py      |  1 +
 applications/admin/controllers/shell.py       |  1 +
 applications/admin/controllers/toolbar.py     |  1 +
 applications/admin/controllers/webservices.py |  3 +-
 applications/admin/controllers/wizard.py      |  1 +
 applications/admin/models/0.py                |  5 +--
 applications/admin/models/0_imports.py        |  1 +
 applications/admin/models/access.py           |  3 +-
 applications/admin/models/buttons.py          |  1 +
 applications/admin/models/db.py               |  1 +
 applications/admin/models/menu.py             |  3 +-
 .../admin/models/plugin_multiselect.py        |  1 +
 .../examples/controllers/ajax_examples.py     |  1 +
 applications/examples/controllers/appadmin.py |  1 +
 .../examples/controllers/cache_examples.py    |  1 +
 applications/examples/controllers/default.py  |  1 +
 .../examples/controllers/form_examples.py     |  1 +
 applications/examples/controllers/global.py   |  1 +
 .../examples/controllers/layout_examples.py   |  1 +
 .../examples/controllers/session_examples.py  |  1 +
 .../examples/controllers/simple_examples.py   |  1 +
 .../examples/controllers/spreadsheet.py       |  1 +
 .../examples/controllers/template_examples.py |  1 +
 applications/examples/models/feeds_reader.py  |  1 +
 applications/examples/models/markmin.py       |  1 +
 applications/examples/models/menu.py          |  1 +
 applications/welcome/controllers/appadmin.py  |  1 +
 applications/welcome/controllers/default.py   |  1 +
 applications/welcome/models/db.py             |  3 +-
 applications/welcome/models/menu.py           |  3 +-
 cgihandler.py                                 |  1 +
 fcgihandler.py                                |  1 +
 gaehandler.py                                 |  1 +
 gluon/__init__.py                             |  1 +
 gluon/admin.py                                |  1 +
 gluon/cache.py                                | 11 ++++---
 gluon/cfs.py                                  |  1 +
 gluon/compileapp.py                           |  3 +-
 gluon/contenttype.py                          |  1 +
 gluon/contrib/AuthorizeNet.py                 |  1 +
 gluon/contrib/DowCommerce.py                  |  1 +
 gluon/contrib/__init__.py                     |  1 +
 gluon/contrib/aes.py                          |  1 +
 gluon/contrib/autolinks.py                    |  1 +
 gluon/contrib/feedparser.py                   |  1 +
 gluon/contrib/gae_memcache.py                 |  5 +--
 gluon/contrib/gae_retry.py                    |  1 +
 gluon/contrib/generics.py                     |  1 +
 gluon/contrib/google_wallet.py                |  1 +
 gluon/contrib/gql.py                          |  1 +
 gluon/contrib/imageutils.py                   |  1 +
 gluon/contrib/memdb.py                        |  1 +
 gluon/contrib/pam.py                          |  1 +
 gluon/contrib/pbkdf2.py                       |  1 +
 gluon/contrib/populate.py                     |  1 +
 gluon/contrib/pyfpdf.py                       |  1 +
 gluon/contrib/qdb.py                          |  1 +
 gluon/contrib/redis_cache.py                  |  1 +
 gluon/contrib/redis_session.py                | 10 +++---
 gluon/contrib/rss2.py                         |  1 +
 gluon/contrib/shell.py                        |  1 +
 gluon/contrib/simplejsonrpc.py                |  1 +
 gluon/contrib/sms_utils.py                    |  1 +
 gluon/contrib/spreadsheet.py                  |  1 +
 gluon/contrib/stripe.py                       |  1 +
 gluon/contrib/taskbar_widget.py               |  1 +
 gluon/contrib/timecollect.py                  |  1 +
 gluon/contrib/user_agent_parser.py            |  1 +
 gluon/contrib/webclient.py                    |  5 +--
 gluon/contrib/websocket_messaging.py          |  1 +
 gluon/custom_import.py                        |  1 +
 gluon/dal.py                                  | 17 +++++-----
 gluon/debug.py                                |  1 +
 gluon/decoder.py                              |  1 +
 gluon/fileutils.py                            |  1 +
 gluon/globals.py                              | 25 +++++++-------
 gluon/highlight.py                            |  1 +
 gluon/html.py                                 |  3 +-
 gluon/http.py                                 |  1 +
 gluon/import_all.py                           |  1 +
 gluon/languages.py                            | 33 ++++++++++---------
 gluon/main.py                                 | 13 ++++----
 gluon/messageboxhandler.py                    |  1 +
 gluon/myregex.py                              |  1 +
 gluon/newcron.py                              |  3 +-
 gluon/portalocker.py                          |  5 +--
 gluon/reserved_sql_keywords.py                |  1 +
 gluon/restricted.py                           |  3 +-
 gluon/rewrite.py                              | 13 ++++----
 gluon/rocket.py                               |  1 +
 gluon/sanitizer.py                            |  1 +
 gluon/scheduler.py                            |  9 ++---
 gluon/serializers.py                          |  1 +
 gluon/settings.py                             |  1 +
 gluon/shell.py                                |  1 +
 gluon/sql.py                                  |  1 +
 gluon/sqlhtml.py                              | 19 ++++++-----
 gluon/storage.py                              |  5 +--
 gluon/streamer.py                             |  1 +
 gluon/template.py                             |  5 +--
 gluon/tools.py                                | 27 +++++++--------
 gluon/utf8.py                                 |  1 +
 gluon/utils.py                                |  7 ++--
 gluon/validators.py                           |  3 +-
 gluon/widget.py                               |  1 +
 gluon/winservice.py                           |  1 +
 gluon/xmlrpc.py                               |  1 +
 isapiwsgihandler.py                           |  1 +
 modpythonhandler.py                           |  1 +
 options_std.py                                |  1 +
 router.example.py                             |  1 +
 routes.example.py                             |  7 ++--
 scgihandler.py                                |  1 +
 setup.py                                      |  1 +
 setup_app.py                                  |  1 +
 setup_exe.py                                  |  1 +
 web2py.py                                     |  1 +
 wsgihandler.py                                |  1 +
 128 files changed, 267 insertions(+), 140 deletions(-)

diff --git a/VERSION b/VERSION
index 53625f35..7a32a07d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-18 18:20:45) dev
+Version 2.1.1 (2012-10-19 09:40:10) dev
diff --git a/__init__.py b/__init__.py
index 584ba879..1901ba93 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,3 +8,5 @@
 
 
 
+
+
diff --git a/anyserver.py b/anyserver.py
index 53985442..0cae0c2f 100644
--- a/anyserver.py
+++ b/anyserver.py
@@ -310,3 +310,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/appengine_config.py b/appengine_config.py
index 4bb11668..a736220c 100644
--- a/appengine_config.py
+++ b/appengine_config.py
@@ -7,3 +7,4 @@ def webapp_add_wsgi_middleware(app):
 
 
 
+
diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py
index bc8ae060..f00eba91 100644
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -444,3 +444,4 @@ def ccache():
 
 
 
+
diff --git a/applications/admin/controllers/debug.py b/applications/admin/controllers/debug.py
index 6cf1b40d..c18faf5c 100644
--- a/applications/admin/controllers/debug.py
+++ b/applications/admin/controllers/debug.py
@@ -51,7 +51,7 @@ def interact():
     lineno = web_debugger.lineno
     if filename:
         lines = dict([(i+1, l) for (i, l) in enumerate(
-                            [l.strip("\n").strip("\r") for l 
+                            [l.strip("\n").strip("\r") for l
                                 in open(filename).readlines()])])
         filename = os.path.basename(filename)
     else:
@@ -76,9 +76,9 @@ def interact():
         response.flash = T('"User Exception" debug mode. '
                            'An error ticket could be issued!')
 
-    return dict(app=app, data="", 
-                filename=web_debugger.filename, lines=lines, lineno=lineno, 
-                f_globals=f_globals, f_locals=f_locals, 
+    return dict(app=app, data="",
+                filename=web_debugger.filename, lines=lines, lineno=lineno,
+                f_globals=f_globals, f_locals=f_locals,
                 exception=web_debugger.exception_info)
 
 def step():
@@ -120,8 +120,8 @@ def breakpoints():
 
     # Get all .py files
     files = listdir(apath('', r=request), '.*\.py$')
-    files = [filename for filename in files 
-             if filename and 'languages' not in filename 
+    files = [filename for filename in files
+             if filename and 'languages' not in filename
                 and not filename.startswith("admin")
                 and not filename.startswith("examples")]
 
@@ -129,16 +129,16 @@ def breakpoints():
         Field('filename', requires=IS_IN_SET(files), label=T("Filename")),
         Field('lineno', 'integer', label=T("Line number"),
               requires=IS_NOT_EMPTY()),
-        Field('temporary', 'boolean', label=T("Temporary"), 
+        Field('temporary', 'boolean', label=T("Temporary"),
               comment=T("deleted after first hit")),
         Field('condition', 'string', label=T("Condition"),
               comment=T("honored only if the expression evaluates to true")),
         )
 
     if form.accepts(request.vars, session):
-        filename = os.path.join(request.env['applications_parent'], 
+        filename = os.path.join(request.env['applications_parent'],
                                 'applications', form.vars.filename)
-        err = qdb_debugger.do_set_breakpoint(filename, 
+        err = qdb_debugger.do_set_breakpoint(filename,
                                             form.vars.lineno,
                                             form.vars.temporary,
                                             form.vars.condition)
@@ -150,9 +150,9 @@ def breakpoints():
             qdb_debugger.do_clear(item[7:])
 
     breakpoints = [{'number': bp[0], 'filename': os.path.basename(bp[1]),
-                    'path': bp[1], 'lineno': bp[2], 
-                    'temporary': bp[3], 'enabled': bp[4], 'hits': bp[5], 
-                    'condition': bp[6]}  
+                    'path': bp[1], 'lineno': bp[2],
+                    'temporary': bp[3], 'enabled': bp[4], 'hits': bp[5],
+                    'condition': bp[6]}
                     for bp in qdb_debugger.do_list_breakpoint()]
 
     return dict(breakpoints=breakpoints, form=form)
@@ -160,11 +160,11 @@ def breakpoints():
 
 def toggle_breakpoint():
     "Set or clear a breakpoint"
-    
+
     lineno = None
     ok = None
     try:
-        filename = os.path.join(request.env['applications_parent'], 
+        filename = os.path.join(request.env['applications_parent'],
                                 'applications', request.vars.filename)
         if not request.vars.data:
             # ace send us the line number!
@@ -184,7 +184,7 @@ def toggle_breakpoint():
                 no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
                 if filename == bp_filename and lineno == bp_lineno:
                     err = qdb_debugger.do_clear_breakpoint(filename, lineno)
-                    response.flash = T("Removed Breakpoint on %s at line %s", ( 
+                    response.flash = T("Removed Breakpoint on %s at line %s", (
                                         filename, lineno))
                     ok = False
                     break
@@ -199,3 +199,4 @@ def toggle_breakpoint():
         session.flash = str(e)
     return response.json({'ok': ok, 'lineno': lineno})
 
+
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 7b3a0621..b6314641 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -213,7 +213,7 @@ def site():
         else:
             session.flash = \
                 DIV(T('unable to create application "%s"' % appname),
-                    PRE(error))                      
+                    PRE(error))
         redirect(URL(r=request))
 
     elif form_update.accepted:
@@ -241,18 +241,18 @@ def site():
                     DIV(T('Unable to download app because:'),PRE(str(e)))
                 redirect(URL(r=request))
             fname = form_update.vars.url
-            
+
         elif form_update.accepted and form_update.vars.file:
             fname = request.vars.file.filename
             f = request.vars.file.file
-            
+
         else:
             session.flash = 'No file uploaded and no URL specified'
             redirect(URL(r=request))
 
         if f:
             appname = cleanpath(form_update.vars.name)
-            installed = app_install(appname, f, 
+            installed = app_install(appname, f,
                                     request, fname,
                                     overwrite=form_update.vars.overwrite)
         if f and installed:
@@ -282,7 +282,7 @@ def site():
 
     apps = sorted(apps,lambda a,b:cmp(a.upper(),b.upper()))
 
-    return dict(app=None, apps=apps, myversion=myversion, 
+    return dict(app=None, apps=apps, myversion=myversion,
                 form_create=form_create, form_update=form_update)
 
 
@@ -340,7 +340,7 @@ def pack_plugin():
 
 def upgrade_web2py():
     dialog = FORM.confirm(T('Upgrade'),
-                         {T('Cancel'):URL('site')})    
+                         {T('Cancel'):URL('site')})
     if dialog.accepted:
         (success, error) = upgrade(request)
         if success:
@@ -355,7 +355,7 @@ def uninstall():
 
     dialog = FORM.confirm(T('Uninstall'),
                          {T('Cancel'):URL('site')})
-    
+
     if dialog.accepted:
         if MULTI_USER_MODE:
             if is_manager() and db(db.app.name==app).delete():
@@ -1227,7 +1227,7 @@ def create_file():
             if request.vars.plugin and not filename.startswith('plugin_%s/' % request.vars.plugin):
                 filename = 'plugin_%s/%s' % (request.vars.plugin, filename)
             text = ''
-            
+
         else:
             redirect(request.vars.sender+anchor)
 
@@ -1641,7 +1641,7 @@ def git_pull():
         session.flash = GIT_MISSING
         redirect(URL('site'))
     dialog = FORM.confirm(T('Pull'),
-                         {T('Cancel'):URL('site')})    
+                         {T('Cancel'):URL('site')})
     if dialog.accepted:
         try:
             repo = Repo(os.path.join(apath(r=request),app))
@@ -1698,3 +1698,4 @@ def git_push():
             redirect(URL('site'))
     return dict(app=app,form=form)
 
+
diff --git a/applications/admin/controllers/gae.py b/applications/admin/controllers/gae.py
index ee20442b..1caa283c 100644
--- a/applications/admin/controllers/gae.py
+++ b/applications/admin/controllers/gae.py
@@ -91,3 +91,4 @@ def callback():
     return (output+errors).replace('\n','<br/>')
 
 
+
diff --git a/applications/admin/controllers/mercurial.py b/applications/admin/controllers/mercurial.py
index 6c063097..4f35dd54 100644
--- a/applications/admin/controllers/mercurial.py
+++ b/applications/admin/controllers/mercurial.py
@@ -82,3 +82,4 @@ def revision():
         )
 
 
+
diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py
index 479923d9..f407e725 100644
--- a/applications/admin/controllers/openshift.py
+++ b/applications/admin/controllers/openshift.py
@@ -26,7 +26,7 @@ def deploy():
             kill()
         except:
             pass
-        
+
         ignore_apps = [item for item in apps if not item in form.vars.applications]
         regex = re.compile('\(applications/\(.*')
         w2p_origin = os.getcwd()
@@ -44,13 +44,13 @@ def deploy():
             #shutil.copytree(appsrc,appdest)
             index.add(['wsgi/'+osname+'/applications/'+i])
             new_commit = index.commit("Deploy from Web2py IDE")
-        
+
         origin = repo.remotes.origin
         origin.push
         origin.push()
         #Git code ends here
     return dict(form=form,command=cmd)
-        
+
 class EXISTS(object):
     def __init__(self, error_message='file not found'):
         self.error_message = error_message
@@ -58,3 +58,4 @@ class EXISTS(object):
         if os.path.exists(value):
             return (value,None)
         return (value,self.error_message)
+
diff --git a/applications/admin/controllers/plugin_jqmobile.py b/applications/admin/controllers/plugin_jqmobile.py
index bc72c15d..77eb14ee 100644
--- a/applications/admin/controllers/plugin_jqmobile.py
+++ b/applications/admin/controllers/plugin_jqmobile.py
@@ -8,3 +8,4 @@ def about():
     return locals()
 
 
+
diff --git a/applications/admin/controllers/shell.py b/applications/admin/controllers/shell.py
index 9ce45262..728c2000 100644
--- a/applications/admin/controllers/shell.py
+++ b/applications/admin/controllers/shell.py
@@ -45,3 +45,4 @@ def reset():
     return 'done'
 
 
+
diff --git a/applications/admin/controllers/toolbar.py b/applications/admin/controllers/toolbar.py
index 25e83a3e..dfe220b8 100644
--- a/applications/admin/controllers/toolbar.py
+++ b/applications/admin/controllers/toolbar.py
@@ -29,3 +29,4 @@ def profiler():
     return data
 
 
+
diff --git a/applications/admin/controllers/webservices.py b/applications/admin/controllers/webservices.py
index 4fcc4634..9eab0f2b 100644
--- a/applications/admin/controllers/webservices.py
+++ b/applications/admin/controllers/webservices.py
@@ -90,7 +90,7 @@ def attach_debugger(host='localhost', port=6000, authkey='secret password'):
 
     if isinstance(authkey, unicode):
         authkey = authkey.encode('utf8')
-   
+
     if not hasattr(gluon.debug, 'qdb_listener'):
         # create a remote debugger server and wait for connection
         address = (host, port)     # family is deduced to be 'AF_INET'
@@ -128,3 +128,4 @@ def call():
     session.forget()
     return service()
 
+
diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py
index ca60ecdd..841263c4 100644
--- a/applications/admin/controllers/wizard.py
+++ b/applications/admin/controllers/wizard.py
@@ -556,3 +556,4 @@ def call(): return service()
             os.unlink(file)
 
 
+
diff --git a/applications/admin/models/0.py b/applications/admin/models/0.py
index ec92f27a..1d7abe3e 100644
--- a/applications/admin/models/0.py
+++ b/applications/admin/models/0.py
@@ -13,9 +13,9 @@ TEXT_EDITOR = 'codemirror' or 'ace' or 'edit_area' or 'amy'
 
 ## Editor Color scheme (only for ace)
 TEXT_EDITOR_THEME = (
-    "chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn", 
+    "chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
     "dreamweaver", "eclipse", "idle_fingers", "kr_theme", "merbivore",
-    "merbivore_soft", "monokai", "mono_industrial", "pastel_on_dark", 
+    "merbivore_soft", "monokai", "mono_industrial", "pastel_on_dark",
     "solarized_dark", "solarized_light", "textmate", "tomorrow",
     "tomorrow_night", "tomorrow_night_blue", "tomorrow_night_bright",
     "tomorrow_night_eighties", "twilight", "vibrant_ink")[0]
@@ -80,3 +80,4 @@ if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage']
     T.force(request.cookies['adminLanguage'].value)
 
 
+
diff --git a/applications/admin/models/0_imports.py b/applications/admin/models/0_imports.py
index 0b3b4597..ecb8cbcd 100644
--- a/applications/admin/models/0_imports.py
+++ b/applications/admin/models/0_imports.py
@@ -30,3 +30,4 @@ from gluon.restricted import *
 from gluon.compileapp import compile_application, remove_compiled_application
 
 
+
diff --git a/applications/admin/models/access.py b/applications/admin/models/access.py
index a7066e4e..f2366669 100644
--- a/applications/admin/models/access.py
+++ b/applications/admin/models/access.py
@@ -147,7 +147,7 @@ if request.controller == "webservices":
         time.sleep(10)
         raise HTTP(403,"Not authorized")
 elif not session.authorized and not \
-    (request.controller+'/'+request.function in 
+    (request.controller+'/'+request.function in
      ('default/index','default/user','plugin_jqmobile/index','plugin_jqmobile/about')):
 
     if request.env.query_string:
@@ -169,3 +169,4 @@ if request.controller=='appadmin' and DEMO_MODE:
     session.flash = 'Appadmin disabled in demo mode'
     redirect(URL('default','sites'))
 
+
diff --git a/applications/admin/models/buttons.py b/applications/admin/models/buttons.py
index 594acd3e..e60e6c00 100644
--- a/applications/admin/models/buttons.py
+++ b/applications/admin/models/buttons.py
@@ -36,3 +36,4 @@ def searchbox(elementid):
     return TAG[''](LABEL(IMG(_id="search_start",_src=URL('static', 'images/search.png'), _alt=T('filter')), _class='icon', _for=elementid), ' ', INPUT(_id=elementid, _type='text', _size=12))
 
 
+
diff --git a/applications/admin/models/db.py b/applications/admin/models/db.py
index 4b98283a..11eb9c0a 100644
--- a/applications/admin/models/db.py
+++ b/applications/admin/models/db.py
@@ -38,3 +38,4 @@ def is_manager():
         return False
 
 
+
diff --git a/applications/admin/models/menu.py b/applications/admin/models/menu.py
index 0ec6a810..b6dcdfd6 100644
--- a/applications/admin/models/menu.py
+++ b/applications/admin/models/menu.py
@@ -26,7 +26,7 @@ if not session.authorized:
 else:
     response.menu.append((T('Logout'), False,
                           URL(_a,'default',f='logout')))
-    response.menu.append((T('Debug'), False, 
+    response.menu.append((T('Debug'), False,
                           URL(_a, 'debug','interact')))
 
 if os.path.exists('applications/examples'):
@@ -35,3 +35,4 @@ else:
     response.menu.append((T('Help'), False, 'http://web2py.com/examples'))
 
 
+
diff --git a/applications/admin/models/plugin_multiselect.py b/applications/admin/models/plugin_multiselect.py
index d6e0320a..09b9e7e0 100644
--- a/applications/admin/models/plugin_multiselect.py
+++ b/applications/admin/models/plugin_multiselect.py
@@ -3,3 +3,4 @@ response.files.append(URL('static','plugin_multiselect/multi-select.css'))
 response.files.append(URL('static','plugin_multiselect/start.js'))
 
 
+
diff --git a/applications/examples/controllers/ajax_examples.py b/applications/examples/controllers/ajax_examples.py
index 56652e5b..f7c49084 100644
--- a/applications/examples/controllers/ajax_examples.py
+++ b/applications/examples/controllers/ajax_examples.py
@@ -21,3 +21,4 @@ def fade():
 
 
 
+
diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py
index bc8ae060..f00eba91 100644
--- a/applications/examples/controllers/appadmin.py
+++ b/applications/examples/controllers/appadmin.py
@@ -444,3 +444,4 @@ def ccache():
 
 
 
+
diff --git a/applications/examples/controllers/cache_examples.py b/applications/examples/controllers/cache_examples.py
index 930f23c0..026a1f82 100644
--- a/applications/examples/controllers/cache_examples.py
+++ b/applications/examples/controllers/cache_examples.py
@@ -49,3 +49,4 @@ def cache_controller_and_view():
     return response.render(d)
 
 
+
diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py
index 80f00979..0e61ae93 100644
--- a/applications/examples/controllers/default.py
+++ b/applications/examples/controllers/default.py
@@ -74,3 +74,4 @@ def changelog():
     filename = os.path.join(request.env.gluon_parent, 'CHANGELOG')
     return response.render(dict(changelog=MARKMIN(read_file(filename))))
 
+
diff --git a/applications/examples/controllers/form_examples.py b/applications/examples/controllers/form_examples.py
index ffcc46e1..cddd54b0 100644
--- a/applications/examples/controllers/form_examples.py
+++ b/applications/examples/controllers/form_examples.py
@@ -26,3 +26,4 @@ def form():
 
 
 
+
diff --git a/applications/examples/controllers/global.py b/applications/examples/controllers/global.py
index 1c5f2a78..2855e3cb 100644
--- a/applications/examples/controllers/global.py
+++ b/applications/examples/controllers/global.py
@@ -80,3 +80,4 @@ def vars():
 
 
 
+
diff --git a/applications/examples/controllers/layout_examples.py b/applications/examples/controllers/layout_examples.py
index f20c19ec..5f10acfb 100644
--- a/applications/examples/controllers/layout_examples.py
+++ b/applications/examples/controllers/layout_examples.py
@@ -23,3 +23,4 @@ def basic():
 
 
 
+
diff --git a/applications/examples/controllers/session_examples.py b/applications/examples/controllers/session_examples.py
index 806c395b..bbd1a421 100644
--- a/applications/examples/controllers/session_examples.py
+++ b/applications/examples/controllers/session_examples.py
@@ -11,3 +11,4 @@ def counter():
 
 
 
+
diff --git a/applications/examples/controllers/simple_examples.py b/applications/examples/controllers/simple_examples.py
index 94dfd729..d740ced5 100644
--- a/applications/examples/controllers/simple_examples.py
+++ b/applications/examples/controllers/simple_examples.py
@@ -138,3 +138,4 @@ Quoted text
 def ajaxwiki_onclick():
     return MARKMIN(request.vars.text).xml()
 
+
diff --git a/applications/examples/controllers/spreadsheet.py b/applications/examples/controllers/spreadsheet.py
index 95c906bf..9a80c18e 100644
--- a/applications/examples/controllers/spreadsheet.py
+++ b/applications/examples/controllers/spreadsheet.py
@@ -8,3 +8,4 @@ def index():
     #sheet.cell('r0c3',value='=r0c0+r0c1+r0c2',readonly=True)
     return dict(sheet=sheet)
 
+
diff --git a/applications/examples/controllers/template_examples.py b/applications/examples/controllers/template_examples.py
index 3a6c913f..52aba5a4 100644
--- a/applications/examples/controllers/template_examples.py
+++ b/applications/examples/controllers/template_examples.py
@@ -34,3 +34,4 @@ def beautify():
 
 
 
+
diff --git a/applications/examples/models/feeds_reader.py b/applications/examples/models/feeds_reader.py
index 5921dfa8..787f0a4c 100644
--- a/applications/examples/models/feeds_reader.py
+++ b/applications/examples/models/feeds_reader.py
@@ -47,3 +47,4 @@ def code_feed_reader(project,mode='div'):
 
 
 
+
diff --git a/applications/examples/models/markmin.py b/applications/examples/models/markmin.py
index da761a6a..b7352c88 100644
--- a/applications/examples/models/markmin.py
+++ b/applications/examples/models/markmin.py
@@ -38,3 +38,4 @@ def get_content(b=None,\
 
     return html
 
+
diff --git a/applications/examples/models/menu.py b/applications/examples/models/menu.py
index 9c7eeefb..dc5de925 100644
--- a/applications/examples/models/menu.py
+++ b/applications/examples/models/menu.py
@@ -43,3 +43,4 @@ def toggle_menuclass(cssclass='pressed',menuid='headermenu'):
     else:
         return ''
 
+
diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py
index bc8ae060..f00eba91 100644
--- a/applications/welcome/controllers/appadmin.py
+++ b/applications/welcome/controllers/appadmin.py
@@ -444,3 +444,4 @@ def ccache():
 
 
 
+
diff --git a/applications/welcome/controllers/default.py b/applications/welcome/controllers/default.py
index 4c4b563d..7392c41d 100644
--- a/applications/welcome/controllers/default.py
+++ b/applications/welcome/controllers/default.py
@@ -71,3 +71,4 @@ def data():
       LOAD('default','data.load',args='tables',ajax=True,user_signature=True)
     """
     return dict(form=crud())
+
diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py
index 54a0b231..95ab525c 100644
--- a/applications/welcome/models/db.py
+++ b/applications/welcome/models/db.py
@@ -11,7 +11,7 @@
 
 if not request.env.web2py_runtime_gae:
     ## if NOT running on Google App Engine use SQLite or other DB
-    db = DAL('sqlite://storage.sqlite')    
+    db = DAL('sqlite://storage.sqlite')
 else:
     ## connect to Google BigTable (optional 'google:datastore://namespace')
     db = DAL('google:datastore')
@@ -81,3 +81,4 @@ use_janrain(auth,filename='private/janrain.key')
 
 ## after defining tables, uncomment below to enable auditing
 # auth.enable_record_versioning(db)
+
diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py
index dcf1c275..989328c4 100644
--- a/applications/welcome/models/menu.py
+++ b/applications/welcome/models/menu.py
@@ -33,7 +33,7 @@ def _():
     # shortcuts
     app = request.application
     ctr = request.controller
-    # useful links to internal and external resources 
+    # useful links to internal and external resources
     response.menu+=[
         (SPAN('web2py',_class='highlighted'),False, 'http://web2py.com', [
                 (T('My Sites'),False,URL('admin','default','site')),
@@ -99,3 +99,4 @@ def _():
          )]
 _()
 
+
diff --git a/cgihandler.py b/cgihandler.py
index c4c14993..a7bbcb1b 100755
--- a/cgihandler.py
+++ b/cgihandler.py
@@ -66,3 +66,4 @@ wsgiref.handlers.CGIHandler().run(gluon.main.wsgibase)
 
 
 
+
diff --git a/fcgihandler.py b/fcgihandler.py
index f45067a6..2a81b784 100755
--- a/fcgihandler.py
+++ b/fcgihandler.py
@@ -56,3 +56,4 @@ fcgi.WSGIServer(application, bindAddress='/tmp/fcgi.sock').run()
 
 
 
+
diff --git a/gaehandler.py b/gaehandler.py
index 70e52806..0971b9f8 100755
--- a/gaehandler.py
+++ b/gaehandler.py
@@ -102,3 +102,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/__init__.py b/gluon/__init__.py
index fd88cd43..795705f5 100644
--- a/gluon/__init__.py
+++ b/gluon/__init__.py
@@ -53,3 +53,4 @@ if 0:
 
 
 
+
diff --git a/gluon/admin.py b/gluon/admin.py
index f6e70f01..4fd874f9 100644
--- a/gluon/admin.py
+++ b/gluon/admin.py
@@ -481,3 +481,4 @@ def create_missing_app_folders(request):
 
 
 
+
diff --git a/gluon/cache.py b/gluon/cache.py
index 80fcabae..11c302c6 100644
--- a/gluon/cache.py
+++ b/gluon/cache.py
@@ -46,13 +46,13 @@ class CacheAbstract(object):
     Main function is now to provide referenced api documentation.
 
     Use CacheInRam or CacheOnDisk instead which are derived from this class.
-    
+
     Attentions, 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, 
+    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!
@@ -258,7 +258,7 @@ class CacheOnDisk(CacheAbstract):
         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
@@ -296,7 +296,7 @@ class CacheOnDisk(CacheAbstract):
         self.initialized = False
         self.request = request
         self.folder = folder
- 
+
     def initialize(self):
         if self.initialized: return
         else: self.initialized = True
@@ -468,7 +468,7 @@ class Cache(object):
         """
         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)
 
@@ -492,3 +492,4 @@ def lazy_cache(key=None,time_expire=None,cache_model='ram'):
 
 
 
+
diff --git a/gluon/cfs.py b/gluon/cfs.py
index 358540ca..ceb52f18 100644
--- a/gluon/cfs.py
+++ b/gluon/cfs.py
@@ -58,3 +58,4 @@ def getcfs(key, filename, filter=None):
 
 
 
+
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index 3bc81108..ab5f063a 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -371,7 +371,7 @@ _base_environment_['SQLField'] = SQLField  # for backward compatibility
 _base_environment_['SQLFORM'] = SQLFORM
 _base_environment_['SQLTABLE'] = SQLTABLE
 _base_environment_['LOAD'] = LOAD
- 
+
 def build_environment(request, response, session, store_current=True):
     """
     Build the environment dictionary into which web2py files are executed.
@@ -707,3 +707,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/contenttype.py b/gluon/contenttype.py
index cb11c687..cb0786ea 100644
--- a/gluon/contenttype.py
+++ b/gluon/contenttype.py
@@ -724,3 +724,4 @@ def contenttype(filename, default='text/plain'):
 
 
 
+
diff --git a/gluon/contrib/AuthorizeNet.py b/gluon/contrib/AuthorizeNet.py
index 8b24ef0a..8a6c7002 100755
--- a/gluon/contrib/AuthorizeNet.py
+++ b/gluon/contrib/AuthorizeNet.py
@@ -264,3 +264,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/contrib/DowCommerce.py b/gluon/contrib/DowCommerce.py
index d71c3911..e1a25672 100644
--- a/gluon/contrib/DowCommerce.py
+++ b/gluon/contrib/DowCommerce.py
@@ -244,3 +244,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/contrib/__init__.py b/gluon/contrib/__init__.py
index 12a6f48e..e3c0074c 100644
--- a/gluon/contrib/__init__.py
+++ b/gluon/contrib/__init__.py
@@ -6,3 +6,4 @@
 
 
 
+
diff --git a/gluon/contrib/aes.py b/gluon/contrib/aes.py
index cfc212b5..375ca55f 100644
--- a/gluon/contrib/aes.py
+++ b/gluon/contrib/aes.py
@@ -502,3 +502,4 @@ aes_Rcon = array('B',
 )
 
 
+
diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py
index be72db03..5ff1113e 100644
--- a/gluon/contrib/autolinks.py
+++ b/gluon/contrib/autolinks.py
@@ -205,3 +205,4 @@ if __name__=="__main__":
         print test()
 
 
+
diff --git a/gluon/contrib/feedparser.py b/gluon/contrib/feedparser.py
index 1afb2c11..827ce866 100755
--- a/gluon/contrib/feedparser.py
+++ b/gluon/contrib/feedparser.py
@@ -3911,3 +3911,4 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
 
 
 
+
diff --git a/gluon/contrib/gae_memcache.py b/gluon/contrib/gae_memcache.py
index 0a482e43..2b4ef4db 100644
--- a/gluon/contrib/gae_memcache.py
+++ b/gluon/contrib/gae_memcache.py
@@ -24,7 +24,7 @@ class MemcacheClient(object):
         key,
         f,
         time_expire=300,
-        ):        
+        ):
         key = '%s/%s' % (self.request.application, key)
         dt = time_expire
         value = None
@@ -44,7 +44,7 @@ class MemcacheClient(object):
         obj = self.client.get(key)
         if obj:
             value = obj[1] + value
-        self.client.set(key, (time.time(), value))        
+        self.client.set(key, (time.time(), value))
         return value
 
     def clear(self, key = None):
@@ -65,3 +65,4 @@ class MemcacheClient(object):
 
     def flush_all(self,*a,**b):
         return self.client.delete(*a,**b)
+
diff --git a/gluon/contrib/gae_retry.py b/gluon/contrib/gae_retry.py
index 134112a4..82bb37e0 100644
--- a/gluon/contrib/gae_retry.py
+++ b/gluon/contrib/gae_retry.py
@@ -91,3 +91,4 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0):
 
 
 
+
diff --git a/gluon/contrib/generics.py b/gluon/contrib/generics.py
index 0c9c2a23..97abccf3 100644
--- a/gluon/contrib/generics.py
+++ b/gluon/contrib/generics.py
@@ -68,3 +68,4 @@ def pdf_from_html(html):
 
 
 
+
diff --git a/gluon/contrib/google_wallet.py b/gluon/contrib/google_wallet.py
index 9ea64ea6..3bd88e70 100644
--- a/gluon/contrib/google_wallet.py
+++ b/gluon/contrib/google_wallet.py
@@ -20,3 +20,4 @@ def button(merchant_id="123456789012345",
 
 
 
+
diff --git a/gluon/contrib/gql.py b/gluon/contrib/gql.py
index 92b637e9..03002ccb 100644
--- a/gluon/contrib/gql.py
+++ b/gluon/contrib/gql.py
@@ -10,3 +10,4 @@ from gluon.dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, driv
 
 
 
+
diff --git a/gluon/contrib/imageutils.py b/gluon/contrib/imageutils.py
index e8094458..b01a283c 100644
--- a/gluon/contrib/imageutils.py
+++ b/gluon/contrib/imageutils.py
@@ -59,3 +59,4 @@ def THUMB(image, nx=120, ny=120, gae=False, name='thumb'):
             return image
 
 
+
diff --git a/gluon/contrib/memdb.py b/gluon/contrib/memdb.py
index ae2189aa..012fee05 100644
--- a/gluon/contrib/memdb.py
+++ b/gluon/contrib/memdb.py
@@ -912,3 +912,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/contrib/pam.py b/gluon/contrib/pam.py
index 4622b7cc..a0f3a983 100644
--- a/gluon/contrib/pam.py
+++ b/gluon/contrib/pam.py
@@ -128,3 +128,4 @@ if __name__ == "__main__":
 
 
 
+
diff --git a/gluon/contrib/pbkdf2.py b/gluon/contrib/pbkdf2.py
index a58a9dd1..b96bec4f 100644
--- a/gluon/contrib/pbkdf2.py
+++ b/gluon/contrib/pbkdf2.py
@@ -130,3 +130,4 @@ if __name__ == '__main__':
     test()
 
 
+
diff --git a/gluon/contrib/populate.py b/gluon/contrib/populate.py
index 38760f00..66d08b79 100644
--- a/gluon/contrib/populate.py
+++ b/gluon/contrib/populate.py
@@ -172,3 +172,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/contrib/pyfpdf.py b/gluon/contrib/pyfpdf.py
index 1cc8c8f0..1bd0f404 100644
--- a/gluon/contrib/pyfpdf.py
+++ b/gluon/contrib/pyfpdf.py
@@ -10,3 +10,4 @@ from fpdf import *
 # import warnings
 # warnings.warn("pyfpdf package name is deprecated, please use fpdf instead")
 
+
diff --git a/gluon/contrib/qdb.py b/gluon/contrib/qdb.py
index a23038d2..10e7af8a 100644
--- a/gluon/contrib/qdb.py
+++ b/gluon/contrib/qdb.py
@@ -965,3 +965,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/contrib/redis_cache.py b/gluon/contrib/redis_cache.py
index 2f2366d9..b6aa6630 100644
--- a/gluon/contrib/redis_cache.py
+++ b/gluon/contrib/redis_cache.py
@@ -168,3 +168,4 @@ class RedisClient(object):
 
 
 
+
diff --git a/gluon/contrib/redis_session.py b/gluon/contrib/redis_session.py
index e8bacfcd..6ffef629 100644
--- a/gluon/contrib/redis_session.py
+++ b/gluon/contrib/redis_session.py
@@ -127,7 +127,7 @@ class MockTable(object):
 
 class MockQuery(object):
     """a fake Query object that supports querying by id
-       and listing all keys. No other operation is supported 
+       and listing all keys. No other operation is supported
     """
     def __init__(self, field=None, db=None, prefix=None, session_expiry=False):
         self.field = field
@@ -187,15 +187,15 @@ class MockQuery(object):
 
 class RecordDeleter(object):
     """Dumb record deleter to support sessions2trash.py"""
-    
+
     def __init__(self, db, key, keyprefix):
         self.db, self.key, self.keyprefix = db, key, keyprefix
-        
+
     def __call__(self):
         id_idx = "%s:id_idx" % self.keyprefix
         #remove from the index
         self.db.srem(id_idx, self.key)
         #remove the key itself
         self.db.delete(self.key)
-        
-    
\ No newline at end of file
+
+
diff --git a/gluon/contrib/rss2.py b/gluon/contrib/rss2.py
index 47fde9d2..301a283a 100644
--- a/gluon/contrib/rss2.py
+++ b/gluon/contrib/rss2.py
@@ -593,3 +593,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py
index 227a1aec..d21d7870 100755
--- a/gluon/contrib/shell.py
+++ b/gluon/contrib/shell.py
@@ -271,3 +271,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py
index 5a29b5b8..cffaee7b 100644
--- a/gluon/contrib/simplejsonrpc.py
+++ b/gluon/contrib/simplejsonrpc.py
@@ -152,3 +152,4 @@ if __name__ == "__main__":
 
 
 
+
diff --git a/gluon/contrib/sms_utils.py b/gluon/contrib/sms_utils.py
index 5777661e..b5e32937 100644
--- a/gluon/contrib/sms_utils.py
+++ b/gluon/contrib/sms_utils.py
@@ -117,3 +117,4 @@ def sms_email(number,provider):
 
 
 
+
diff --git a/gluon/contrib/spreadsheet.py b/gluon/contrib/spreadsheet.py
index b13dced0..1fd956fd 100644
--- a/gluon/contrib/spreadsheet.py
+++ b/gluon/contrib/spreadsheet.py
@@ -880,3 +880,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/contrib/stripe.py b/gluon/contrib/stripe.py
index dbde9117..8bf25c8a 100644
--- a/gluon/contrib/stripe.py
+++ b/gluon/contrib/stripe.py
@@ -67,3 +67,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/contrib/taskbar_widget.py b/gluon/contrib/taskbar_widget.py
index 8f9cba9e..c053f2e9 100644
--- a/gluon/contrib/taskbar_widget.py
+++ b/gluon/contrib/taskbar_widget.py
@@ -248,3 +248,4 @@ class TaskBarIcon:
 
 
 
+
diff --git a/gluon/contrib/timecollect.py b/gluon/contrib/timecollect.py
index 601b7fb2..502a1b25 100644
--- a/gluon/contrib/timecollect.py
+++ b/gluon/contrib/timecollect.py
@@ -96,3 +96,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/contrib/user_agent_parser.py b/gluon/contrib/user_agent_parser.py
index e84f4892..27476f69 100644
--- a/gluon/contrib/user_agent_parser.py
+++ b/gluon/contrib/user_agent_parser.py
@@ -521,3 +521,4 @@ class mobilize(object):
 
 
 
+
diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py
index 8791ff1d..48827a9a 100644
--- a/gluon/contrib/webclient.py
+++ b/gluon/contrib/webclient.py
@@ -7,7 +7,7 @@ mostly for testing purposes
 
 - customizable
 - supports basic auth
-- supports cookies 
+- supports cookies
 - supports session cookies (tested with web2py sessions)
 - detects broken session
 - detects web2py form postbacks and handles formname and formkey
@@ -51,7 +51,7 @@ class WebClient(object):
 
     def post(self,url,data=None,cookies=None,headers=None,auth=None):
         self.url = self.app+url
-        
+
         # if this POST form requires a postback do it
         if data and '_formname' in data and self.postbacks and \
                 self.history and self.history[-1][1]!=self.url:
@@ -202,3 +202,4 @@ if __name__ == '__main__':
     test_web2py_registration_and_login()
 
 
+
diff --git a/gluon/contrib/websocket_messaging.py b/gluon/contrib/websocket_messaging.py
index 890eb295..2a385236 100644
--- a/gluon/contrib/websocket_messaging.py
+++ b/gluon/contrib/websocket_messaging.py
@@ -195,3 +195,4 @@ if __name__ == "__main__":
 
 
 
+
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index 6db23d2e..a3e28964 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -188,3 +188,4 @@ class TrackImporter(object):
         return file
 
 TRACK_IMPORTER = TrackImporter()
+
diff --git a/gluon/dal.py b/gluon/dal.py
index 05d054ae..36d4d3bb 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -500,7 +500,7 @@ class ConnectionPool(object):
 
     # ## this allows gluon to commit/rollback all dbs in this thread
 
-    def close(self,action='commit',really=True):        
+    def close(self,action='commit',really=True):
         if action:
             if callable(action):
                 action(self)
@@ -599,7 +599,7 @@ class BaseAdapter(ConnectionPool):
     support_distributed_transaction = False
     uploads_in_blob = False
     can_select_for_update = True
-    
+
     TRUE = 'T'
     FALSE = 'F'
     types = {
@@ -1661,7 +1661,7 @@ class BaseAdapter(ConnectionPool):
 
     def prepare(self, key):
         if self.connection: self.connection.prepare()
-        
+
     def commit_prepared(self, key):
         if self.connection: self.connection.commit()
 
@@ -6572,7 +6572,7 @@ def smart_query(fields,text):
             elif field._db._adapter.dbengine=='google:datastore' and \
                  field.type in ('list:integer', 'list:string', 'list:reference'):
                 if op == 'contains': new_query = field.contains(value)
-                else: raise RuntimeError, "Invalid operation"                
+                else: raise RuntimeError, "Invalid operation"
             else: raise RuntimeError, "Invalid operation"
             if neg: new_query = ~new_query
             if query is None:
@@ -6596,7 +6596,7 @@ class DAL(object):
                                     Field('fieldname2'))
     """
 
-    def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs):        
+    def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs):
         if not hasattr(THREAD_LOCAL,'db_instances'):
             THREAD_LOCAL.db_instances = {}
         if not hasattr(THREAD_LOCAL,'db_instances_zombie'):
@@ -6746,9 +6746,9 @@ class DAL(object):
                         kwargs = dict(db=self,uri=uri,
                                       pool_size=pool_size,
                                       folder=folder,
-                                      db_codec=db_codec, 
+                                      db_codec=db_codec,
                                       credential_decoder=credential_decoder,
-                                      driver_args=driver_args or {}, 
+                                      driver_args=driver_args or {},
                                       adapter_args=adapter_args or {},
                                       do_connect=do_connect)
                         self._adapter = ADAPTERS[self._dbname](**kwargs)
@@ -7184,7 +7184,7 @@ def index():
 
     def close(self):
         self._adapter.close()
-        if self._db_uid in THREAD_LOCAL.db_instances:            
+        if self._db_uid in THREAD_LOCAL.db_instances:
             db_group = THREAD_LOCAL.db_instances[self._db_uid]
             db_group.remove(self)
             if not db_group:
@@ -9548,3 +9548,4 @@ DAL.Table = Table  # was necessary in gluon/globals.py session.connect
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
+
diff --git a/gluon/debug.py b/gluon/debug.py
index b638cc12..3936cf47 100644
--- a/gluon/debug.py
+++ b/gluon/debug.py
@@ -193,3 +193,4 @@ gluon.main.global_settings.debugging = True
 
 
 
+
diff --git a/gluon/decoder.py b/gluon/decoder.py
index 4eecf8ab..010ed7fb 100644
--- a/gluon/decoder.py
+++ b/gluon/decoder.py
@@ -79,3 +79,4 @@ def decoder(buffer):
 
 
 
+
diff --git a/gluon/fileutils.py b/gluon/fileutils.py
index fd23c604..c6019d16 100644
--- a/gluon/fileutils.py
+++ b/gluon/fileutils.py
@@ -398,3 +398,4 @@ def abspath(*relpath, **base):
 
 
 
+
diff --git a/gluon/globals.py b/gluon/globals.py
index 7092f330..7b515fe9 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -251,11 +251,11 @@ class Response(Storage):
             if item.endswith('.css'):
                 has_css = True
             files.append(item)
-        
+
         if have_minify and ((self.optimize_css and has_css) or (self.optimize_js and has_js)):
             # cache for 5 minutes by default
             key = hashlib.md5(repr(files)).hexdigest()
- 
+
             cache = self.cache_includes or (current.cache.ram, 60*5)
             def call_minify(files=files):
                 return minify.minify(files,
@@ -344,7 +344,7 @@ class Response(Storage):
                     os.path.getsize(filename)
             except OSError:
                 pass
-        
+
         env = request.env
         # Internet Explorer < 9.0 will not allow downloads over SSL unless caching is enabled
         if request.is_https and isinstance(env.http_user_agent,str) and \
@@ -388,7 +388,7 @@ class Response(Storage):
             headers['Content-Disposition'] = \
                 'attachment; filename=%s' % filename
         return self.stream(stream, chunk_size=chunk_size, request=request)
-                           
+
 
     def json(self, data, default=None):
         return json(data, default = default or custom_json)
@@ -425,9 +425,9 @@ class Response(Storage):
             dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \
                                    for row in i.db._timings]) \
                            for i in THREAD_LOCAL.instances]
-            dbtables = dict([(regex_nopasswd.sub('******',i.uri), 
-                              {'defined': 
-                               sorted(list(set(i.db.tables) - 
+            dbtables = dict([(regex_nopasswd.sub('******',i.uri),
+                              {'defined':
+                               sorted(list(set(i.db.tables) -
                                            set(i.db._LAZY_TABLES.keys()))) or
                                '[no defined tables]',
                                'lazy': sorted(i.db._LAZY_TABLES.keys()) or
@@ -489,7 +489,7 @@ class Session(Storage):
         response.session_id_name = 'session_id_%s' % masterapp.lower()
         response.session_data_name = 'session_data_%s' % masterapp.lower()
         response.session_cookie_expires = cookie_expires
-        
+
         # Load session data from cookie
         cookies = request.cookies
 
@@ -505,7 +505,7 @@ class Session(Storage):
             session_cookie_data = cookies[response.session_data_name].value
         else:
             session_cookie_data = None
-                
+
         # if we are supposed to use cookie based session data
         if cookie_key:
             response.session_storage_type = 'cookie'
@@ -658,11 +658,11 @@ class Session(Storage):
         name = response.session_data_name
         value = secure_dumps(dict(self),response.session_cookie_key, compression_level=response.session_cookie_compression_level)
         expires = response.session_cookie_expires
-        rcookies = response.cookies 
-        rcookies.pop(name,None)            
+        rcookies = response.cookies
+        rcookies.pop(name,None)
         rcookies[name] = value
         rcookies[name]['path'] = '/'
-        if expires: 
+        if expires:
             rcookies[name]['expires'] = expires.strftime(FMT)
         return True
 
@@ -751,3 +751,4 @@ class Session(Storage):
                 del response.session_file
             except:
                 pass
+
diff --git a/gluon/highlight.py b/gluon/highlight.py
index 59332571..c66b429e 100644
--- a/gluon/highlight.py
+++ b/gluon/highlight.py
@@ -349,3 +349,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/html.py b/gluon/html.py
index f8ab3b63..6893b9b4 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -2064,7 +2064,7 @@ class FORM(DIV):
         message_onfailure = kwargs.get('message_onfailure',
                                        current.T("Errors in form, please check it out."))
         message_onchange = kwargs.get('message_onchange',
-                                       current.T("Form consecutive submissions not allowed. " + 
+                                       current.T("Form consecutive submissions not allowed. " +
                                                  "Try re-submitting or refreshing the form page."))
         next = kwargs.get('next',None)
         for key in ('message_onsuccess','message_onfailure','onsuccess',
@@ -2535,3 +2535,4 @@ class MARKMIN(XmlComponent):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
+
diff --git a/gluon/http.py b/gluon/http.py
index df841036..2dbc14f0 100644
--- a/gluon/http.py
+++ b/gluon/http.py
@@ -156,3 +156,4 @@ def redirect(location, how=303, client_side=False):
 
 
 
+
diff --git a/gluon/import_all.py b/gluon/import_all.py
index 46f231b8..3406cf3e 100644
--- a/gluon/import_all.py
+++ b/gluon/import_all.py
@@ -114,3 +114,4 @@ for module in base_modules + contributed_modules:
 
 
 
+
diff --git a/gluon/languages.py b/gluon/languages.py
index 1601f3af..3d94bb0a 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -166,7 +166,7 @@ def read_possible_plural_rules():
                 pname = modname+'.py'
                 nplurals = getattr(module,'nplurals', DEFAULT_NPLURALS)
                 get_plural_id = getattr(
-                    module,'get_plural_id', 
+                    module,'get_plural_id',
                     DEFAULT_GET_PLURAL_ID)
                 construct_plural_form = getattr(
                     module,'construct_plural_form',
@@ -210,7 +210,7 @@ def read_possible_languages_aux(langdir):
                 nplurals,        # nplurals for current language
                 get_plural_id,   # get_plural_id() for current language
                 construct_plural_form) # construct_plural_form() for current language
- 
+
     plurals = {}
     flist = oslistdir(langdir)
     # scan languages directory for plural dict files:
@@ -223,7 +223,7 @@ def read_possible_languages_aux(langdir):
     for fname in flist:
         if regex_langfile.match(fname) or fname == 'default.py':
             fname_with_path = pjoin(langdir,fname)
-            d = read_dict(fname_with_path)    
+            d = read_dict(fname_with_path)
             lang = fname[:-3]
             langcode = d.get('!langcode!', lang if lang != 'default'
                                               else DEFAULT_LANGUAGE)
@@ -241,7 +241,7 @@ def read_possible_languages_aux(langdir):
     if deflangcode not in langs:
         # create language from default.py:
         langs[deflangcode] = deflang[:2]+(0,)+deflang[3:]
-                            
+
     return langs
 
 def read_possible_languages(appdir):
@@ -403,11 +403,11 @@ class translator(object):
 
     notice 1: there is no need to force since, by default, T uses
        http_accept_language to determine a translation file.
-    notice 2: 
+    notice 2:
        en and en-en are considered different languages!
-    notice 3: 
+    notice 3:
        if language xx-yy is not found force() probes other similar
-       languages using such algorithm: 
+       languages using such algorithm:
         xx-yy.py -> xx.py -> xx-yy*.py -> xx*.py
     """
 
@@ -489,7 +489,7 @@ class translator(object):
             languages[0], (tuple, list)):
             languages = languages[0]
         if not languages or languages[0] is None:
-            # set default language from default.py/DEFAULT_LANGUAGE 
+            # set default language from default.py/DEFAULT_LANGUAGE
             pl_info = self.get_possible_languages_info('default')
             if pl_info[2]==0: # langfile_mtime
                 # if languages/default.py is not found
@@ -505,7 +505,7 @@ class translator(object):
             self.current_languages = list(languages)
         self.force(self.http_accept_language)
 
-       
+
     def plural(self, word, n):
         """ get plural form of word for number *n*
             NOTE: *word" MUST be defined in current language
@@ -619,7 +619,7 @@ class translator(object):
                                          self.language_file,
                                          ({},allocate_lock()))
                     set_plural(language)
-                    self.accepted_language = language 
+                    self.accepted_language = language
                     return languages
         self.accepted_language = language or self.current_languages[0]
         self.language_file = self.default_language_file
@@ -676,7 +676,7 @@ class translator(object):
             message = self.params_substitution(message, symbols)
         return XML(message.translate(ttab_out))
 
-    def M(self, message, symbols={}, language=None, 
+    def M(self, message, symbols={}, language=None,
           lazy=None, filter=None, ftag=None):
         """
         get cached translated markmin-message with inserted parametes
@@ -710,10 +710,10 @@ class translator(object):
         the ## notation is ignored in multiline strings and strings that
         start with ##. this is to allow markmin syntax to be translated
         """
-        if isinstance(message, unicode): 
-            message = message.encode('utf8') 
-        if isinstance(prefix, unicode): 
-            prefix = prefix.encode('utf8') 
+        if isinstance(message, unicode):
+            message = message.encode('utf8')
+        if isinstance(prefix, unicode):
+            prefix = prefix.encode('utf8')
         key = prefix+message
         mt = self.t.get(key, None)
         if mt is not None: return mt
@@ -831,7 +831,7 @@ class translator(object):
         """
         get cached translated message with inserted parameters(symbols)
         """
-        message = get_from_cache(self.cache, message, 
+        message = get_from_cache(self.cache, message,
                                  lambda: self.get_t(message))
         if symbols or symbols == 0 or symbols == "":
             if isinstance(symbols, dict):
@@ -905,3 +905,4 @@ def update_all_languages(application_path):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
+
diff --git a/gluon/main.py b/gluon/main.py
index f3d9db4f..405a4160 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -235,7 +235,7 @@ def serve_controller(request, response, session):
     default_headers = [
         ('Content-Type', contenttype('.'+request.extension)),
         ('Cache-Control','no-store, no-cache, must-revalidate, post-check=0, pre-check=0'),
-        ('Expires', time.strftime('%a, %d %b %Y %H:%M:%S GMT', 
+        ('Expires', time.strftime('%a, %d %b %Y %H:%M:%S GMT',
                                   time.gmtime())),
         ('Pragma', 'no-cache')]
     for key,value in default_headers:
@@ -440,7 +440,7 @@ def wsgibase(environ, responder):
                     local_hosts = global_settings.local_hosts
                 client = get_client(env)
                 x_req_with = str(env.http_x_requested_with).lower()
-                
+
                 request.update(
                     client = client,
                     folder = abspath('applications',app) + os.sep,
@@ -524,14 +524,14 @@ def wsgibase(environ, responder):
                     import gluon.debug
                     # activate the debugger
                     gluon.debug.dbg.do_debug(mainpyfile=request.folder)
-                
+
                 serve_controller(request, response, session)
 
             except HTTP, http_response:
 
                 if static_file:
                     return http_response.to(responder,env=env)
-                        
+
                 if request.body:
                     request.body.close()
 
@@ -557,9 +557,9 @@ def wsgibase(environ, responder):
                 # if session not in db try store session on filesystem
                 # this must be done after trying to commit database!
                 # ##################################################
-                    
+
                 session._try_store_in_cookie_or_file(request, response)
-                
+
                 if request.cid:
                     if response.flash:
                         http_response.headers['web2py-component-flash'] = urllib2.quote(xmlescape(response.flash).replace('\n',''))
@@ -858,3 +858,4 @@ class HttpServer(object):
         except:
             pass
 
+
diff --git a/gluon/messageboxhandler.py b/gluon/messageboxhandler.py
index d22ce719..ba2e5ec9 100644
--- a/gluon/messageboxhandler.py
+++ b/gluon/messageboxhandler.py
@@ -15,3 +15,4 @@ class MessageBoxHandler(logging.Handler):
             tkMessageBox.showinfo('info1', msg)
 
 
+
diff --git a/gluon/myregex.py b/gluon/myregex.py
index 9808a8cb..53a0e792 100644
--- a/gluon/myregex.py
+++ b/gluon/myregex.py
@@ -33,3 +33,4 @@ regex_extend = re.compile(\
 
 
 
+
diff --git a/gluon/newcron.py b/gluon/newcron.py
index 286503db..392258e6 100644
--- a/gluon/newcron.py
+++ b/gluon/newcron.py
@@ -330,7 +330,7 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
                 commands = command
 
             # from python docs:
-            # You do not need shell=True to run a batch file or 
+            # You do not need shell=True to run a batch file or
             # console-based executable.
             shell = False
 
@@ -348,3 +348,4 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
 
 
 
+
diff --git a/gluon/portalocker.py b/gluon/portalocker.py
index ed1ef8c5..8d622e4d 100644
--- a/gluon/portalocker.py
+++ b/gluon/portalocker.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# portalocker.py 
+# portalocker.py
 # Cross-platform (posix/nt) API for flock-style file locking.
 #                  Requires python 1.5.2 or better.
 
@@ -142,7 +142,7 @@ class LockedFile(object):
     def __del__(self):
         if not self.file is None:
             self.close()
-        
+
 def read_locked(filename):
     fp = LockedFile(filename, 'r')
     data = fp.read()
@@ -165,3 +165,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/reserved_sql_keywords.py b/gluon/reserved_sql_keywords.py
index 698768c8..b98af35a 100644
--- a/gluon/reserved_sql_keywords.py
+++ b/gluon/reserved_sql_keywords.py
@@ -1718,3 +1718,4 @@ ADAPTERS['all'] = reduce(lambda a,b:a.union(b),(x for x in ADAPTERS.values()))
 
 
 
+
diff --git a/gluon/restricted.py b/gluon/restricted.py
index bb5ba670..ee59b16c 100644
--- a/gluon/restricted.py
+++ b/gluon/restricted.py
@@ -100,7 +100,7 @@ class TicketStorage(Storage):
             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 {}
-            
+
 
 
 class RestrictedError(Exception):
@@ -312,3 +312,4 @@ def snapshot(info=None, context=5, code=None, environment=None):
 
 
 
+
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index f276ff47..56af7d10 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -197,7 +197,7 @@ def url_out(request, environ, application, controller, function,
         host = request.env.http_host
     if not scheme or scheme is True:
         scheme = request.env.get('wsgi_url_scheme', 'http').lower() \
-            if request else 'http' 
+            if request else 'http'
     if host:
         host_port = host if not port else host.split(':',1)[0]+':%s'%port
         url = '%s://%s%s' % (scheme, host_port, url)
@@ -579,7 +579,7 @@ def regex_filter_in(e):
     e['REQUEST_URI'] = e['PATH_INFO'] + (query and ('?' + query) or '')
     return e
 
- 
+
 def sluggify(key):
     return key.lower().replace('.','_')
 
@@ -609,7 +609,7 @@ def regex_url_in(request, environ):
     if not match:
         raise HTTP(400,
                    routes.error_message % 'invalid request',
-                   web2py_error='invalid path')    
+                   web2py_error='invalid path')
     elif match.group('c')=='static':
         application = match.group('a')
         version, filename = None, match.group('z')
@@ -623,9 +623,9 @@ def regex_url_in(request, environ):
     else:
         # ##################################################
         # parse application, controller and function
-        # ##################################################        
-        request.application = match.group('a') or routes.default_application 
-        request.controller = match.group('c') or routes.default_controller 
+        # ##################################################
+        request.application = match.group('a') or routes.default_application
+        request.controller = match.group('c') or routes.default_controller
         request.function = match.group('f') or routes.default_function
         request.raw_extension = match.group('e')
         request.extension = request.raw_extension or 'html'
@@ -1316,3 +1316,4 @@ def get_effective_router(appname):
     if not routers or appname not in routers:
         return None
     return Storage(routers[appname])  # return a copy
+
diff --git a/gluon/rocket.py b/gluon/rocket.py
index 616c0bc9..e0a138a4 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1881,3 +1881,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/gluon/sanitizer.py b/gluon/sanitizer.py
index fa5ffc4e..80c94c03 100644
--- a/gluon/sanitizer.py
+++ b/gluon/sanitizer.py
@@ -229,3 +229,4 @@ def sanitize(text, permitted_tags=[
 
 
 
+
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 00bc2650..9c12ad0a 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -430,7 +430,7 @@ class Scheduler(MetaScheduler):
         current._scheduler = self
 
         self.define_tables(db,migrate=migrate)
-        
+
     def now(self):
         return self.utc_time and datetime.datetime.utcnow() or datetime.datetime.now()
 
@@ -440,7 +440,7 @@ class Scheduler(MetaScheduler):
             scheduler_task.application_name.default= '%s/%s' % (
             current.request.application, current.request.controller
             )
-    
+
     def define_tables(self,db,migrate):
         from gluon.dal import DEFAULT
         logger.debug('defining tables (migrate=%s)' % migrate)
@@ -482,7 +482,7 @@ class Scheduler(MetaScheduler):
             Field('assigned_worker_name',default='',writable=False),
             on_define=self.set_requirements,
             migrate=migrate,format='%(task_name)s')
-        
+
 
         db.define_table(
             'scheduler_run',
@@ -855,7 +855,7 @@ class Scheduler(MetaScheduler):
         If output == True, returns also the last scheduler_run record
             scheduler_run record is fetched by a left join, so it can
             have all fields == None
-        
+
         """
         from gluon.dal import Query
         sr, st = self.db.scheduler_run, self.db.scheduler_task
@@ -962,3 +962,4 @@ def main():
 
 if __name__=='__main__':
     main()
+
diff --git a/gluon/serializers.py b/gluon/serializers.py
index 8934c9b2..5c18db09 100644
--- a/gluon/serializers.py
+++ b/gluon/serializers.py
@@ -118,3 +118,4 @@ def rss(feed):
 
 
 
+
diff --git a/gluon/settings.py b/gluon/settings.py
index 504bc1fd..6d0bea7a 100644
--- a/gluon/settings.py
+++ b/gluon/settings.py
@@ -38,3 +38,4 @@ global_settings.is_jython = \
     str(sys.copyright).find('Jython') > 0
 
 
+
diff --git a/gluon/shell.py b/gluon/shell.py
index 2ad019fa..620dfbc3 100644
--- a/gluon/shell.py
+++ b/gluon/shell.py
@@ -431,3 +431,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/sql.py b/gluon/sql.py
index f49878de..cbbd4451 100644
--- a/gluon/sql.py
+++ b/gluon/sql.py
@@ -10,3 +10,4 @@ from dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, DRIVERS, B
 
 
 
+
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 7b46fa3e..0e18ce0c 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -243,7 +243,7 @@ class ListWidget(StringWidget):
         attributes['_style'] = 'list-style:none'
         nvalue = value or ['']
         items = [LI(INPUT(_id=_id, _class=_class, _name=_name,
-                          value=v, hideerror=k<len(nvalue)-1, 
+                          value=v, hideerror=k<len(nvalue)-1,
                           requires=requires),
                     **attributes)  for (k,v) in enumerate(nvalue)]
         script=SCRIPT("""
@@ -897,8 +897,8 @@ class SQLFORM(FORM):
         # if no fields are provided, build it from the provided table
         # will only use writable or readable fields, unless forced to ignore
         if fields is None:
-            fields = [f.name for f in table if 
-                      (ignore_rw or f.writable or f.readable) and 
+            fields = [f.name for f in table if
+                      (ignore_rw or f.writable or f.readable) and
                       (readonly or not f.compute)]
         self.fields = fields
 
@@ -1260,8 +1260,8 @@ class SQLFORM(FORM):
         if self.record_changed and self.detect_record_change:
             message_onchange = \
                 kwargs.setdefault("message_onchange",
-                    current.T("A record change was detected. " + 
-                              "Consecutive update self-submissions " + 
+                    current.T("A record change was detected. " +
+                              "Consecutive update self-submissions " +
                               "are not allowed. Try re-submitting or " +
                               "refreshing the form page."))
             if message_onchange is not None:
@@ -1574,7 +1574,7 @@ class SQLFORM(FORM):
                         _id='w2p_field_%s' % name,
                         _class='w2p_query_row hidden',
                         _style='display:inline'))
-                                
+
         criteria.insert(0,SELECT(
                 _id="w2p_query_fields",
                 _onchange="jQuery('.w2p_query_row').hide();jQuery('#w2p_field_'+jQuery('#w2p_query_fields').val().replace('.','-')).show();",
@@ -1596,7 +1596,7 @@ class SQLFORM(FORM):
         """)
         return CAT(
             DIV(_id="w2p_query_panel",_class='hidden',*criteria),fadd)
-                       
+
 
 
     @staticmethod
@@ -1718,7 +1718,7 @@ class SQLFORM(FORM):
                     'create' in request.args or
                     'delete' in request.args or
                     'edit' in request.args)):
-                session.flash = T('not authorized')                
+                session.flash = T('not authorized')
                 redirect(referrer)
 
         def gridbutton(buttonclass='buttonadd', buttontext='Add',
@@ -2270,7 +2270,7 @@ class SQLFORM(FORM):
                 else:
                     break
             if nargs>len(args)+1:
-                query = (field == id)                
+                query = (field == id)
                 if isinstance(linked_tables,dict):
                     linked_tables = linked_tables.get(table._tablename,[])
                 if linked_tables is None or referee in linked_tables:
@@ -2747,3 +2747,4 @@ class ExporterXML(ExportClass):
             out.write('</row>\n')
         out.write('</rows>')
         return str(out.getvalue())
+
diff --git a/gluon/storage.py b/gluon/storage.py
index 92851139..e7c027d4 100644
--- a/gluon/storage.py
+++ b/gluon/storage.py
@@ -38,7 +38,7 @@ class Storage(dict):
         >>> print o.a
         None
     """
-    __slots__=()    
+    __slots__=()
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
     __getitem__ = dict.get
@@ -47,7 +47,7 @@ class Storage(dict):
     # http://stackoverflow.com/questions/5247250/why-does-pickle-getstate-accept-as-a-return-value-the-very-instance-it-requi
     __getstate__ = lambda self: None
     __copy__ = lambda self: Storage(self)
-    
+
     def getlist(self,key):
         """
         Return a Storage value as a list.
@@ -265,3 +265,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/streamer.py b/gluon/streamer.py
index 1b6dab2b..5b192796 100644
--- a/gluon/streamer.py
+++ b/gluon/streamer.py
@@ -118,3 +118,4 @@ def stream_file_or_304_or_206(
     else:
         wrapped = streamer(stream, chunk_size=chunk_size, bytes=bytes)
     raise HTTP(status, wrapped, **headers)
+
diff --git a/gluon/template.py b/gluon/template.py
index 179b8396..ec05e4a6 100644
--- a/gluon/template.py
+++ b/gluon/template.py
@@ -216,7 +216,7 @@ class TemplateParser(object):
     # These are used for re-indentation.
     # Indent + 1
     re_block = compile('^(elif |else:|except:|except |finally:).*$',DOTALL)
-                      
+
     # Indent - 1
     re_unblock = compile('^(return|continue|break|raise)( .*)?$', DOTALL)
     # Indent - 1
@@ -504,7 +504,7 @@ class TemplateParser(object):
         self.content.nodes = []
 
         t_content = t.content
-        
+
         # Set our include, unique by filename
         t_content.blocks['__include__' + filename] = buf
 
@@ -896,3 +896,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/tools.py b/gluon/tools.py
index 917d5257..72123114 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -625,7 +625,7 @@ class Mail(object):
         for k,v in headers.iteritems():
             payload[k] = encoded_or_raw(v.decode(encoding))
         result = {}
-        try:            
+        try:
             if self.settings.server == 'logging':
                 logger.warn('email not sent\n%s\nFrom: %s\nTo: %s\nSubject: %s\n\n%s\n%s\n' % \
                                 ('-'*40,sender,
@@ -1042,7 +1042,7 @@ class Auth(object):
     def url(self, f=None, args=None, vars=None, scheme=False):
         if args is None: args=[]
         if vars is None: vars={}
-        return URL(c=self.settings.controller, 
+        return URL(c=self.settings.controller,
                    f=f, args=args, vars=vars,scheme=scheme)
 
     def here(self):
@@ -1089,7 +1089,7 @@ class Auth(object):
         url_index = URL(controller,'index')
         url_login = URL(controller,function,args='login')
         # ## what happens after registration?
-            
+
         settings = self.settings = Settings()
         settings.update(Auth.default_settings)
         settings.update(
@@ -1299,7 +1299,7 @@ class Auth(object):
 
         if asdropdown:
             bar.insert(-1, LI('',_class='divider'))
-            if self.user_id:               
+            if self.user_id:
                 bar = LI(A(prefix, user_identifier, _href='#'),
                          bar,_class='dropdown')
             else:
@@ -1362,7 +1362,7 @@ class Auth(object):
         T = current.T
         reference_user = 'reference %s' % settings.table_user_name
         def lazy_user (auth = self):
-            return auth.user_id        
+            return auth.user_id
         def represent(id,record=None,s=settings):
             try:
                 user = s.table_user(id)
@@ -1425,7 +1425,7 @@ class Auth(object):
         elif isinstance(signature,self.db.Table):
             signature_list = [signature]
         else:
-            signature_list = signature        
+            signature_list = signature
         is_not_empty = IS_NOT_EMPTY(error_message=self.messages.is_empty)
         is_crypted = CRYPT(key=settings.hmac_key,
                            min_length=settings.password_min_length)
@@ -1698,7 +1698,7 @@ class Auth(object):
         """
         perform basic login.
         reads current.request.env.http_authorization
-        and returns basic_allowed,basic_accepted,user 
+        and returns basic_allowed,basic_accepted,user
         """
         if not self.settings.allow_basic_login:
             return (False,False,False)
@@ -1715,7 +1715,7 @@ class Auth(object):
         user = Storage(self.table_user()._filter_fields(user,id=True))
         if 'password' in user: del user.password
         current.session.auth = Storage(
-            user = user, 
+            user = user,
             last_visit = current.request.now,
             expiration = self.settings.expiration,
             hmac_key = web2py_uuid())
@@ -2182,7 +2182,7 @@ class Auth(object):
                 self.add_membership(self.settings.everybody_group_id, form.vars.id)
             if self.settings.registration_requires_verification:
                 link = self.url('user',args=('verify_email',key),scheme=True)
-                                
+
                 if not self.settings.mailer or \
                    not self.settings.mailer.send(
                     to=form.vars.email,
@@ -2204,7 +2204,7 @@ class Auth(object):
                 session.flash = self.messages.registration_successful
                 user = self.db(
                     table_user[username] == form.vars[username]
-                    ).select().first()                
+                    ).select().first()
                 self.login_user(user)
                 session.flash = self.messages.logged_in
             self.log_event(log, form.vars)
@@ -2561,7 +2561,7 @@ class Auth(object):
         reset_password_key = str(int(time.time()))+'-' + web2py_uuid()
         link = self.url('user',
                         args=('reset_password',reset_password_key),
-                        scheme=True) 
+                        scheme=True)
         if self.settings.mailer.send(
             to=user.email,
             subject=self.messages.reset_password_subject,
@@ -4476,7 +4476,7 @@ class PluginManager(object):
         settings.installed = True
         settings.update(
             (k,v) for k,v in defaults.items() if not k in settings)
-                            
+
     def __getattr__(self, key):
         if not key in self.__dict__:
             self.__dict__[key] = Storage()
@@ -4660,7 +4660,7 @@ class Wiki(object):
     # WIKI ACCESS POLICY
     def not_authorized(self,page=None):
         raise HTTP(401)
-    def can_read(self,page):   
+    def can_read(self,page):
         if 'everybody' in page.can_read or not self.manage_permissions:
             return True
         elif self.auth.user:
@@ -5027,3 +5027,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/utf8.py b/gluon/utf8.py
index 1af3fe15..06402c61 100644
--- a/gluon/utf8.py
+++ b/gluon/utf8.py
@@ -655,3 +655,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/utils.py b/gluon/utils.py
index ecc957bc..e3287f49 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -208,11 +208,11 @@ def web2py_uuid(ctokens=UNPACKED_CTOKENS):
     if HAVE_URANDOM:
         urand_longs = struct.unpack('=QQ', fast_urandom16())
         byte_s = struct.pack('=QQ',
-                             rand_longs[0]^urand_longs[0]^ctokens[0], 
+                             rand_longs[0]^urand_longs[0]^ctokens[0],
                              rand_longs[1]^urand_longs[1]^ctokens[1])
     else:
-        byte_s = struct.pack('=QQ', 
-                             rand_longs[0]^ctokens[0], 
+        byte_s = struct.pack('=QQ',
+                             rand_longs[0]^ctokens[0],
                              rand_longs[1]^ctokens[1])
     return str(uuid.UUID(bytes=byte_s, version=4))
 
@@ -261,3 +261,4 @@ def is_valid_ip_address(address):
 
 
 
+
diff --git a/gluon/validators.py b/gluon/validators.py
index dbf59fc5..49fabdf1 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -2797,7 +2797,7 @@ class IS_STRONG(object):
 
     """
 
-    def __init__(self, min=None, max=None, upper=None, lower=None, number=None, 
+    def __init__(self, min=None, max=None, upper=None, lower=None, number=None,
                  entropy=None,
                  special=None, specials=r'~!@#$%^&*()_+-=?<>,.:;{}[]|',
                  invalid=' "', error_message=None, es=False):
@@ -3256,3 +3256,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/widget.py b/gluon/widget.py
index af9c2e47..7b3cb53c 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -1227,3 +1227,4 @@ end tell
 
 
 
+
diff --git a/gluon/winservice.py b/gluon/winservice.py
index 3b518214..67933796 100644
--- a/gluon/winservice.py
+++ b/gluon/winservice.py
@@ -173,3 +173,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/gluon/xmlrpc.py b/gluon/xmlrpc.py
index 6bf931cb..756f08b7 100644
--- a/gluon/xmlrpc.py
+++ b/gluon/xmlrpc.py
@@ -26,3 +26,4 @@ def handler(request, response, methods):
 
 
 
+
diff --git a/isapiwsgihandler.py b/isapiwsgihandler.py
index 28973d2d..bce968b1 100644
--- a/isapiwsgihandler.py
+++ b/isapiwsgihandler.py
@@ -38,3 +38,4 @@ if __name__=='__main__':
 
 
 
+
diff --git a/modpythonhandler.py b/modpythonhandler.py
index 4ed135f1..0973d6d6 100755
--- a/modpythonhandler.py
+++ b/modpythonhandler.py
@@ -227,3 +227,4 @@ def handler(req):
 
 
 
+
diff --git a/options_std.py b/options_std.py
index 85cd071b..f00acfd8 100644
--- a/options_std.py
+++ b/options_std.py
@@ -32,3 +32,4 @@ folder = os.getcwd()
 extcron = None
 nocron = None
 
+
diff --git a/router.example.py b/router.example.py
index fef9737c..25cc6aba 100644
--- a/router.example.py
+++ b/router.example.py
@@ -214,3 +214,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/routes.example.py b/routes.example.py
index f44d05bf..206b4f15 100644
--- a/routes.example.py
+++ b/routes.example.py
@@ -41,14 +41,14 @@ routes_in = (
     (BASE+'/$app/appadmin','/$app/appadmin/index'),
     (BASE+'/$app/appadmin/$anything','/$app/appadmin/$anything'),
     # do not reroute static files
-    (BASE+'/$app/static/$anything','/$app/static/$anything'),    
+    (BASE+'/$app/static/$anything','/$app/static/$anything'),
     # reroute favicon and robots, use exable for lack of better choice
     ('/favicon.ico', '/examples/static/favicon.ico'),
-    ('/robots.txt', '/examples/static/robots.txt'),    
+    ('/robots.txt', '/examples/static/robots.txt'),
     # do other stuff
     ((r'.*http://otherdomain.com.* (?P<any>.*)', r'/app/ctr\g<any>')),
     # remove the BASE prefix
-    (BASE+'/$anything','/$anything'),        
+    (BASE+'/$anything','/$anything'),
     )
 
 # routes_out, like routes_in translates URL paths created with the web2py URL()
@@ -202,3 +202,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/scgihandler.py b/scgihandler.py
index e0dd6593..d18fafa8 100755
--- a/scgihandler.py
+++ b/scgihandler.py
@@ -76,3 +76,4 @@ SCGIServer(application, port=4000).enable_sighandler().run()
 
 
 
+
diff --git a/setup.py b/setup.py
index 37e06275..e4a82eb8 100644
--- a/setup.py
+++ b/setup.py
@@ -77,3 +77,4 @@ if __name__ == '__main__':
     #s = raw_input('>')
     #if s.lower()[:1]=='y':
     start()
+
diff --git a/setup_app.py b/setup_app.py
index cb57c8fc..54e169cc 100755
--- a/setup_app.py
+++ b/setup_app.py
@@ -57,3 +57,4 @@ setup(app=['web2py.py'],
 
 
 
+
diff --git a/setup_exe.py b/setup_exe.py
index 9b6e88e0..7855ab38 100755
--- a/setup_exe.py
+++ b/setup_exe.py
@@ -187,3 +187,4 @@ print "Enjoy web2py " +web2py_version_line
 
 
 
+
diff --git a/web2py.py b/web2py.py
index 26425777..5ce0c209 100755
--- a/web2py.py
+++ b/web2py.py
@@ -30,3 +30,4 @@ if __name__ == '__main__':
 
 
 
+
diff --git a/wsgihandler.py b/wsgihandler.py
index 85368eb3..bb3c9f77 100644
--- a/wsgihandler.py
+++ b/wsgihandler.py
@@ -47,3 +47,4 @@ if SOFTCRON:
 
 
 
+

From b716df1a059640f3558dfa59d6477ebf99390453 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 10:37:07 -0500
Subject: [PATCH 37/49] some pep8 changes (fixed spacing at end)

---
 VERSION                                            |  2 +-
 __init__.py                                        | 11 -----------
 anyserver.py                                       | 14 ++++++--------
 appengine_config.py                                |  6 ------
 applications/__init__.py                           |  1 +
 applications/admin/__init__.py                     |  1 +
 applications/admin/controllers/appadmin.py         |  4 ----
 applications/admin/controllers/debug.py            |  2 --
 applications/admin/controllers/default.py          |  2 --
 applications/admin/controllers/gae.py              |  3 ---
 applications/admin/controllers/mercurial.py        |  3 ---
 applications/admin/controllers/openshift.py        |  1 -
 applications/admin/controllers/plugin_jqmobile.py  |  3 ---
 applications/admin/controllers/shell.py            |  3 ---
 applications/admin/controllers/toolbar.py          |  3 ---
 applications/admin/controllers/webservices.py      |  2 --
 applications/admin/controllers/wizard.py           |  3 ---
 applications/admin/cron/expire_sessions.py         |  2 --
 applications/admin/models/0.py                     |  3 ---
 applications/admin/models/0_imports.py             |  3 ---
 applications/admin/models/access.py                |  2 --
 applications/admin/models/buttons.py               |  3 ---
 applications/admin/models/db.py                    |  3 ---
 applications/admin/models/menu.py                  |  3 ---
 applications/admin/models/plugin_multiselect.py    |  3 ---
 applications/admin/modules/__init__.py             |  1 -
 applications/examples/__init__.py                  |  1 +
 applications/examples/controllers/ajax_examples.py |  4 ----
 applications/examples/controllers/appadmin.py      |  4 ----
 .../examples/controllers/cache_examples.py         |  4 ----
 applications/examples/controllers/default.py       |  2 --
 applications/examples/controllers/form_examples.py |  7 -------
 applications/examples/controllers/global.py        |  5 -----
 .../examples/controllers/layout_examples.py        |  4 ----
 .../examples/controllers/session_examples.py       |  7 -------
 .../examples/controllers/simple_examples.py        |  2 --
 applications/examples/controllers/spreadsheet.py   |  2 --
 .../examples/controllers/template_examples.py      |  7 -------
 applications/examples/models/feeds_reader.py       |  6 ------
 applications/examples/models/markmin.py            |  2 --
 applications/examples/models/menu.py               |  2 --
 applications/welcome/__init__.py                   |  1 +
 applications/welcome/controllers/appadmin.py       |  4 ----
 applications/welcome/controllers/default.py        |  1 -
 applications/welcome/models/db.py                  |  1 -
 applications/welcome/models/menu.py                |  2 --
 applications/welcome/routes.example.py             |  1 -
 cgihandler.py                                      |  6 ------
 fcgihandler.py                                     |  6 ------
 gaehandler.py                                      |  6 ------
 gluon/__init__.py                                  | 12 ------------
 gluon/admin.py                                     |  8 --------
 gluon/cache.py                                     |  4 ----
 gluon/cfs.py                                       |  8 --------
 gluon/compileapp.py                                |  8 --------
 gluon/contenttype.py                               |  8 --------
 gluon/contrib/AuthorizeNet.py                      |  8 --------
 gluon/contrib/DowCommerce.py                       |  8 --------
 gluon/contrib/__init__.py                          |  8 --------
 gluon/contrib/aes.py                               |  3 ---
 gluon/contrib/autolinks.py                         |  3 ---
 gluon/contrib/feedparser.py                        |  7 -------
 gluon/contrib/gae_memcache.py                      |  1 -
 gluon/contrib/gae_retry.py                         |  8 --------
 gluon/contrib/generics.py                          |  8 --------
 gluon/contrib/google_wallet.py                     |  8 --------
 gluon/contrib/gql.py                               |  8 --------
 gluon/contrib/imageutils.py                        |  3 ---
 gluon/contrib/memdb.py                             |  8 --------
 gluon/contrib/pam.py                               |  8 --------
 gluon/contrib/pbkdf2.py                            |  3 ---
 gluon/contrib/populate.py                          |  8 --------
 gluon/contrib/pyfpdf.py                            |  2 --
 gluon/contrib/qdb.py                               |  5 -----
 gluon/contrib/redis_cache.py                       |  6 ------
 gluon/contrib/redis_session.py                     |  2 --
 gluon/contrib/rss2.py                              |  8 --------
 gluon/contrib/shell.py                             |  8 --------
 gluon/contrib/simplejsonrpc.py                     |  5 -----
 gluon/contrib/sms_utils.py                         |  8 --------
 gluon/contrib/spreadsheet.py                       |  4 ----
 gluon/contrib/stripe.py                            |  6 ------
 gluon/contrib/taskbar_widget.py                    |  8 --------
 gluon/contrib/timecollect.py                       |  4 ----
 gluon/contrib/user_agent_parser.py                 |  6 ------
 gluon/contrib/webclient.py                         |  3 ---
 gluon/contrib/websocket_messaging.py               |  8 --------
 gluon/custom_import.py                             |  1 -
 gluon/dal.py                                       |  1 -
 gluon/debug.py                                     |  5 -----
 gluon/decoder.py                                   |  8 --------
 gluon/fileutils.py                                 |  4 ----
 gluon/globals.py                                   |  1 -
 gluon/highlight.py                                 |  8 --------
 gluon/html.py                                      |  1 -
 gluon/http.py                                      |  8 --------
 gluon/import_all.py                                |  8 --------
 gluon/languages.py                                 |  1 -
 gluon/main.py                                      |  2 --
 gluon/messageboxhandler.py                         |  3 ---
 gluon/myregex.py                                   |  8 --------
 gluon/newcron.py                                   |  8 --------
 gluon/portalocker.py                               |  5 -----
 gluon/reserved_sql_keywords.py                     |  8 --------
 gluon/restricted.py                                |  8 --------
 gluon/rewrite.py                                   |  1 -
 gluon/rocket.py                                    |  6 ------
 gluon/sanitizer.py                                 |  8 --------
 gluon/scheduler.py                                 |  1 -
 gluon/serializers.py                               |  8 --------
 gluon/settings.py                                  |  3 ---
 gluon/shell.py                                     |  8 --------
 gluon/sql.py                                       |  8 --------
 gluon/sqlhtml.py                                   |  1 -
 gluon/storage.py                                   |  8 --------
 gluon/streamer.py                                  |  1 -
 gluon/template.py                                  |  8 --------
 gluon/tools.py                                     |  6 ------
 gluon/utf8.py                                      |  4 ----
 gluon/utils.py                                     |  8 --------
 gluon/validators.py                                |  9 ---------
 gluon/widget.py                                    | 10 ----------
 gluon/winservice.py                                |  8 --------
 gluon/xmlrpc.py                                    |  8 --------
 isapiwsgihandler.py                                |  6 ------
 modpythonhandler.py                                |  6 ------
 options_std.py                                     |  2 --
 router.example.py                                  |  6 ------
 routes.example.py                                  |  6 ------
 scgihandler.py                                     |  5 -----
 scripts/fixws.py                                   |  2 +-
 setup.py                                           |  1 -
 setup_app.py                                       |  6 ------
 setup_exe.py                                       |  6 ------
 web2py.py                                          |  6 ------
 wsgihandler.py                                     |  6 ------
 136 files changed, 12 insertions(+), 653 deletions(-)

diff --git a/VERSION b/VERSION
index 7a32a07d..ba504ebd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 09:40:10) dev
+Version 2.1.1 (2012-10-19 10:37:01) dev
diff --git a/__init__.py b/__init__.py
index 1901ba93..8b137891 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,12 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
diff --git a/anyserver.py b/anyserver.py
index 0cae0c2f..46daf4ec 100644
--- a/anyserver.py
+++ b/anyserver.py
@@ -9,7 +9,11 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
 This file is based, although a rewrite, on MIT-licensed code from the Bottle web framework.
 """
 
-import os, sys, optparse, urllib
+import os
+import sys
+import optparse
+import urllib
+
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
 sys.path = [path]+[p for p in sys.path if not p==path]
@@ -217,7 +221,7 @@ def mongrel2_handler(application,conn,debug=False):
             environ['QUERY_STRING'] = environ['URI'].split('?')[1]
         else:
             environ['QUERY_STRING'] = ''
-        if environ.has_key('Content-Length'):
+        if 'Content-Length' in environ:
             environ['CONTENT_LENGTH'] = environ['Content-Length'] # necessary for POST to work with Django
         environ['wsgi.input'] = req.body
 
@@ -305,9 +309,3 @@ def main():
 
 if __name__=='__main__':
     main()
-
-
-
-
-
-
diff --git a/appengine_config.py b/appengine_config.py
index a736220c..a36d1db6 100644
--- a/appengine_config.py
+++ b/appengine_config.py
@@ -2,9 +2,3 @@ def webapp_add_wsgi_middleware(app):
     from google.appengine.ext.appstats import recording
     app = recording.appstats_wsgi_middleware(app)
     return app
-
-
-
-
-
-
diff --git a/applications/__init__.py b/applications/__init__.py
index e69de29b..8b137891 100644
--- a/applications/__init__.py
+++ b/applications/__init__.py
@@ -0,0 +1 @@
+
diff --git a/applications/admin/__init__.py b/applications/admin/__init__.py
index e69de29b..8b137891 100644
--- a/applications/admin/__init__.py
+++ b/applications/admin/__init__.py
@@ -0,0 +1 @@
+
diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py
index f00eba91..6802c419 100644
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -441,7 +441,3 @@ def ccache():
 
     return dict(form=form, total=total,
                 ram=ram, disk=disk, object_stats=hp != False)
-
-
-
-
diff --git a/applications/admin/controllers/debug.py b/applications/admin/controllers/debug.py
index c18faf5c..f7c73d31 100644
--- a/applications/admin/controllers/debug.py
+++ b/applications/admin/controllers/debug.py
@@ -198,5 +198,3 @@ def toggle_breakpoint():
     except Exception, e:
         session.flash = str(e)
     return response.json({'ok': ok, 'lineno': lineno})
-
-
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index b6314641..0ecae821 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -1697,5 +1697,3 @@ def git_push():
             session.flash = T("Push failed, git exited abnormally. See logs for details.")
             redirect(URL('site'))
     return dict(app=app,form=form)
-
-
diff --git a/applications/admin/controllers/gae.py b/applications/admin/controllers/gae.py
index 1caa283c..2047a3e7 100644
--- a/applications/admin/controllers/gae.py
+++ b/applications/admin/controllers/gae.py
@@ -89,6 +89,3 @@ def callback():
     except:
         errors=''
     return (output+errors).replace('\n','<br/>')
-
-
-
diff --git a/applications/admin/controllers/mercurial.py b/applications/admin/controllers/mercurial.py
index 4f35dd54..34e0516b 100644
--- a/applications/admin/controllers/mercurial.py
+++ b/applications/admin/controllers/mercurial.py
@@ -80,6 +80,3 @@ def revision():
         desc=ctx.description(),
         form=form
         )
-
-
-
diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py
index f407e725..df9e6d8b 100644
--- a/applications/admin/controllers/openshift.py
+++ b/applications/admin/controllers/openshift.py
@@ -58,4 +58,3 @@ class EXISTS(object):
         if os.path.exists(value):
             return (value,None)
         return (value,self.error_message)
-
diff --git a/applications/admin/controllers/plugin_jqmobile.py b/applications/admin/controllers/plugin_jqmobile.py
index 77eb14ee..b9265a63 100644
--- a/applications/admin/controllers/plugin_jqmobile.py
+++ b/applications/admin/controllers/plugin_jqmobile.py
@@ -6,6 +6,3 @@ def index():
 
 def about():
     return locals()
-
-
-
diff --git a/applications/admin/controllers/shell.py b/applications/admin/controllers/shell.py
index 728c2000..561e06eb 100644
--- a/applications/admin/controllers/shell.py
+++ b/applications/admin/controllers/shell.py
@@ -43,6 +43,3 @@ def reset():
     session['commands:'+app] = []
     session['history:'+app] = gluon.contrib.shell.History()
     return 'done'
-
-
-
diff --git a/applications/admin/controllers/toolbar.py b/applications/admin/controllers/toolbar.py
index dfe220b8..9e0294a3 100644
--- a/applications/admin/controllers/toolbar.py
+++ b/applications/admin/controllers/toolbar.py
@@ -27,6 +27,3 @@ def profiler():
             size += len(data)
             response.cookies[KEY] = size
     return data
-
-
-
diff --git a/applications/admin/controllers/webservices.py b/applications/admin/controllers/webservices.py
index 9eab0f2b..7f38c7f8 100644
--- a/applications/admin/controllers/webservices.py
+++ b/applications/admin/controllers/webservices.py
@@ -127,5 +127,3 @@ def detach_debugger():
 def call():
     session.forget()
     return service()
-
-
diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py
index 841263c4..e8b3ac8c 100644
--- a/applications/admin/controllers/wizard.py
+++ b/applications/admin/controllers/wizard.py
@@ -554,6 +554,3 @@ def call(): return service()
         path = os.path.join(request.folder,'..',app,'databases','*')
         for file in glob.glob(path):
             os.unlink(file)
-
-
-
diff --git a/applications/admin/cron/expire_sessions.py b/applications/admin/cron/expire_sessions.py
index 15faa5f0..a602a939 100644
--- a/applications/admin/cron/expire_sessions.py
+++ b/applications/admin/cron/expire_sessions.py
@@ -19,5 +19,3 @@ for filename in os.listdir(path):
                 os.unlink(fullpath)
         except:
             logging.exception('failure to check %s'%fullpath)
-
-
diff --git a/applications/admin/models/0.py b/applications/admin/models/0.py
index 1d7abe3e..ebf9c29b 100644
--- a/applications/admin/models/0.py
+++ b/applications/admin/models/0.py
@@ -78,6 +78,3 @@ PLUGINS_APP = 'http://web2py.com/plugins'
 # set the language
 if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage'] is None):
     T.force(request.cookies['adminLanguage'].value)
-
-
-
diff --git a/applications/admin/models/0_imports.py b/applications/admin/models/0_imports.py
index ecb8cbcd..b911c0e7 100644
--- a/applications/admin/models/0_imports.py
+++ b/applications/admin/models/0_imports.py
@@ -28,6 +28,3 @@ from gluon.languages import findT, update_all_languages
 from gluon.myregex import *
 from gluon.restricted import *
 from gluon.compileapp import compile_application, remove_compiled_application
-
-
-
diff --git a/applications/admin/models/access.py b/applications/admin/models/access.py
index f2366669..f268366f 100644
--- a/applications/admin/models/access.py
+++ b/applications/admin/models/access.py
@@ -168,5 +168,3 @@ elif session.authorized and \
 if request.controller=='appadmin' and DEMO_MODE:
     session.flash = 'Appadmin disabled in demo mode'
     redirect(URL('default','sites'))
-
-
diff --git a/applications/admin/models/buttons.py b/applications/admin/models/buttons.py
index e60e6c00..ec79c8db 100644
--- a/applications/admin/models/buttons.py
+++ b/applications/admin/models/buttons.py
@@ -34,6 +34,3 @@ def helpicon():
 
 def searchbox(elementid):
     return TAG[''](LABEL(IMG(_id="search_start",_src=URL('static', 'images/search.png'), _alt=T('filter')), _class='icon', _for=elementid), ' ', INPUT(_id=elementid, _type='text', _size=12))
-
-
-
diff --git a/applications/admin/models/db.py b/applications/admin/models/db.py
index 11eb9c0a..b5df1aae 100644
--- a/applications/admin/models/db.py
+++ b/applications/admin/models/db.py
@@ -36,6 +36,3 @@ def is_manager():
         return True
     else:
         return False
-
-
-
diff --git a/applications/admin/models/menu.py b/applications/admin/models/menu.py
index b6dcdfd6..fa7d5fa6 100644
--- a/applications/admin/models/menu.py
+++ b/applications/admin/models/menu.py
@@ -33,6 +33,3 @@ if os.path.exists('applications/examples'):
     response.menu.append((T('Help'), False, URL('examples','default','index')))
 else:
     response.menu.append((T('Help'), False, 'http://web2py.com/examples'))
-
-
-
diff --git a/applications/admin/models/plugin_multiselect.py b/applications/admin/models/plugin_multiselect.py
index 09b9e7e0..ec45feec 100644
--- a/applications/admin/models/plugin_multiselect.py
+++ b/applications/admin/models/plugin_multiselect.py
@@ -1,6 +1,3 @@
 response.files.append(URL('static','plugin_multiselect/jquery.multi-select.js'))
 response.files.append(URL('static','plugin_multiselect/multi-select.css'))
 response.files.append(URL('static','plugin_multiselect/start.js'))
-
-
-
diff --git a/applications/admin/modules/__init__.py b/applications/admin/modules/__init__.py
index 139597f9..8b137891 100644
--- a/applications/admin/modules/__init__.py
+++ b/applications/admin/modules/__init__.py
@@ -1,2 +1 @@
 
-
diff --git a/applications/examples/__init__.py b/applications/examples/__init__.py
index e69de29b..8b137891 100644
--- a/applications/examples/__init__.py
+++ b/applications/examples/__init__.py
@@ -0,0 +1 @@
+
diff --git a/applications/examples/controllers/ajax_examples.py b/applications/examples/controllers/ajax_examples.py
index f7c49084..455e2f84 100644
--- a/applications/examples/controllers/ajax_examples.py
+++ b/applications/examples/controllers/ajax_examples.py
@@ -18,7 +18,3 @@ def flash():
 
 def fade():
     return dict()
-
-
-
-
diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py
index f00eba91..6802c419 100644
--- a/applications/examples/controllers/appadmin.py
+++ b/applications/examples/controllers/appadmin.py
@@ -441,7 +441,3 @@ def ccache():
 
     return dict(form=form, total=total,
                 ram=ram, disk=disk, object_stats=hp != False)
-
-
-
-
diff --git a/applications/examples/controllers/cache_examples.py b/applications/examples/controllers/cache_examples.py
index 026a1f82..c4a95494 100644
--- a/applications/examples/controllers/cache_examples.py
+++ b/applications/examples/controllers/cache_examples.py
@@ -1,4 +1,3 @@
-
 import time
 
 
@@ -47,6 +46,3 @@ def cache_controller_and_view():
     t = time.ctime()
     d = dict(time=t, link=A('click to reload', _href=URL(r=request)))
     return response.render(d)
-
-
-
diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py
index 0e61ae93..8e39b694 100644
--- a/applications/examples/controllers/default.py
+++ b/applications/examples/controllers/default.py
@@ -73,5 +73,3 @@ def changelog():
     import os
     filename = os.path.join(request.env.gluon_parent, 'CHANGELOG')
     return response.render(dict(changelog=MARKMIN(read_file(filename))))
-
-
diff --git a/applications/examples/controllers/form_examples.py b/applications/examples/controllers/form_examples.py
index cddd54b0..3847b043 100644
--- a/applications/examples/controllers/form_examples.py
+++ b/applications/examples/controllers/form_examples.py
@@ -1,6 +1,3 @@
-
-
-
 def form():
     """ a simple entry form with various types of objects """
 
@@ -23,7 +20,3 @@ def form():
     else:
         response.flash = 'please fill the form'
     return dict(form=form, vars=form.vars)
-
-
-
-
diff --git a/applications/examples/controllers/global.py b/applications/examples/controllers/global.py
index 2855e3cb..bcfab063 100644
--- a/applications/examples/controllers/global.py
+++ b/applications/examples/controllers/global.py
@@ -1,4 +1,3 @@
-
 session.forget()
 
 response.menu = [['home', False, '/%s/default/index'
@@ -77,7 +76,3 @@ def vars():
         doc=doc,
         attributes=attributes,
         )
-
-
-
-
diff --git a/applications/examples/controllers/layout_examples.py b/applications/examples/controllers/layout_examples.py
index 5f10acfb..dea28f11 100644
--- a/applications/examples/controllers/layout_examples.py
+++ b/applications/examples/controllers/layout_examples.py
@@ -20,7 +20,3 @@ def basic():
                      ['basic', True, URL('basic')]]
     response.flash = 'you clicked on basic'
     return dict(message='you clicked on basic')
-
-
-
-
diff --git a/applications/examples/controllers/session_examples.py b/applications/examples/controllers/session_examples.py
index bbd1a421..1160b211 100644
--- a/applications/examples/controllers/session_examples.py
+++ b/applications/examples/controllers/session_examples.py
@@ -1,6 +1,3 @@
-
-
-
 def counter():
     """ every time you reload, it increases the session.counter """
 
@@ -8,7 +5,3 @@ def counter():
         session.counter = 0
     session.counter += 1
     return dict(counter=session.counter)
-
-
-
-
diff --git a/applications/examples/controllers/simple_examples.py b/applications/examples/controllers/simple_examples.py
index d740ced5..3438d3e8 100644
--- a/applications/examples/controllers/simple_examples.py
+++ b/applications/examples/controllers/simple_examples.py
@@ -137,5 +137,3 @@ Quoted text
 
 def ajaxwiki_onclick():
     return MARKMIN(request.vars.text).xml()
-
-
diff --git a/applications/examples/controllers/spreadsheet.py b/applications/examples/controllers/spreadsheet.py
index 9a80c18e..426b8714 100644
--- a/applications/examples/controllers/spreadsheet.py
+++ b/applications/examples/controllers/spreadsheet.py
@@ -7,5 +7,3 @@ def index():
     sheet = cache.ram('sheet1',lambda:Sheet(10,10,URL('callback')),0)
     #sheet.cell('r0c3',value='=r0c0+r0c1+r0c2',readonly=True)
     return dict(sheet=sheet)
-
-
diff --git a/applications/examples/controllers/template_examples.py b/applications/examples/controllers/template_examples.py
index 52aba5a4..addb8d07 100644
--- a/applications/examples/controllers/template_examples.py
+++ b/applications/examples/controllers/template_examples.py
@@ -1,6 +1,3 @@
-
-
-
 def variables():
     return dict(a=10, b=20)
 
@@ -31,7 +28,3 @@ def xml():
 
 def beautify():
     return dict(message=BEAUTIFY(request))
-
-
-
-
diff --git a/applications/examples/models/feeds_reader.py b/applications/examples/models/feeds_reader.py
index 787f0a4c..658d5381 100644
--- a/applications/examples/models/feeds_reader.py
+++ b/applications/examples/models/feeds_reader.py
@@ -1,4 +1,3 @@
-
 def group_feed_reader(group,mode='div',counter='5'):
     """parse group feeds"""
 
@@ -43,8 +42,3 @@ def code_feed_reader(project,mode='div'):
 
 
     return html
-
-
-
-
-
diff --git a/applications/examples/models/markmin.py b/applications/examples/models/markmin.py
index b7352c88..4815ac79 100644
--- a/applications/examples/models/markmin.py
+++ b/applications/examples/models/markmin.py
@@ -37,5 +37,3 @@ def get_content(b=None,\
     openedfile.close()
 
     return html
-
-
diff --git a/applications/examples/models/menu.py b/applications/examples/models/menu.py
index dc5de925..1a696daf 100644
--- a/applications/examples/models/menu.py
+++ b/applications/examples/models/menu.py
@@ -42,5 +42,3 @@ def toggle_menuclass(cssclass='pressed',menuid='headermenu'):
             return XML(jscript)
     else:
         return ''
-
-
diff --git a/applications/welcome/__init__.py b/applications/welcome/__init__.py
index e69de29b..8b137891 100644
--- a/applications/welcome/__init__.py
+++ b/applications/welcome/__init__.py
@@ -0,0 +1 @@
+
diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py
index f00eba91..6802c419 100644
--- a/applications/welcome/controllers/appadmin.py
+++ b/applications/welcome/controllers/appadmin.py
@@ -441,7 +441,3 @@ def ccache():
 
     return dict(form=form, total=total,
                 ram=ram, disk=disk, object_stats=hp != False)
-
-
-
-
diff --git a/applications/welcome/controllers/default.py b/applications/welcome/controllers/default.py
index 7392c41d..4c4b563d 100644
--- a/applications/welcome/controllers/default.py
+++ b/applications/welcome/controllers/default.py
@@ -71,4 +71,3 @@ def data():
       LOAD('default','data.load',args='tables',ajax=True,user_signature=True)
     """
     return dict(form=crud())
-
diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py
index 95ab525c..26d28122 100644
--- a/applications/welcome/models/db.py
+++ b/applications/welcome/models/db.py
@@ -81,4 +81,3 @@ use_janrain(auth,filename='private/janrain.key')
 
 ## after defining tables, uncomment below to enable auditing
 # auth.enable_record_versioning(db)
-
diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py
index 989328c4..81010a99 100644
--- a/applications/welcome/models/menu.py
+++ b/applications/welcome/models/menu.py
@@ -98,5 +98,3 @@ def _():
                 ]
          )]
 _()
-
-
diff --git a/applications/welcome/routes.example.py b/applications/welcome/routes.example.py
index 363080a8..5194cb8e 100644
--- a/applications/welcome/routes.example.py
+++ b/applications/welcome/routes.example.py
@@ -37,4 +37,3 @@ routers = {
 #NOTE! To change language in your application using these rules add this line
 #in one of your models files:
 #   if request.uri_language: T.force(request.uri_language)
-
diff --git a/cgihandler.py b/cgihandler.py
index a7bbcb1b..3c919199 100755
--- a/cgihandler.py
+++ b/cgihandler.py
@@ -61,9 +61,3 @@ sys.path = [path]+[p for p in sys.path if not p==path]
 import gluon.main
 
 wsgiref.handlers.CGIHandler().run(gluon.main.wsgibase)
-
-
-
-
-
-
diff --git a/fcgihandler.py b/fcgihandler.py
index 2a81b784..76cda9b8 100755
--- a/fcgihandler.py
+++ b/fcgihandler.py
@@ -51,9 +51,3 @@ if SOFTCRON:
     global_settings.web2py_crontype = 'soft'
 
 fcgi.WSGIServer(application, bindAddress='/tmp/fcgi.sock').run()
-
-
-
-
-
-
diff --git a/gaehandler.py b/gaehandler.py
index 0971b9f8..0965fffe 100755
--- a/gaehandler.py
+++ b/gaehandler.py
@@ -97,9 +97,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-
-
-
-
-
-
diff --git a/gluon/__init__.py b/gluon/__init__.py
index 795705f5..7065a70a 100644
--- a/gluon/__init__.py
+++ b/gluon/__init__.py
@@ -42,15 +42,3 @@ if 0:
     mail = Mail()
     service = Service()
     plugins = PluginManager()
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gluon/admin.py b/gluon/admin.py
index 4fd874f9..ba392dbb 100644
--- a/gluon/admin.py
+++ b/gluon/admin.py
@@ -474,11 +474,3 @@ def create_missing_app_folders(request):
                 if not os.path.exists(path):
                     os.mkdir(path)
             global_settings.app_folders.add(request.folder)
-
-
-
-
-
-
-
-
diff --git a/gluon/cache.py b/gluon/cache.py
index 11c302c6..ec26711f 100644
--- a/gluon/cache.py
+++ b/gluon/cache.py
@@ -489,7 +489,3 @@ def lazy_cache(key=None,time_expire=None,cache_model='ram'):
         g.__name__ = f.__name__
         return g
     return decorator
-
-
-
-
diff --git a/gluon/cfs.py b/gluon/cfs.py
index ceb52f18..6e610d49 100644
--- a/gluon/cfs.py
+++ b/gluon/cfs.py
@@ -51,11 +51,3 @@ def getcfs(key, filename, filter=None):
     cfs[key] = (t, data)
     cfs_lock.release()
     return data
-
-
-
-
-
-
-
-
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index ab5f063a..fc3eada8 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -700,11 +700,3 @@ def test():
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
-
-
diff --git a/gluon/contenttype.py b/gluon/contenttype.py
index cb0786ea..4270bb6c 100644
--- a/gluon/contenttype.py
+++ b/gluon/contenttype.py
@@ -717,11 +717,3 @@ def contenttype(filename, default='text/plain'):
     if default.startswith('text/'):
         default += '; charset=utf-8'
     return default
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/AuthorizeNet.py b/gluon/contrib/AuthorizeNet.py
index 8a6c7002..d54d7ee9 100755
--- a/gluon/contrib/AuthorizeNet.py
+++ b/gluon/contrib/AuthorizeNet.py
@@ -257,11 +257,3 @@ def test():
 
 if __name__=='__main__':
     test()
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/DowCommerce.py b/gluon/contrib/DowCommerce.py
index e1a25672..03d19fd1 100644
--- a/gluon/contrib/DowCommerce.py
+++ b/gluon/contrib/DowCommerce.py
@@ -237,11 +237,3 @@ def test():
 
 if __name__=='__main__':
     test()
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/__init__.py b/gluon/contrib/__init__.py
index e3c0074c..8b137891 100644
--- a/gluon/contrib/__init__.py
+++ b/gluon/contrib/__init__.py
@@ -1,9 +1 @@
 
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/aes.py b/gluon/contrib/aes.py
index 375ca55f..24e40878 100644
--- a/gluon/contrib/aes.py
+++ b/gluon/contrib/aes.py
@@ -500,6 +500,3 @@ aes_Rcon = array('B',
     'c697356ad4b37dfaefc5913972e4d3bd'
     '61c29f254a943366cc831d3a74e8cb'.decode('hex')
 )
-
-
-
diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py
index 5ff1113e..05f02b64 100644
--- a/gluon/contrib/autolinks.py
+++ b/gluon/contrib/autolinks.py
@@ -203,6 +203,3 @@ if __name__=="__main__":
         print expand_html(open(sys.argv[1]).read())
     else:
         print test()
-
-
-
diff --git a/gluon/contrib/feedparser.py b/gluon/contrib/feedparser.py
index 827ce866..a028d794 100755
--- a/gluon/contrib/feedparser.py
+++ b/gluon/contrib/feedparser.py
@@ -3905,10 +3905,3 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
     result['version'] = result['version'] or feedparser.version
     result['namespaces'] = feedparser.namespacesInUse
     return result
-
-
-
-
-
-
-
diff --git a/gluon/contrib/gae_memcache.py b/gluon/contrib/gae_memcache.py
index 2b4ef4db..ec08fd6a 100644
--- a/gluon/contrib/gae_memcache.py
+++ b/gluon/contrib/gae_memcache.py
@@ -65,4 +65,3 @@ class MemcacheClient(object):
 
     def flush_all(self,*a,**b):
         return self.client.delete(*a,**b)
-
diff --git a/gluon/contrib/gae_retry.py b/gluon/contrib/gae_retry.py
index 82bb37e0..9b0fe426 100644
--- a/gluon/contrib/gae_retry.py
+++ b/gluon/contrib/gae_retry.py
@@ -84,11 +84,3 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0):
     setattr(wrapper, '_autoretry_datastore_timeouts', False)
     if getattr(wrapped, '_autoretry_datastore_timeouts', True):
         apiproxy_stub_map.MakeSyncCall = wrapper
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/generics.py b/gluon/contrib/generics.py
index 97abccf3..fa074416 100644
--- a/gluon/contrib/generics.py
+++ b/gluon/contrib/generics.py
@@ -61,11 +61,3 @@ def pdf_from_html(html):
         return pdflatex_from_html(html)
     else:
         return pyfpdf_from_html(html)
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/google_wallet.py b/gluon/contrib/google_wallet.py
index 3bd88e70..ffcbd9f8 100644
--- a/gluon/contrib/google_wallet.py
+++ b/gluon/contrib/google_wallet.py
@@ -13,11 +13,3 @@ def button(merchant_id="123456789012345",
             list_products += t % dict(k=k+1,key=key,value=value)
     button = '<form action="https://checkout.google.com/api/checkout/v2/checkoutForm/Merchant/%s" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" target="_top">%s<input name="_charset_" type="hidden" value="utf-8"/><input alt="" src="https://checkout.google.com/buttons/buy.gif?merchant_id=%s&amp;w=117&amp;h=48&amp;style=white&amp;variant=text&amp;loc=en_US" type="image"/></form>' % (merchant_id, list_products, merchant_id)
     return XML(button)
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/gql.py b/gluon/contrib/gql.py
index 03002ccb..d1023ab1 100644
--- a/gluon/contrib/gql.py
+++ b/gluon/contrib/gql.py
@@ -3,11 +3,3 @@
 __all__ = ['DAL','Field','drivers','gae']
 
 from gluon.dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, drivers, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType, gae
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/imageutils.py b/gluon/contrib/imageutils.py
index b01a283c..96facc08 100644
--- a/gluon/contrib/imageutils.py
+++ b/gluon/contrib/imageutils.py
@@ -57,6 +57,3 @@ def THUMB(image, nx=120, ny=120, gae=False, name='thumb'):
             return thumb
         else:
             return image
-
-
-
diff --git a/gluon/contrib/memdb.py b/gluon/contrib/memdb.py
index 012fee05..527b051a 100644
--- a/gluon/contrib/memdb.py
+++ b/gluon/contrib/memdb.py
@@ -905,11 +905,3 @@ SQLStorage = DALStorage
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/pam.py b/gluon/contrib/pam.py
index a0f3a983..c05f3e8e 100644
--- a/gluon/contrib/pam.py
+++ b/gluon/contrib/pam.py
@@ -121,11 +121,3 @@ def authenticate(username, password, service='login'):
 if __name__ == "__main__":
     import getpass
     print authenticate(getpass.getuser(), getpass.getpass())
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/pbkdf2.py b/gluon/contrib/pbkdf2.py
index b96bec4f..b7a7dd42 100644
--- a/gluon/contrib/pbkdf2.py
+++ b/gluon/contrib/pbkdf2.py
@@ -128,6 +128,3 @@ def test():
 
 if __name__ == '__main__':
     test()
-
-
-
diff --git a/gluon/contrib/populate.py b/gluon/contrib/populate.py
index 66d08b79..b82173d0 100644
--- a/gluon/contrib/populate.py
+++ b/gluon/contrib/populate.py
@@ -165,11 +165,3 @@ if __name__ == '__main__':
     ell=Learner()
     ell.loadd(eval(IUP))
     print ell.generate(1000,prefix=None)
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/pyfpdf.py b/gluon/contrib/pyfpdf.py
index 1bd0f404..26fc2940 100644
--- a/gluon/contrib/pyfpdf.py
+++ b/gluon/contrib/pyfpdf.py
@@ -9,5 +9,3 @@ from fpdf import *
 
 # import warnings
 # warnings.warn("pyfpdf package name is deprecated, please use fpdf instead")
-
-
diff --git a/gluon/contrib/qdb.py b/gluon/contrib/qdb.py
index 10e7af8a..732ff831 100644
--- a/gluon/contrib/qdb.py
+++ b/gluon/contrib/qdb.py
@@ -961,8 +961,3 @@ if __name__ == '__main__':
         # reimport as global __main__ namespace is destroyed
         import qdb
         qdb.main(**kwargs)
-
-
-
-
-
diff --git a/gluon/contrib/redis_cache.py b/gluon/contrib/redis_cache.py
index b6aa6630..8fc30ab7 100644
--- a/gluon/contrib/redis_cache.py
+++ b/gluon/contrib/redis_cache.py
@@ -163,9 +163,3 @@ class RedisClient(object):
     def __keyFormat__(self, key):
         return 'w2p:%s:%s' % (self.request.application,
                               key.replace(' ', '_'))
-
-
-
-
-
-
diff --git a/gluon/contrib/redis_session.py b/gluon/contrib/redis_session.py
index 6ffef629..8497fac7 100644
--- a/gluon/contrib/redis_session.py
+++ b/gluon/contrib/redis_session.py
@@ -197,5 +197,3 @@ class RecordDeleter(object):
         self.db.srem(id_idx, self.key)
         #remove the key itself
         self.db.delete(self.key)
-
-
diff --git a/gluon/contrib/rss2.py b/gluon/contrib/rss2.py
index 301a283a..c25fee86 100644
--- a/gluon/contrib/rss2.py
+++ b/gluon/contrib/rss2.py
@@ -586,11 +586,3 @@ def test():
 
 if __name__ == '__main__':
     print test()
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py
index d21d7870..bad60074 100755
--- a/gluon/contrib/shell.py
+++ b/gluon/contrib/shell.py
@@ -264,11 +264,3 @@ def run(history, statement, env={}):
 if __name__=='__main__':
     history=History()
     while True: print run(history, raw_input('>>> ')).rstrip()
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py
index cffaee7b..8847f374 100644
--- a/gluon/contrib/simplejsonrpc.py
+++ b/gluon/contrib/simplejsonrpc.py
@@ -148,8 +148,3 @@ if __name__ == "__main__":
     location = "http://www.web2py.com.ar/webservices/sample/call/jsonrpc"
     client = ServerProxy(location, verbose='--verbose' in sys.argv,)
     print client.add(1, 2)
-
-
-
-
-
diff --git a/gluon/contrib/sms_utils.py b/gluon/contrib/sms_utils.py
index b5e32937..7d6378ef 100644
--- a/gluon/contrib/sms_utils.py
+++ b/gluon/contrib/sms_utils.py
@@ -110,11 +110,3 @@ def sms_email(number,provider):
     elif number[:2]=='00': number=number[3:]
     number=re.sub('[^\d]','',number)
     return number+SMSCODES[provider]
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/spreadsheet.py b/gluon/contrib/spreadsheet.py
index 1fd956fd..22b7d025 100644
--- a/gluon/contrib/spreadsheet.py
+++ b/gluon/contrib/spreadsheet.py
@@ -877,7 +877,3 @@ if __name__ == '__main__':
     s.cell('b', value="=sin(a)")
     s.cell('c', value="=cos(a)**2+b*b")
     print s['c'].computed_value
-
-
-
-
diff --git a/gluon/contrib/stripe.py b/gluon/contrib/stripe.py
index 8bf25c8a..3e42c8f0 100644
--- a/gluon/contrib/stripe.py
+++ b/gluon/contrib/stripe.py
@@ -62,9 +62,3 @@ if __name__=='__main__':
     print 'paid',s['paid'],s['amount'] ,s['currency']
     s = Stripe(key).refund(d[u'id'])
     print 'refunded',s['refunded']
-
-
-
-
-
-
diff --git a/gluon/contrib/taskbar_widget.py b/gluon/contrib/taskbar_widget.py
index c053f2e9..313585a7 100644
--- a/gluon/contrib/taskbar_widget.py
+++ b/gluon/contrib/taskbar_widget.py
@@ -241,11 +241,3 @@ class TaskBarIcon:
 
         RUNNING = 0
         STOPPED = 1
-
-
-
-
-
-
-
-
diff --git a/gluon/contrib/timecollect.py b/gluon/contrib/timecollect.py
index 502a1b25..aeafc75c 100644
--- a/gluon/contrib/timecollect.py
+++ b/gluon/contrib/timecollect.py
@@ -93,7 +93,3 @@ if __name__=='__main__':
     print('')
     # You can turn off ordering of results
     print(t.getReportText(orderByCost=False))
-
-
-
-
diff --git a/gluon/contrib/user_agent_parser.py b/gluon/contrib/user_agent_parser.py
index 27476f69..48de2b09 100644
--- a/gluon/contrib/user_agent_parser.py
+++ b/gluon/contrib/user_agent_parser.py
@@ -516,9 +516,3 @@ class mobilize(object):
             items.insert(-1,'mobile')
             current.response.view = '.'.join(items)
         return self.func()
-
-
-
-
-
-
diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py
index 48827a9a..19068802 100644
--- a/gluon/contrib/webclient.py
+++ b/gluon/contrib/webclient.py
@@ -200,6 +200,3 @@ def test_web2py_registration_and_login():
 
 if __name__ == '__main__':
     test_web2py_registration_and_login()
-
-
-
diff --git a/gluon/contrib/websocket_messaging.py b/gluon/contrib/websocket_messaging.py
index 2a385236..cd42356d 100644
--- a/gluon/contrib/websocket_messaging.py
+++ b/gluon/contrib/websocket_messaging.py
@@ -188,11 +188,3 @@ if __name__ == "__main__":
     http_server = tornado.httpserver.HTTPServer(application)
     http_server.listen(int(options.port), address=options.address)
     tornado.ioloop.IOLoop.instance().start()
-
-
-
-
-
-
-
-
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index a3e28964..6db23d2e 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -188,4 +188,3 @@ class TrackImporter(object):
         return file
 
 TRACK_IMPORTER = TrackImporter()
-
diff --git a/gluon/dal.py b/gluon/dal.py
index 36d4d3bb..9e1dd50d 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -9548,4 +9548,3 @@ DAL.Table = Table  # was necessary in gluon/globals.py session.connect
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
diff --git a/gluon/debug.py b/gluon/debug.py
index 3936cf47..8d184ce0 100644
--- a/gluon/debug.py
+++ b/gluon/debug.py
@@ -189,8 +189,3 @@ qdb_debugger.set_params(dict(call_stack=True, environment=True))
 
 import gluon.main
 gluon.main.global_settings.debugging = True
-
-
-
-
-
diff --git a/gluon/decoder.py b/gluon/decoder.py
index 010ed7fb..e3d6a560 100644
--- a/gluon/decoder.py
+++ b/gluon/decoder.py
@@ -72,11 +72,3 @@ def autoDetectXMLEncoding(buffer):
 def decoder(buffer):
     encoding = autoDetectXMLEncoding(buffer)
     return buffer.decode(encoding).encode('utf8')
-
-
-
-
-
-
-
-
diff --git a/gluon/fileutils.py b/gluon/fileutils.py
index c6019d16..5d0412eb 100644
--- a/gluon/fileutils.py
+++ b/gluon/fileutils.py
@@ -395,7 +395,3 @@ def abspath(*relpath, **base):
     if gluon:
         return os.path.join(global_settings.gluon_parent, path)
     return os.path.join(global_settings.applications_parent, path)
-
-
-
-
diff --git a/gluon/globals.py b/gluon/globals.py
index 7b515fe9..f9c85926 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -751,4 +751,3 @@ class Session(Storage):
                 del response.session_file
             except:
                 pass
-
diff --git a/gluon/highlight.py b/gluon/highlight.py
index c66b429e..7fb45af2 100644
--- a/gluon/highlight.py
+++ b/gluon/highlight.py
@@ -342,11 +342,3 @@ if __name__ == '__main__':
     argfp.close()
     print '<html><body>' + highlight(data, sys.argv[2])\
          + '</body></html>'
-
-
-
-
-
-
-
-
diff --git a/gluon/html.py b/gluon/html.py
index 6893b9b4..c7cd0686 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -2535,4 +2535,3 @@ class MARKMIN(XmlComponent):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
diff --git a/gluon/http.py b/gluon/http.py
index 2dbc14f0..4dd08333 100644
--- a/gluon/http.py
+++ b/gluon/http.py
@@ -149,11 +149,3 @@ def redirect(location, how=303, client_side=False):
             raise HTTP(how,
                        'You are being redirected <a href="%s">here</a>' % loc,
                        Location=loc)
-
-
-
-
-
-
-
-
diff --git a/gluon/import_all.py b/gluon/import_all.py
index 3406cf3e..35d09744 100644
--- a/gluon/import_all.py
+++ b/gluon/import_all.py
@@ -107,11 +107,3 @@ for module in base_modules + contributed_modules:
             msg += "Try the following command: "
             msg += "easy_install-%(python_version)s -U %(module)s" % locals()
             raise ImportError, msg
-
-
-
-
-
-
-
-
diff --git a/gluon/languages.py b/gluon/languages.py
index 3d94bb0a..9a7617a7 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -905,4 +905,3 @@ def update_all_languages(application_path):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
diff --git a/gluon/main.py b/gluon/main.py
index 405a4160..2aaaa5e3 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -857,5 +857,3 @@ class HttpServer(object):
             os.unlink(self.pid_filename)
         except:
             pass
-
-
diff --git a/gluon/messageboxhandler.py b/gluon/messageboxhandler.py
index ba2e5ec9..33cd59b4 100644
--- a/gluon/messageboxhandler.py
+++ b/gluon/messageboxhandler.py
@@ -13,6 +13,3 @@ class MessageBoxHandler(logging.Handler):
         if tkMessageBox:
             msg = self.format(record)
             tkMessageBox.showinfo('info1', msg)
-
-
-
diff --git a/gluon/myregex.py b/gluon/myregex.py
index 53a0e792..3661abfa 100644
--- a/gluon/myregex.py
+++ b/gluon/myregex.py
@@ -26,11 +26,3 @@ regex_include = re.compile(\
 
 regex_extend = re.compile(\
     '^\s*(?P<all>\{\{\s*extend\s+[\'"](?P<name>[^\'"]+)[\'"]\s*\}\})',re.MULTILINE)
-
-
-
-
-
-
-
-
diff --git a/gluon/newcron.py b/gluon/newcron.py
index 392258e6..c6b3026b 100644
--- a/gluon/newcron.py
+++ b/gluon/newcron.py
@@ -341,11 +341,3 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
                     'WEB2PY CRON: Execution error for %s: %s' \
                         % (task.get('cmd'), e))
     token.release()
-
-
-
-
-
-
-
-
diff --git a/gluon/portalocker.py b/gluon/portalocker.py
index 8d622e4d..2766032d 100644
--- a/gluon/portalocker.py
+++ b/gluon/portalocker.py
@@ -161,8 +161,3 @@ if __name__=='__main__':
     f = LockedFile('test.txt',mode='rb')
     print f.read()
     f.close()
-
-
-
-
-
diff --git a/gluon/reserved_sql_keywords.py b/gluon/reserved_sql_keywords.py
index b98af35a..cd3c4b55 100644
--- a/gluon/reserved_sql_keywords.py
+++ b/gluon/reserved_sql_keywords.py
@@ -1711,11 +1711,3 @@ ADAPTERS = {
 }
 
 ADAPTERS['all'] = reduce(lambda a,b:a.union(b),(x for x in ADAPTERS.values()))
-
-
-
-
-
-
-
-
diff --git a/gluon/restricted.py b/gluon/restricted.py
index ee59b16c..6533af47 100644
--- a/gluon/restricted.py
+++ b/gluon/restricted.py
@@ -305,11 +305,3 @@ def snapshot(info=None, context=5, code=None, environment=None):
             s[k] = BEAUTIFY(v)
 
     return s
-
-
-
-
-
-
-
-
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 56af7d10..10227cde 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -1316,4 +1316,3 @@ def get_effective_router(appname):
     if not routers or appname not in routers:
         return None
     return Storage(routers[appname])  # return a copy
-
diff --git a/gluon/rocket.py b/gluon/rocket.py
index e0a138a4..d8e832ae 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1876,9 +1876,3 @@ def demo():
 
 if __name__=='__main__':
     demo()
-
-
-
-
-
-
diff --git a/gluon/sanitizer.py b/gluon/sanitizer.py
index 80c94c03..6708a983 100644
--- a/gluon/sanitizer.py
+++ b/gluon/sanitizer.py
@@ -222,11 +222,3 @@ def sanitize(text, permitted_tags=[
     if not isinstance(text, str): return str(text)
     return XssCleaner(permitted_tags=permitted_tags,
                       allowed_attributes=allowed_attributes).strip(text, escape)
-
-
-
-
-
-
-
-
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 9c12ad0a..9f4a5a4a 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -962,4 +962,3 @@ def main():
 
 if __name__=='__main__':
     main()
-
diff --git a/gluon/serializers.py b/gluon/serializers.py
index 5c18db09..b9f2b04c 100644
--- a/gluon/serializers.py
+++ b/gluon/serializers.py
@@ -111,11 +111,3 @@ def rss(feed):
                 pubDate=entry.get('created_on', now)
                 ) for entry in feed.get('entries',[])])
     return rss2.dumps(rss)
-
-
-
-
-
-
-
-
diff --git a/gluon/settings.py b/gluon/settings.py
index 6d0bea7a..655e6467 100644
--- a/gluon/settings.py
+++ b/gluon/settings.py
@@ -36,6 +36,3 @@ global_settings.is_jython = \
     'java' in sys.platform.lower() or \
     hasattr(sys, 'JYTHON_JAR') or \
     str(sys.copyright).find('Jython') > 0
-
-
-
diff --git a/gluon/shell.py b/gluon/shell.py
index 620dfbc3..10469a1c 100644
--- a/gluon/shell.py
+++ b/gluon/shell.py
@@ -424,11 +424,3 @@ def execute_from_command_line(argv=None):
 
 if __name__ == '__main__':
     execute_from_command_line()
-
-
-
-
-
-
-
-
diff --git a/gluon/sql.py b/gluon/sql.py
index cbbd4451..41dadbea 100644
--- a/gluon/sql.py
+++ b/gluon/sql.py
@@ -3,11 +3,3 @@
 __all__ = ['DAL','Field','DRIVERS']
 
 from dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, DRIVERS, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType
-
-
-
-
-
-
-
-
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 0e18ce0c..8ffae918 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -2747,4 +2747,3 @@ class ExporterXML(ExportClass):
             out.write('</row>\n')
         out.write('</rows>')
         return str(out.getvalue())
-
diff --git a/gluon/storage.py b/gluon/storage.py
index e7c027d4..a90ccd3d 100644
--- a/gluon/storage.py
+++ b/gluon/storage.py
@@ -258,11 +258,3 @@ class List(list):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
-
-
diff --git a/gluon/streamer.py b/gluon/streamer.py
index 5b192796..1b6dab2b 100644
--- a/gluon/streamer.py
+++ b/gluon/streamer.py
@@ -118,4 +118,3 @@ def stream_file_or_304_or_206(
     else:
         wrapped = streamer(stream, chunk_size=chunk_size, bytes=bytes)
     raise HTTP(status, wrapped, **headers)
-
diff --git a/gluon/template.py b/gluon/template.py
index ec05e4a6..e531860c 100644
--- a/gluon/template.py
+++ b/gluon/template.py
@@ -889,11 +889,3 @@ def render(content = "hello world",
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
-
-
diff --git a/gluon/tools.py b/gluon/tools.py
index 72123114..75eac67c 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -5022,9 +5022,3 @@ class Wiki(object):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
diff --git a/gluon/utf8.py b/gluon/utf8.py
index 06402c61..5882c400 100644
--- a/gluon/utf8.py
+++ b/gluon/utf8.py
@@ -652,7 +652,3 @@ if __name__ == '__main__':
        print "DOCTESTS FINISHED"
 
     doctests()
-
-
-
-
diff --git a/gluon/utils.py b/gluon/utils.py
index e3287f49..085f6d44 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -254,11 +254,3 @@ def is_valid_ip_address(address):
             return False
     else: # do not know what to do? assume it is a valid address
         return True
-
-
-
-
-
-
-
-
diff --git a/gluon/validators.py b/gluon/validators.py
index 49fabdf1..e577dbcc 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -3248,12 +3248,3 @@ class IS_IPV4(Validator):
 if __name__ == '__main__':
     import doctest
     doctest.testmod(optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
-
-
-
-
-
-
-
-
-
diff --git a/gluon/widget.py b/gluon/widget.py
index 7b3cb53c..18b98bab 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -1218,13 +1218,3 @@ end tell
         except:
             pass
     logging.shutdown()
-
-
-
-
-
-
-
-
-
-
diff --git a/gluon/winservice.py b/gluon/winservice.py
index 67933796..3d448496 100644
--- a/gluon/winservice.py
+++ b/gluon/winservice.py
@@ -166,11 +166,3 @@ def web2py_windows_service_handler(argv=None, opt_file='options'):
 
 if __name__ == '__main__':
     web2py_windows_service_handler()
-
-
-
-
-
-
-
-
diff --git a/gluon/xmlrpc.py b/gluon/xmlrpc.py
index 756f08b7..7fa29978 100644
--- a/gluon/xmlrpc.py
+++ b/gluon/xmlrpc.py
@@ -19,11 +19,3 @@ def handler(request, response, methods):
     response.headers['Content-Type'] = 'text/xml'
     dispatch = getattr(dispatcher, '_dispatch', None)
     return dispatcher._marshaled_dispatch(request.body.read(), dispatch)
-
-
-
-
-
-
-
-
diff --git a/isapiwsgihandler.py b/isapiwsgihandler.py
index bce968b1..ce10023c 100644
--- a/isapiwsgihandler.py
+++ b/isapiwsgihandler.py
@@ -33,9 +33,3 @@ if __name__=='__main__':
                               ScriptMapUpdate = "replace")
     params.VirtualDirs = [vd]
     HandleCommandLine(params)
-
-
-
-
-
-
diff --git a/modpythonhandler.py b/modpythonhandler.py
index 0973d6d6..ae2fa49e 100755
--- a/modpythonhandler.py
+++ b/modpythonhandler.py
@@ -222,9 +222,3 @@ def handler(req):
 
     Handler(req).run(gluon.main.wsgibase)
     return apache.OK
-
-
-
-
-
-
diff --git a/options_std.py b/options_std.py
index f00acfd8..feb0a48f 100644
--- a/options_std.py
+++ b/options_std.py
@@ -31,5 +31,3 @@ shutdown_timeout = 5
 folder = os.getcwd()
 extcron = None
 nocron = None
-
-
diff --git a/router.example.py b/router.example.py
index 25cc6aba..f2e11498 100644
--- a/router.example.py
+++ b/router.example.py
@@ -209,9 +209,3 @@ def __routes_doctest():
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
diff --git a/routes.example.py b/routes.example.py
index 206b4f15..cab718b3 100644
--- a/routes.example.py
+++ b/routes.example.py
@@ -197,9 +197,3 @@ def __routes_doctest():
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-
-
-
-
-
-
diff --git a/scgihandler.py b/scgihandler.py
index d18fafa8..acb055f8 100755
--- a/scgihandler.py
+++ b/scgihandler.py
@@ -72,8 +72,3 @@ if SOFTCRON:
 # uncomment one of the two rows below depending on the SCGIWSGI server installed
 #scgi.serve_application(application, '', 4000).run()
 SCGIServer(application, port=4000).enable_sighandler().run()
-
-
-
-
-
diff --git a/scripts/fixws.py b/scripts/fixws.py
index 744657d7..8a1e7433 100755
--- a/scripts/fixws.py
+++ b/scripts/fixws.py
@@ -17,7 +17,7 @@ def write_fileb(filename, value, mode='wb'):
 for filename in glob.glob(sys.argv[1]):
     data1 = read_fileb(filename)
     write_fileb(filename + '.bak2', data1)
-    data2lines = read_fileb(filename).split('\n')
+    data2lines = read_fileb(filename).strip().split('\n')
     data2 = '\n'.join([line.rstrip().replace('\t','    '*2) for line in data2lines])+'\n'
     write_fileb(filename, data2)
     print filename, len(data1)-len(data2)
diff --git a/setup.py b/setup.py
index e4a82eb8..37e06275 100644
--- a/setup.py
+++ b/setup.py
@@ -77,4 +77,3 @@ if __name__ == '__main__':
     #s = raw_input('>')
     #if s.lower()[:1]=='y':
     start()
-
diff --git a/setup_app.py b/setup_app.py
index 54e169cc..11df7c33 100755
--- a/setup_app.py
+++ b/setup_app.py
@@ -52,9 +52,3 @@ setup(app=['web2py.py'],
             'packages': contributed_modules,
             }},
       setup_requires=['py2app'])
-
-
-
-
-
-
diff --git a/setup_exe.py b/setup_exe.py
index 7855ab38..92d29639 100755
--- a/setup_exe.py
+++ b/setup_exe.py
@@ -182,9 +182,3 @@ if not make_zip and not remove_build_files:
 
 print "Finished!"
 print "Enjoy web2py " +web2py_version_line
-
-
-
-
-
-
diff --git a/web2py.py b/web2py.py
index 5ce0c209..125ddcdb 100755
--- a/web2py.py
+++ b/web2py.py
@@ -25,9 +25,3 @@ if __name__ == '__main__':
     except:
         sys.stderr.write('Sorry, -K only supported for python 2.6-2.7\n')
     gluon.widget.start(cron=True)
-
-
-
-
-
-
diff --git a/wsgihandler.py b/wsgihandler.py
index bb3c9f77..d43f37ca 100644
--- a/wsgihandler.py
+++ b/wsgihandler.py
@@ -42,9 +42,3 @@ else:
 if SOFTCRON:
     from gluon.settings import global_settings
     global_settings.web2py_crontype = 'soft'
-
-
-
-
-
-

From 4b2ba185aee7edc915410a269c88a96857b25508 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 12:33:53 -0500
Subject: [PATCH 38/49] many pep8 improvements

---
 VERSION                                       |    2 +-
 __init__.py                                   |    1 -
 anyserver.py                                  |  112 +-
 cgihandler.py                                 |    2 +-
 fcgihandler.py                                |    2 +-
 gaehandler.py                                 |    5 +-
 gluon/__init__.py                             |    2 +-
 gluon/admin.py                                |   49 +-
 gluon/cache.py                                |   78 +-
 gluon/compileapp.py                           |  144 +-
 gluon/contenttype.py                          |   10 +-
 gluon/contrib/AuthorizeNet.py                 |   65 +-
 gluon/contrib/DowCommerce.py                  |   57 +-
 gluon/contrib/__init__.py                     |    1 -
 gluon/contrib/autolinks.py                    |   45 +-
 gluon/contrib/gae_memcache.py                 |   23 +-
 gluon/contrib/gae_retry.py                    |   13 +-
 gluon/contrib/generics.py                     |   41 +-
 gluon/contrib/google_wallet.py                |    7 +-
 gluon/contrib/gql.py                          |    2 +-
 gluon/contrib/imageutils.py                   |    2 +
 gluon/contrib/login_methods/__init__.py       |    3 -
 gluon/contrib/login_methods/basic_auth.py     |    8 +-
 .../login_methods/browserid_account.py        |   42 +-
 gluon/contrib/login_methods/cas_auth.py       |  109 +-
 .../contrib/login_methods/dropbox_account.py  |   79 +-
 gluon/contrib/login_methods/email_auth.py     |    8 +-
 .../login_methods/extended_login_form.py      |   14 +-
 .../login_methods/gae_google_account.py       |    3 +-
 gluon/contrib/login_methods/ldap_auth.py      |   43 +-
 .../contrib/login_methods/linkedin_account.py |   22 +-
 gluon/contrib/login_methods/loginza.py        |   78 +-
 gluon/contrib/login_methods/motp_auth.py      |   28 +-
 .../contrib/login_methods/oauth10a_account.py |   35 +-
 .../contrib/login_methods/oauth20_account.py  |   49 +-
 gluon/contrib/login_methods/openid_auth.py    |  169 +-
 gluon/contrib/login_methods/pam_auth.py       |    3 +-
 gluon/contrib/login_methods/rpx_account.py    |   88 +-
 gluon/contrib/login_methods/x509_auth.py      |   45 +-
 gluon/contrib/memdb.py                        |  123 +-
 gluon/contrib/minify/cssmin.py                |   65 +-
 gluon/contrib/minify/htmlmin.py               |   18 +-
 gluon/contrib/minify/jsmin.py                 |   71 +-
 gluon/contrib/minify/minify.py                |   58 +-
 gluon/contrib/pam.py                          |   35 +-
 gluon/contrib/qdb.py                          |   49 +-
 gluon/contrib/redis_cache.py                  |   27 +-
 gluon/contrib/redis_session.py                |   19 +-
 gluon/contrib/shell.py                        |   17 +-
 gluon/contrib/simplejsonrpc.py                |    9 +-
 gluon/contrib/sms_utils.py                    |  213 +-
 gluon/contrib/spreadsheet.py                  |  126 +-
 gluon/contrib/stripe.py                       |   44 +-
 gluon/contrib/taskbar_widget.py               |   26 +-
 gluon/contrib/timecollect.py                  |   33 +-
 gluon/contrib/user_agent_parser.py            |  186 +-
 gluon/contrib/webclient.py                    |   93 +-
 gluon/contrib/websocket_messaging.py          |   57 +-
 gluon/custom_import.py                        |   53 +-
 gluon/dal.py                                  |    2 +
 gluon/debug.py                                |    7 +-
 gluon/decoder.py                              |   51 +-
 gluon/fileutils.py                            |   64 +-
 gluon/globals.py                              |  200 +-
 gluon/highlight.py                            |   80 +-
 gluon/html.py                                 |  521 +++--
 gluon/http.py                                 |   19 +-
 gluon/import_all.py                           |   14 +-
 gluon/languages.py                            |  248 ++-
 gluon/main.py                                 |  159 +-
 gluon/messageboxhandler.py                    |    1 +
 gluon/myregex.py                              |   10 +-
 gluon/newcron.py                              |  111 +-
 gluon/portalocker.py                          |   32 +-
 gluon/reserved_sql_keywords.py                |   21 +-
 gluon/restricted.py                           |   75 +-
 gluon/rewrite.py                              |  299 +--
 gluon/rocket.py                               |  213 +-
 gluon/sanitizer.py                            |   36 +-
 gluon/scheduler.py                            |  455 ++--
 gluon/serializers.py                          |   68 +-
 gluon/settings.py                             |    2 +-
 gluon/shell.py                                |   82 +-
 gluon/sql.py                                  |    2 +-
 gluon/sqlhtml.py                              | 1194 ++++++-----
 gluon/storage.py                              |   67 +-
 gluon/streamer.py                             |   24 +-
 gluon/template.py                             |  176 +-
 gluon/tests/test_cache.py                     |    5 +-
 gluon/tests/test_contribs.py                  |    6 +-
 gluon/tests/test_html.py                      |   11 +-
 gluon/tests/test_is_url.py                    |  156 +-
 gluon/tests/test_languages.py                 |    8 +-
 gluon/tests/test_markmin.py                   |    2 +-
 gluon/tests/test_router.py                    | 1381 +++++++-----
 gluon/tests/test_routes.py                    |  263 ++-
 gluon/tests/test_storage.py                   |    3 -
 gluon/tests/test_template.py                  |   32 +-
 gluon/tests/test_utils.py                     |    1 -
 gluon/tests/test_web.py                       |   25 +-
 gluon/tools.py                                | 1872 +++++++++--------
 gluon/utf8.py                                 | 1223 ++++++-----
 gluon/utils.py                                |  119 +-
 gluon/validators.py                           |  370 ++--
 gluon/widget.py                               |   96 +-
 gluon/winservice.py                           |   23 +-
 isapiwsgihandler.py                           |   18 +-
 modpythonhandler.py                           |    2 +-
 options_std.py                                |    7 +-
 router.example.py                             |    5 +-
 routes.example.py                             |   25 +-
 scgihandler.py                                |    4 +-
 setup.py                                      |   14 +-
 setup_app.py                                  |   26 +-
 setup_exe.py                                  |   79 +-
 web2py.py                                     |    6 +-
 wsgihandler.py                                |    4 +-
 117 files changed, 7160 insertions(+), 5670 deletions(-)

diff --git a/VERSION b/VERSION
index ba504ebd..a93bd69e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 10:37:01) dev
+Version 2.1.1 (2012-10-19 12:33:48) dev
diff --git a/__init__.py b/__init__.py
index 8b137891..e69de29b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1 +0,0 @@
-
diff --git a/anyserver.py b/anyserver.py
index 46daf4ec..473cceaa 100644
--- a/anyserver.py
+++ b/anyserver.py
@@ -16,44 +16,47 @@ import urllib
 
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 import gluon.main
 from gluon.fileutils import read_file, write_file
 
+
 class Servers:
     @staticmethod
     def cgi(app, address=None, **options):
         from wsgiref.handlers import CGIHandler
-        CGIHandler().run(app) # Just ignore host and port here
+        CGIHandler().run(app)  # Just ignore host and port here
 
     @staticmethod
-    def flup(app,address, **options):
+    def flup(app, address, **options):
         import flup.server.fcgi
         flup.server.fcgi.WSGIServer(app, bindAddress=address).run()
 
     @staticmethod
-    def wsgiref(app,address,**options): # pragma: no cover
+    def wsgiref(app, address, **options):  # pragma: no cover
         from wsgiref.simple_server import make_server, WSGIRequestHandler
+
         class QuietHandler(WSGIRequestHandler):
-            def log_request(*args, **kw): pass
+            def log_request(*args, **kw):
+                pass
         options['handler_class'] = QuietHandler
-        srv = make_server(address[0],address[1],app,**options)
+        srv = make_server(address[0], address[1], app, **options)
         srv.serve_forever()
 
     @staticmethod
-    def cherrypy(app,address, **options):
+    def cherrypy(app, address, **options):
         from cherrypy import wsgiserver
         server = wsgiserver.CherryPyWSGIServer(address, app)
         server.start()
 
     @staticmethod
-    def rocket(app,address, **options):
+    def rocket(app, address, **options):
         from gluon.rocket import CherryPyWSGIServer
         server = CherryPyWSGIServer(address, app)
         server.start()
 
     @staticmethod
-    def rocket_with_repoze_profiler(app,address, **options):
+    def rocket_with_repoze_profiler(app, address, **options):
         from gluon.rocket import CherryPyWSGIServer
         from repoze.profile.profiler import AccumulatingProfileMiddleware
         from gluon.settings import global_settings
@@ -63,44 +66,46 @@ class Servers:
             log_filename='wsgi.prof',
             discard_first_request=True,
             flush_at_shutdown=True,
-            path = '/__profile__'
-            )
+            path='/__profile__'
+        )
         server = CherryPyWSGIServer(address, wrapped)
         server.start()
 
     @staticmethod
-    def paste(app,address,**options):
+    def paste(app, address, **options):
         from paste import httpserver
         from paste.translogger import TransLogger
         httpserver.serve(app, host=address[0], port=address[1], **options)
 
     @staticmethod
-    def fapws(app,address, **options):
+    def fapws(app, address, **options):
         import fapws._evwsgi as evwsgi
         from fapws import base
-        evwsgi.start(address[0],str(address[1]))
+        evwsgi.start(address[0], str(address[1]))
         evwsgi.set_base_module(base)
+
         def app(environ, start_response):
             environ['wsgi.multiprocess'] = False
             return app(environ, start_response)
-        evwsgi.wsgi_cb(('',app))
+        evwsgi.wsgi_cb(('', app))
         evwsgi.run()
 
-
     @staticmethod
-    def gevent(app,address, **options):
-        from gevent import monkey; monkey.patch_all()
+    def gevent(app, address, **options):
+        from gevent import monkey
+        monkey.patch_all()
         from gevent import pywsgi
         from gevent.pool import Pool
-        pywsgi.WSGIServer(address, app, spawn = 'workers' in options and Pool(int(options.workers)) or 'default').serve_forever()
+        pywsgi.WSGIServer(address, app, spawn='workers' in options and Pool(
+            int(options.workers)) or 'default').serve_forever()
 
     @staticmethod
-    def bjoern(app,address, **options):
+    def bjoern(app, address, **options):
         import bjoern
         bjoern.run(app, *address)
 
     @staticmethod
-    def tornado(app,address, **options):
+    def tornado(app, address, **options):
         import tornado.wsgi
         import tornado.httpserver
         import tornado.ioloop
@@ -110,7 +115,7 @@ class Servers:
         tornado.ioloop.IOLoop.instance().start()
 
     @staticmethod
-    def twisted(app,address, **options):
+    def twisted(app, address, **options):
         from twisted.web import server, wsgi
         from twisted.python.threadpool import ThreadPool
         from twisted.internet import reactor
@@ -122,42 +127,44 @@ class Servers:
         reactor.run()
 
     @staticmethod
-    def diesel(app,address, **options):
+    def diesel(app, address, **options):
         from diesel.protocols.wsgi import WSGIApplication
         app = WSGIApplication(app, port=address[1])
         app.run()
 
     @staticmethod
-    def gunicorn(app,address, **options):
+    def gunicorn(app, address, **options):
         from gunicorn.app.base import Application
         config = {'bind': "%s:%d" % address}
         config.update(options)
         sys.argv = ['anyserver.py']
+
         class GunicornApplication(Application):
             def init(self, parser, opts, args):
                 return config
+
             def load(self):
                 return app
         g = GunicornApplication()
         g.run()
 
     @staticmethod
-    def eventlet(app,address, **options):
+    def eventlet(app, address, **options):
         from eventlet import wsgi, listen
         wsgi.server(listen(address), app)
 
     @staticmethod
-    def mongrel2(app,address,**options):
+    def mongrel2(app, address, **options):
         import uuid
         sys.path.append(os.path.abspath(os.path.dirname(__file__)))
         from mongrel2 import handler
         conn = handler.Connection(str(uuid.uuid4()),
                                   "tcp://127.0.0.1:9997",
                                   "tcp://127.0.0.1:9996")
-        mongrel2_handler(app,conn,debug=False)
+        mongrel2_handler(app, conn, debug=False)
 
 
-def run(servername,ip,port,softcron=True,logging=False,profiler=None):
+def run(servername, ip, port, softcron=True, logging=False, profiler=None):
     if logging:
         application = gluon.main.appfactory(wsgiapp=gluon.main.wsgibase,
                                             logfilename='httpserver.log',
@@ -167,9 +174,10 @@ def run(servername,ip,port,softcron=True,logging=False,profiler=None):
     if softcron:
         from gluon.settings import global_settings
         global_settings.web2py_crontype = 'soft'
-    getattr(Servers,servername)(application,(ip,int(port)))
+    getattr(Servers, servername)(application, (ip, int(port)))
 
-def mongrel2_handler(application,conn,debug=False):
+
+def mongrel2_handler(application, conn, debug=False):
     """
     Based on :
     https://github.com/berry/Mongrel2-WSGI-Handler/blob/master/wsgi-handler.py
@@ -194,20 +202,23 @@ def mongrel2_handler(application,conn,debug=False):
     # and responses. Unless I have missed something.
 
     while True:
-        if debug: print "WAITING FOR REQUEST"
+        if debug:
+            print "WAITING FOR REQUEST"
 
         # receive a request
         req = conn.recv()
-        if debug: print "REQUEST BODY: %r\n" % req.body
+        if debug:
+            print "REQUEST BODY: %r\n" % req.body
 
         if req.is_disconnect():
-            if debug: print "DISCONNECT"
-            continue #effectively ignore the disconnect from the client
+            if debug:
+                print "DISCONNECT"
+            continue  # effectively ignore the disconnect from the client
 
         # Set a couple of environment attributes a.k.a. header attributes
         # that are a must according to PEP 333
         environ = req.headers
-        environ['SERVER_PROTOCOL'] = 'HTTP/1.1' # SimpleHandler expects a server_protocol, lets assume it is HTTP 1.1
+        environ['SERVER_PROTOCOL'] = 'HTTP/1.1'  # SimpleHandler expects a server_protocol, lets assume it is HTTP 1.1
         environ['REQUEST_METHOD'] = environ['METHOD']
         if ':' in environ['Host']:
             environ['SERVER_NAME'] = environ['Host'].split(':')[0]
@@ -215,17 +226,19 @@ def mongrel2_handler(application,conn,debug=False):
         else:
             environ['SERVER_NAME'] = environ['Host']
             environ['SERVER_PORT'] = ''
-        environ['SCRIPT_NAME'] = '' # empty for now
+        environ['SCRIPT_NAME'] = ''  # empty for now
         environ['PATH_INFO'] = urllib.unquote(environ['PATH'])
         if '?' in environ['URI']:
             environ['QUERY_STRING'] = environ['URI'].split('?')[1]
         else:
             environ['QUERY_STRING'] = ''
         if 'Content-Length' in environ:
-            environ['CONTENT_LENGTH'] = environ['Content-Length'] # necessary for POST to work with Django
+            environ['CONTENT_LENGTH'] = environ[
+                'Content-Length']  # necessary for POST to work with Django
         environ['wsgi.input'] = req.body
 
-        if debug: print "ENVIRON: %r\n" % environ
+        if debug:
+            print "ENVIRON: %r\n" % environ
 
         # SimpleHandler needs file-like stream objects for
         # requests, errors and responses
@@ -234,7 +247,8 @@ def mongrel2_handler(application,conn,debug=False):
         respIO = StringIO.StringIO()
 
         # execute the application
-        handler = SimpleHandler(reqIO, respIO, errIO, environ, multithread = False, multiprocess = False)
+        handler = SimpleHandler(reqIO, respIO, errIO, environ,
+                                multithread=False, multiprocess=False)
         handler.run(application)
 
         # Get the response and filter out the response (=data) itself,
@@ -258,11 +272,15 @@ def mongrel2_handler(application,conn,debug=False):
         errors = errIO.getvalue()
 
         # return the response
-        if debug: print "RESPONSE: %r\n" % response
+        if debug:
+            print "RESPONSE: %r\n" % response
         if errors:
-            if debug: print "ERRORS: %r" % errors
+            if debug:
+                print "ERRORS: %r" % errors
             data = "%s\r\n\r\n%s" % (data, errors)
-        conn.reply_http(req, data, code = code, status = status, headers = headers)
+        conn.reply_http(
+            req, data, code=code, status=status, headers=headers)
+
 
 def main():
     usage = "python anyserver.py -s tornado -i 127.0.0.1 -p 8000 -l -P"
@@ -282,7 +300,7 @@ def main():
                       default=False,
                       dest='profiler',
                       help='profiler filename')
-    servers = ', '.join(x for x in dir(Servers) if not x[0]=='_')
+    servers = ', '.join(x for x in dir(Servers) if not x[0] == '_')
     parser.add_option('-s',
                       '--server',
                       default='rocket',
@@ -304,8 +322,10 @@ def main():
                       dest='workers',
                       help='number of workers number')
     (options, args) = parser.parse_args()
-    print 'starting %s on %s:%s...' % (options.server,options.ip,options.port)
-    run(options.server,options.ip,options.port,logging=options.logging,profiler=options.profiler)
+    print 'starting %s on %s:%s...' % (
+        options.server, options.ip, options.port)
+    run(options.server, options.ip, options.port,
+        logging=options.logging, profiler=options.profiler)
 
-if __name__=='__main__':
+if __name__ == '__main__':
     main()
diff --git a/cgihandler.py b/cgihandler.py
index 3c919199..0929ed15 100755
--- a/cgihandler.py
+++ b/cgihandler.py
@@ -56,7 +56,7 @@ import wsgiref.handlers
 
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
 import gluon.main
 
diff --git a/fcgihandler.py b/fcgihandler.py
index 76cda9b8..a3d4a5df 100755
--- a/fcgihandler.py
+++ b/fcgihandler.py
@@ -34,7 +34,7 @@ import os
 
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
 import gluon.main
 import gluon.contrib.gateways.fcgi as fcgi
diff --git a/gaehandler.py b/gaehandler.py
index 0965fffe..b039d40b 100755
--- a/gaehandler.py
+++ b/gaehandler.py
@@ -33,7 +33,7 @@ import wsgiref.handlers
 import datetime
 
 path = os.path.dirname(os.path.abspath(__file__))
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
 sys.modules['cPickle'] = sys.modules['pickle']
 
@@ -83,7 +83,7 @@ def wsgiapp(env, res):
     if global_settings.web2py_runtime == 'gae:development':
         gluon.admin.create_missing_folders()
 
-    web2py_path = global_settings.applications_parent # backward compatibility
+    web2py_path = global_settings.applications_parent  # backward compatibility
 
     return gluon.main.wsgibase(env, res)
 
@@ -91,6 +91,7 @@ def wsgiapp(env, res):
 if LOG_STATS or DEBUG:
     wsgiapp = log_stats(wsgiapp)
 
+
 def main():
     """Run the wsgi app"""
     run_wsgi_app(wsgiapp)
diff --git a/gluon/__init__.py b/gluon/__init__.py
index 7065a70a..3e9801f7 100644
--- a/gluon/__init__.py
+++ b/gluon/__init__.py
@@ -10,7 +10,7 @@ Web2Py framework modules
 ========================
 """
 
-__all__ = ['A', 'B', 'BEAUTIFY', 'BODY', 'BR', 'CAT', 'CENTER', 'CLEANUP', 'CODE', 'CRYPT', 'DAL', 'DIV', 'EM', 'EMBED', 'FIELDSET', 'FORM', 'Field', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'HEAD', 'HR', 'HTML', 'HTTP', 'I', 'IFRAME', 'IMG', 'INPUT', 'IS_ALPHANUMERIC', 'IS_DATE', 'IS_DATETIME', 'IS_DATETIME_IN_RANGE', 'IS_DATE_IN_RANGE', 'IS_DECIMAL_IN_RANGE', 'IS_EMAIL', 'IS_EMPTY_OR', 'IS_EQUAL_TO', 'IS_EXPR', 'IS_FLOAT_IN_RANGE', 'IS_IMAGE', 'IS_INT_IN_RANGE', 'IS_IN_DB', 'IS_IN_SET', 'IS_IPV4', 'IS_LENGTH', 'IS_LIST_OF', 'IS_LOWER', 'IS_MATCH', 'IS_NOT_EMPTY', 'IS_NOT_IN_DB', 'IS_NULL_OR', 'IS_SLUG', 'IS_STRONG', 'IS_TIME', 'IS_UPLOAD_FILENAME', 'IS_UPPER', 'IS_URL', 'LABEL', 'LEGEND', 'LI', 'LINK', 'LOAD', 'MARKMIN', 'MENU', 'META', 'OBJECT', 'OL', 'ON', 'OPTGROUP', 'OPTION', 'P', 'PRE', 'SCRIPT', 'SELECT', 'SPAN', 'SQLFORM', 'SQLTABLE', 'STRONG', 'STYLE', 'TABLE', 'TAG', 'TBODY', 'TD', 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'UL', 'URL', 'XHTML', 'XML','redirect','current','embed64']
+__all__ = ['A', 'B', 'BEAUTIFY', 'BODY', 'BR', 'CAT', 'CENTER', 'CLEANUP', 'CODE', 'CRYPT', 'DAL', 'DIV', 'EM', 'EMBED', 'FIELDSET', 'FORM', 'Field', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'HEAD', 'HR', 'HTML', 'HTTP', 'I', 'IFRAME', 'IMG', 'INPUT', 'IS_ALPHANUMERIC', 'IS_DATE', 'IS_DATETIME', 'IS_DATETIME_IN_RANGE', 'IS_DATE_IN_RANGE', 'IS_DECIMAL_IN_RANGE', 'IS_EMAIL', 'IS_EMPTY_OR', 'IS_EQUAL_TO', 'IS_EXPR', 'IS_FLOAT_IN_RANGE', 'IS_IMAGE', 'IS_INT_IN_RANGE', 'IS_IN_DB', 'IS_IN_SET', 'IS_IPV4', 'IS_LENGTH', 'IS_LIST_OF', 'IS_LOWER', 'IS_MATCH', 'IS_NOT_EMPTY', 'IS_NOT_IN_DB', 'IS_NULL_OR', 'IS_SLUG', 'IS_STRONG', 'IS_TIME', 'IS_UPLOAD_FILENAME', 'IS_UPPER', 'IS_URL', 'LABEL', 'LEGEND', 'LI', 'LINK', 'LOAD', 'MARKMIN', 'MENU', 'META', 'OBJECT', 'OL', 'ON', 'OPTGROUP', 'OPTION', 'P', 'PRE', 'SCRIPT', 'SELECT', 'SPAN', 'SQLFORM', 'SQLTABLE', 'STRONG', 'STYLE', 'TABLE', 'TAG', 'TBODY', 'TD', 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'UL', 'URL', 'XHTML', 'XML', 'redirect', 'current', 'embed64']
 
 from globals import current
 from html import *
diff --git a/gluon/admin.py b/gluon/admin.py
index ba392dbb..7f7888cb 100644
--- a/gluon/admin.py
+++ b/gluon/admin.py
@@ -23,6 +23,7 @@ from http import HTTP
 if not global_settings.web2py_runtime_gae:
     import site
 
+
 def apath(path='', r=None):
     """
     Builds a path inside an application folder
@@ -95,6 +96,7 @@ def app_pack_compiled(app, request, raise_ex=False):
             raise
         return None
 
+
 def app_cleanup(app, request):
     """
     Removes session, cache and error files
@@ -113,7 +115,7 @@ def app_cleanup(app, request):
     if os.path.exists(path):
         for f in os.listdir(path):
             try:
-                if f[:1]!='.': os.unlink(os.path.join(path,f))
+                if f[:1] != '.': os.unlink(os.path.join(path, f))
             except IOError:
                 r = False
 
@@ -122,7 +124,7 @@ def app_cleanup(app, request):
     if os.path.exists(path):
         for f in os.listdir(path):
             try:
-                if f[:1]!='.': recursive_unlink(os.path.join(path,f))
+                if f[:1] != '.': recursive_unlink(os.path.join(path, f))
             except IOError:
                 r = False
 
@@ -131,7 +133,7 @@ def app_cleanup(app, request):
     if os.path.exists(path):
         for f in os.listdir(path):
             try:
-                if f[:1]!='.': os.unlink(os.path.join(path,f))
+                if f[:1] != '.': os.unlink(os.path.join(path, f))
             except IOError:
                 r = False
     return r
@@ -158,7 +160,8 @@ def app_compile(app, request):
         remove_compiled_application(folder)
         return tb
 
-def app_create(app, request,force=False,key=None,info=False):
+
+def app_create(app, request, force=False, key=None, info=False):
     """
     Create a copy of welcome.w2p (scaffolding) app
 
@@ -186,17 +189,17 @@ def app_create(app, request,force=False,key=None,info=False):
             return False
     try:
         w2p_unpack('welcome.w2p', path)
-        for subfolder in ['models','views','controllers', 'databases',
-                          'modules','cron','errors','sessions',
-                          'languages','static','private','uploads']:
-            subpath =  os.path.join(path,subfolder)
+        for subfolder in ['models', 'views', 'controllers', 'databases',
+                          'modules', 'cron', 'errors', 'sessions',
+                          'languages', 'static', 'private', 'uploads']:
+            subpath = os.path.join(path, subfolder)
             if not os.path.exists(subpath):
                 os.mkdir(subpath)
         db = os.path.join(path, 'models', 'db.py')
         if os.path.exists(db):
             data = read_file(db)
             data = data.replace('<your secret key>',
-                                'sha512:'+(key or web2py_uuid()))
+                                'sha512:' + (key or web2py_uuid()))
             write_file(db, data)
         if info:
             return True, None
@@ -283,6 +286,7 @@ def app_uninstall(app, request):
     except Exception:
         return False
 
+
 def plugin_pack(app, plugin_name, request):
     """
     Builds a w2p package for the application
@@ -302,12 +306,14 @@ def plugin_pack(app, plugin_name, request):
         filename of the w2p file or None on error
     """
     try:
-        filename = apath('../deposit/web2py.plugin.%s.w2p' % plugin_name, request)
+        filename = apath(
+            '../deposit/web2py.plugin.%s.w2p' % plugin_name, request)
         w2p_pack_plugin(filename, apath(app, request), plugin_name)
         return filename
     except Exception:
         return False
 
+
 def plugin_install(app, fobj, request, filename):
     """
     Installs an application:
@@ -345,6 +351,7 @@ def plugin_install(app, fobj, request, filename):
         os.unlink(upname)
         return False
 
+
 def check_new_version(myversion, version_URL):
     """
     Compares current web2py's version with the latest stable web2py version.
@@ -375,6 +382,7 @@ def check_new_version(myversion, version_URL):
     else:
         return False, version
 
+
 def unzip(filename, dir, subfolder=''):
     """
     Unzips filename into dir (.zip only, no .gz etc)
@@ -382,7 +390,7 @@ def unzip(filename, dir, subfolder=''):
     """
     filename = abspath(filename)
     if not zipfile.is_zipfile(filename):
-        raise RuntimeError, 'Not a valid zipfile'
+        raise RuntimeError('Not a valid zipfile')
     zf = zipfile.ZipFile(filename)
     if not subfolder.endswith('/'):
         subfolder = subfolder + '/'
@@ -392,7 +400,7 @@ def unzip(filename, dir, subfolder=''):
             continue
         #print name[n:]
         if name.endswith('/'):
-            folder = os.path.join(dir,name[n:])
+            folder = os.path.join(dir, name[n:])
             if not os.path.exists(folder):
                 os.mkdir(folder)
         else:
@@ -421,7 +429,7 @@ def upgrade(request, url='http://web2py.com'):
     if not gluon_parent.endswith('/'):
         gluon_parent = gluon_parent + '/'
     (check, version) = check_new_version(web2py_version,
-                                         url+'/examples/default/version')
+                                         url + '/examples/default/version')
     if not check:
         return (False, 'Already latest version')
     if os.path.exists(os.path.join(gluon_parent, 'web2py.exe')):
@@ -442,35 +450,40 @@ def upgrade(request, url='http://web2py.com'):
     file = None
     try:
         write_file(filename, urllib.urlopen(full_url).read(), 'wb')
-    except Exception,e:
+    except Exception, e:
         return False, e
     try:
         unzip(filename, destination, subfolder)
         return True, None
-    except Exception,e:
+    except Exception, e:
         return False, e
 
+
 def add_path_first(path):
-    sys.path = [path]+[p for p in sys.path if (not p==path and not p==(path+'/'))]
+    sys.path = [path] + [p for p in sys.path if (
+        not p == path and not p == (path + '/'))]
     if not global_settings.web2py_runtime_gae:
         site.addsitedir(path)
 
+
 def create_missing_folders():
     if not global_settings.web2py_runtime_gae:
         for path in ('applications', 'deposit', 'site-packages', 'logs'):
             path = abspath(path, gluon=True)
             if not os.path.exists(path):
                 os.mkdir(path)
-    paths = (global_settings.gluon_parent, abspath('site-packages', gluon=True),  abspath('gluon', gluon=True), '')
+    paths = (global_settings.gluon_parent, abspath(
+        'site-packages', gluon=True), abspath('gluon', gluon=True), '')
     [add_path_first(path) for path in paths]
 
+
 def create_missing_app_folders(request):
     if not global_settings.web2py_runtime_gae:
         if request.folder not in global_settings.app_folders:
             for subfolder in ('models', 'views', 'controllers', 'databases',
                               'modules', 'cron', 'errors', 'sessions',
                               'languages', 'static', 'private', 'uploads'):
-                path =  os.path.join(request.folder, subfolder)
+                path = os.path.join(request.folder, subfolder)
                 if not os.path.exists(path):
                     os.mkdir(path)
             global_settings.app_folders.add(request.folder)
diff --git a/gluon/cache.py b/gluon/cache.py
index ec26711f..6c52c418 100644
--- a/gluon/cache.py
+++ b/gluon/cache.py
@@ -40,6 +40,7 @@ __all__ = ['Cache', 'lazy_cache']
 
 DEFAULT_TIME_EXPIRE = 300
 
+
 class CacheAbstract(object):
     """
     Abstract class for cache implementations.
@@ -73,7 +74,7 @@ class CacheAbstract(object):
         raise NotImplementedError
 
     def __call__(self, key, f,
-                time_expire = DEFAULT_TIME_EXPIRE):
+                 time_expire=DEFAULT_TIME_EXPIRE):
         """
         Tries retrieve the value corresponding to `key` from the cache of the
         object exists and if it did not expire, else it called the function `f`
@@ -130,6 +131,7 @@ class CacheAbstract(object):
             if r.match(str(key)):
                 del storage[key]
 
+
 class CacheInRam(CacheAbstract):
     """
     Ram based caching
@@ -147,8 +149,10 @@ class CacheInRam(CacheAbstract):
         self.request = request
 
     def initialize(self):
-        if self.initialized: return
-        else: self.initialized = True
+        if self.initialized:
+            return
+        else:
+            self.initialized = True
         self.locker.acquire()
         request = self.request
         if request:
@@ -172,13 +176,14 @@ class CacheInRam(CacheAbstract):
             self._clear(storage, regex)
 
         if not CacheAbstract.cache_stats_name in storage.keys():
-            storage[CacheAbstract.cache_stats_name] = {'hit_total': 0,'misses': 0}
+            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):
+                 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:
@@ -269,14 +274,15 @@ class CacheOnDisk(CacheAbstract):
             try:
                 storage = shelve.open(self.shelve_name)
             except:
-                logger.error('corrupted cache file %s, will try rebuild it' \
-                                 % (self.shelve_name))
+                logger.error('corrupted cache file %s, will try rebuild it'
+                             % (self.shelve_name))
                 storage = None
             if not storage and 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[CacheAbstract.cache_stats_name] = {
+                    'hit_total': 0, 'misses': 0}
             storage.sync()
         except Exception, e:
             if storage:
@@ -286,7 +292,8 @@ class CacheOnDisk(CacheAbstract):
                 portalocker.unlock(locker)
                 locker.close()
             locked = False
-            raise RuntimeError, 'unable to create/re-create cache file %s' % self.shelve_name
+            raise RuntimeError(
+                'unable to create/re-create cache file %s' % self.shelve_name)
         self.locker = locker
         self.locked = locked
         self.storage = storage
@@ -298,8 +305,10 @@ class CacheOnDisk(CacheAbstract):
         self.folder = folder
 
     def initialize(self):
-        if self.initialized: return
-        else: self.initialized = True
+        if self.initialized:
+            return
+        else:
+            self.initialized = True
         folder = self.folder
         request = self.request
 
@@ -312,8 +321,8 @@ class CacheOnDisk(CacheAbstract):
 
         ### 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')
+        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()
@@ -328,7 +337,7 @@ class CacheOnDisk(CacheAbstract):
             self._close_shelve_and_unlock()
 
     def __call__(self, key, f,
-                time_expire = DEFAULT_TIME_EXPIRE):
+                 time_expire=DEFAULT_TIME_EXPIRE):
         self.initialize()
         dt = time_expire
         storage = self._open_shelve_and_lock()
@@ -346,7 +355,7 @@ class CacheOnDisk(CacheAbstract):
             else:
                 value = f()
                 storage[key] = (now, value)
-                storage[CacheAbstract.cache_stats_name]['misses']+=1
+                storage[CacheAbstract.cache_stats_name]['misses'] += 1
                 storage.sync()
         finally:
             self._close_shelve_and_unlock()
@@ -365,8 +374,9 @@ class CacheOnDisk(CacheAbstract):
             self._close_shelve_and_unlock()
         return value
 
+
 class CacheAction(object):
-    def __init__(self,func,key,time_expire,cache,cache_model):
+    def __init__(self, func, key, time_expire, cache, cache_model):
         self.__name__ = func.__name__
         self.__doc__ = func.__doc__
         self.func = func
@@ -374,17 +384,18 @@ class CacheAction(object):
         self.time_expire = time_expire
         self.cache = cache
         self.cache_model = cache_model
-    def __call__(self,*a,**b):
+
+    def __call__(self, *a, **b):
         if not self.key:
-            key2 = self.__name__+':'+repr(a)+':'+repr(b)
+            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))
+            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')
+        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),
+                           lambda a=a, b=b: self.func(*a, **b),
                            self.time_expire)
 
 
@@ -424,9 +435,9 @@ class Cache(object):
                 logger.warning('no cache.disk (AttributeError)')
 
     def __call__(self,
-                 key = None,
-                 time_expire = DEFAULT_TIME_EXPIRE,
-                 cache_model = None):
+                 key=None,
+                 time_expire=DEFAULT_TIME_EXPIRE,
+                 cache_model=None):
         """
         Decorator function that can be used to cache any function/method.
 
@@ -459,8 +470,8 @@ class Cache(object):
         `request.env.path_info` as key.
         """
 
-        def tmp(func,cache=self,cache_model=cache_model):
-            return CacheAction(func,key,time_expire,self,cache_model)
+        def tmp(func, cache=self, cache_model=cache_model):
+            return CacheAction(func, key, time_expire, self, cache_model)
         return tmp
 
     @staticmethod
@@ -473,7 +484,7 @@ class Cache(object):
             cache_model(prefix + key, f, time_expire)
 
 
-def lazy_cache(key=None,time_expire=None,cache_model='ram'):
+def lazy_cache(key=None, time_expire=None, cache_model='ram'):
     """
     can be used to cache any function including in modules,
     as long as the cached function is only called within a web2py request
@@ -481,11 +492,12 @@ def lazy_cache(key=None,time_expire=None,cache_model='ram'):
     the 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):
+    def decorator(f, key=key, time_expire=time_expire, cache_model=cache_model):
         key = key or repr(f)
-        def g(*c,**d):
+
+        def g(*c, **d):
             from gluon import current
-            return current.cache(key,time_expire,cache_model)(f)(*c,**d)
+            return current.cache(key, time_expire, cache_model)(f)(*c, **d)
         g.__name__ = f.__name__
         return g
     return decorator
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index fc3eada8..36360d7a 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -48,7 +48,7 @@ except:
     logger.warning('unable to import py_compile')
 
 is_pypy = settings.global_settings.is_pypy
-is_gae  = settings.global_settings.web2py_runtime_gae
+is_gae = settings.global_settings.web2py_runtime_gae
 is_jython = settings.global_settings.is_jython
 
 pjoin = os.path.join
@@ -95,6 +95,7 @@ _TEST()
 CACHED_REGEXES = {}
 CACHED_REGEXES_MAX_SIZE = 1000
 
+
 def re_compile(regex):
     try:
         return CACHED_REGEXES[regex]
@@ -104,6 +105,7 @@ def re_compile(regex):
         compiled_regex = CACHED_REGEXES[regex] = re.compile(regex)
         return compiled_regex
 
+
 class mybuiltin(object):
     """
     NOTE could simple use a dict and populate it,
@@ -114,14 +116,16 @@ class mybuiltin(object):
         try:
             return getattr(__builtin__, key)
         except AttributeError:
-            raise KeyError, key
+            raise KeyError(key)
+
     def __setitem__(self, key, value):
         setattr(self, key, value)
 
+
 def LOAD(c=None, f='index', args=None, vars=None,
-         extension=None, target=None,ajax=False,ajax_trap=False,
-         url=None,user_signature=False, timeout=None, times=1,
-         content='loading...',**attr):
+         extension=None, target=None, ajax=False, ajax_trap=False,
+         url=None, user_signature=False, timeout=None, times=1,
+         content='loading...', **attr):
     """  LOAD a component into the action's document
 
     Timing options:
@@ -134,13 +138,14 @@ def LOAD(c=None, f='index', args=None, vars=None,
     is added on page loading without delay.
     """
     from html import TAG, DIV, URL, SCRIPT, XML
-    if args is None: args = []
+    if args is None:
+        args = []
     vars = Storage(vars or {})
-    target = target or 'c'+str(random.random())[2:]
-    attr['_id']=target
+    target = target or 'c' + str(random.random())[2:]
+    attr['_id'] = target
     request = current.request
     if '.' in f:
-        f, extension = f.rsplit('.',1)
+        f, extension = f.rsplit('.', 1)
     if url or ajax:
         url = url or URL(request.application, c, f, r=request,
                          args=args, vars=vars, extension=extension,
@@ -160,19 +165,20 @@ def LOAD(c=None, f='index', args=None, vars=None,
             if not isinstance(timeout, (int, long)):
                 raise ValueError("Timeout argument must be an integer or None")
             elif timeout <= 0:
-                raise ValueError("Timeout argument must be greater than zero or None")
+                raise ValueError(
+                    "Timeout argument must be greater than zero or None")
             statement = "web2py_component('%s','%s', %s, %s);" \
-            % (url, target, timeout, times)
+                % (url, target, timeout, times)
         else:
             statement = "web2py_component('%s','%s');" % (url, target)
         script = SCRIPT(statement, _type="text/javascript")
         if not content is None:
-            return TAG[''](script, DIV(content,**attr))
+            return TAG[''](script, DIV(content, **attr))
         else:
             return TAG[''](script)
 
     else:
-        if not isinstance(args,(list,tuple)):
+        if not isinstance(args, (list, tuple)):
             args = [args]
         c = c or request.controller
         other_request = Storage(request)
@@ -186,17 +192,17 @@ def LOAD(c=None, f='index', args=None, vars=None,
         other_request.post_vars = Storage()
         other_response = Response()
         other_request.env.path_info = '/' + \
-            '/'.join([request.application,c,f] + \
-                         map(str, other_request.args))
+            '/'.join([request.application, c, f] +
+                     map(str, other_request.args))
         other_request.env.query_string = \
             vars and URL(vars=vars).split('?')[1] or ''
         other_request.env.http_web2py_component_location = \
             request.env.path_info
         other_request.cid = target
         other_request.env.http_web2py_component_element = target
-        other_response.view = '%s/%s.%s' % (c,f, other_request.extension)
+        other_response.view = '%s/%s.%s' % (c, f, other_request.extension)
 
-        other_environment = copy.copy(current.globalenv) ### NASTY
+        other_environment = copy.copy(current.globalenv)  # NASTY
 
         other_response._view_environment = other_environment
         other_response.generic_patterns = \
@@ -218,40 +224,41 @@ def LOAD(c=None, f='index', args=None, vars=None,
         js = None
         if ajax_trap:
             link = URL(request.application, c, f, r=request,
-                            args=args, vars=vars, extension=extension,
-                            user_signature=user_signature)
+                       args=args, vars=vars, extension=extension,
+                       user_signature=user_signature)
             js = "web2py_trap_form('%s','%s');" % (link, target)
-        script = js and SCRIPT(js,_type="text/javascript") or ''
-        return TAG[''](DIV(XML(page),**attr),script)
-
+        script = js and SCRIPT(js, _type="text/javascript") or ''
+        return TAG[''](DIV(XML(page), **attr), script)
 
 
 class LoadFactory(object):
     """
     Attention: this helper is new and experimental
     """
-    def __init__(self,environment):
+    def __init__(self, environment):
         self.environment = environment
+
     def __call__(self, c=None, f='index', args=None, vars=None,
-                 extension=None, target=None,ajax=False,ajax_trap=False,
-                 url=None,user_signature=False, content='loading...',**attr):
-        if args is None: args = []
+                 extension=None, target=None, ajax=False, ajax_trap=False,
+                 url=None, user_signature=False, content='loading...', **attr):
+        if args is None:
+            args = []
         vars = Storage(vars or {})
         import globals
-        target = target or 'c'+str(random.random())[2:]
-        attr['_id']=target
+        target = target or 'c' + str(random.random())[2:]
+        attr['_id'] = target
         request = self.environment['request']
         if '.' in f:
-            f, extension = f.rsplit('.',1)
+            f, extension = f.rsplit('.', 1)
         if url or ajax:
             url = url or html.URL(request.application, c, f, r=request,
                                   args=args, vars=vars, extension=extension,
                                   user_signature=user_signature)
             script = html.SCRIPT('web2py_component("%s","%s")' % (url, target),
                                  _type="text/javascript")
-            return html.TAG[''](script, html.DIV(content,**attr))
+            return html.TAG[''](script, html.DIV(content, **attr))
         else:
-            if not isinstance(args,(list,tuple)):
+            if not isinstance(args, (list, tuple)):
                 args = [args]
             c = c or request.controller
 
@@ -266,15 +273,15 @@ class LoadFactory(object):
             other_request.post_vars = Storage()
             other_response = globals.Response()
             other_request.env.path_info = '/' + \
-                '/'.join([request.application,c,f] + \
-                             map(str, other_request.args))
+                '/'.join([request.application, c, f] +
+                         map(str, other_request.args))
             other_request.env.query_string = \
                 vars and html.URL(vars=vars).split('?')[1] or ''
             other_request.env.http_web2py_component_location = \
                 request.env.path_info
             other_request.cid = target
             other_request.env.http_web2py_component_element = target
-            other_response.view = '%s/%s.%s' % (c,f, other_request.extension)
+            other_response.view = '%s/%s.%s' % (c, f, other_request.extension)
             other_environment = copy.copy(self.environment)
             other_response._view_environment = other_environment
             other_response.generic_patterns = \
@@ -299,8 +306,8 @@ class LoadFactory(object):
                                 args=args, vars=vars, extension=extension,
                                 user_signature=user_signature)
                 js = "web2py_trap_form('%s','%s');" % (link, target)
-            script = js and html.SCRIPT(js,_type="text/javascript") or ''
-            return html.TAG[''](html.DIV(html.XML(page),**attr),script)
+            script = js and html.SCRIPT(js, _type="text/javascript") or ''
+            return html.TAG[''](html.DIV(html.XML(page), **attr), script)
 
 
 def local_import_aux(name, reload_force=False, app='welcome'):
@@ -321,7 +328,7 @@ def local_import_aux(name, reload_force=False, app='welcome'):
     This prevents conflict between applications and un-necessary execs.
     It can be used to import any module, including regular Python modules.
     """
-    items = name.replace('/','.')
+    items = name.replace('/', '.')
     name = "applications.%s.modules.%s" % (app, items)
     module = __import__(name)
     for item in name.split(".")[1:]:
@@ -355,12 +362,14 @@ OLD IMPLEMENTATION:
         file.close()
     imp.release_lock()
     if not module:
-        raise ImportError, "cannot find module %s in %s" % (filename, modulepath)
+        raise ImportError, "cannot find module %s in %s" % (
+            filename, modulepath)
     return module
 """
 
-_base_environment_ = dict((k,getattr(html,k)) for k  in html.__all__)
-_base_environment_.update((k,getattr(validators,k)) for k  in validators.__all__)
+_base_environment_ = dict((k, getattr(html, k)) for k in html.__all__)
+_base_environment_.update(
+    (k, getattr(validators, k)) for k in validators.__all__)
 _base_environment_['__builtins__'] = __builtins__
 _base_environment_['HTTP'] = HTTP
 _base_environment_['redirect'] = redirect
@@ -372,6 +381,7 @@ _base_environment_['SQLFORM'] = SQLFORM
 _base_environment_['SQLTABLE'] = SQLTABLE
 _base_environment_['LOAD'] = LOAD
 
+
 def build_environment(request, response, session, store_current=True):
     """
     Build the environment dictionary into which web2py files are executed.
@@ -384,7 +394,7 @@ def build_environment(request, response, session, store_current=True):
     # Enable standard conditional models (i.e., /*.py, /[controller]/*.py, and
     # /[controller]/[function]/*.py)
     response.models_to_run = [r'^\w+\.py$', r'^%s/\w+\.py$' % request.controller,
-        r'^%s/%s/\w+\.py$' % (request.controller, request.function)]
+                              r'^%s/%s/\w+\.py$' % (request.controller, request.function)]
 
     t = environment['T'] = translator(request)
     c = environment['cache'] = Cache(request)
@@ -398,23 +408,24 @@ def build_environment(request, response, session, store_current=True):
         current.cache = c
 
     global __builtins__
-    if is_jython: # jython hack
+    if is_jython:  # jython hack
         __builtins__ = mybuiltin()
-    elif is_pypy: # apply the same hack to pypy too
+    elif is_pypy:  # apply the same hack to pypy too
         __builtins__ = mybuiltin()
     else:
-        __builtins__['__import__'] = __builtin__.__import__ ### WHY?
+        __builtins__['__import__'] = __builtin__.__import__  # WHY?
     environment['request'] = request
     environment['response'] = response
     environment['session'] = session
     environment['local_import'] = \
-       lambda name, reload=False, app=request.application:\
-       local_import_aux(name,reload,app)
+        lambda name, reload=False, app=request.application:\
+        local_import_aux(name, reload, app)
     BaseAdapter.set_folder(pjoin(request.folder, 'databases'))
     response._view_environment = copy.copy(environment)
     custom_import_install()
     return environment
 
+
 def save_pyc(filename):
     """
     Bytecode compiles the file `filename`
@@ -431,7 +442,7 @@ def read_pyc(filename):
     """
     data = read_file(filename, 'rb')
     if not is_gae and data[:4] != imp.get_magic():
-        raise SystemError, 'compiled code is incompatible'
+        raise SystemError('compiled code is incompatible')
     return marshal.loads(data[8:])
 
 
@@ -458,7 +469,7 @@ def compile_models(folder):
     path = pjoin(folder, 'models')
     for file in listdir(path, '.+\.py$'):
         data = read_file(pjoin(path, file))
-        filename = pjoin(folder, 'compiled','models',file)
+        filename = pjoin(folder, 'compiled', 'models', file)
         mktree(filename)
         write_file(filename, data)
         save_pyc(filename)
@@ -473,14 +484,14 @@ def compile_controllers(folder):
     path = pjoin(folder, 'controllers')
     for file in listdir(path, '.+\.py$'):
         ### why is this here? save_pyc(pjoin(path, file))
-        data = read_file(pjoin(path,file))
+        data = read_file(pjoin(path, file))
         exposed = regex_expose.findall(data)
         for function in exposed:
             command = data + "\nresponse._vars=response._caller(%s)\n" % \
                 function
             filename = pjoin(folder, 'compiled', ('controllers/'
                                      + file[:-3]).replace('/', '_')
-                                     + '_' + function + '.py')
+                             + '_' + function + '.py')
             write_file(filename, command)
             save_pyc(filename)
             os.unlink(filename)
@@ -500,19 +511,19 @@ def run_models_in(environment):
         for model in listdir(cpath, '^models_\w+\.pyc$', 0):
             restricted(read_pyc(model), environment, layer=model)
         path = pjoin(cpath, 'models')
-        models = listdir(path, '^\w+\.pyc$',0,sort=False)
-        compiled=True
+        models = listdir(path, '^\w+\.pyc$', 0, sort=False)
+        compiled = True
     else:
         path = pjoin(folder, 'models')
-        models = listdir(path, '^\w+\.py$',0,sort=False)
-        compiled=False
+        models = listdir(path, '^\w+\.py$', 0, sort=False)
+        compiled = False
     n = len(path) + 1
     for model in models:
         regex = environment['response'].models_to_run
         if isinstance(regex, list):
             regex = re_compile('|'.join(regex))
         file = model[n:].replace(os.path.sep, '/').replace('.pyc', '.py')
-        if not regex.search(file) and c!= 'appadmin':
+        if not regex.search(file) and c != 'appadmin':
             continue
         elif compiled:
             code = read_pyc(model)
@@ -538,7 +549,7 @@ def run_controller_in(controller, function, environment):
     badf = 'invalid function (%s/%s)' % (controller, function)
     if os.path.exists(path):
         filename = pjoin(path, 'controllers_%s_%s.pyc'
-                                 % (controller, function))
+                         % (controller, function))
         if not os.path.exists(filename):
             raise HTTP(404,
                        rewrite.THREAD_LOCAL.routes.error_message % badf,
@@ -548,7 +559,8 @@ def run_controller_in(controller, function, environment):
         # TESTING: adjust the path to include site packages
         from settings import global_settings
         from admin import abspath, add_path_first
-        paths = (global_settings.gluon_parent, abspath('site-packages', gluon=True),  abspath('gluon', gluon=True), '')
+        paths = (global_settings.gluon_parent, abspath(
+            'site-packages', gluon=True), abspath('gluon', gluon=True), '')
         [add_path_first(path) for path in paths]
         # TESTING END
 
@@ -578,18 +590,19 @@ def run_controller_in(controller, function, environment):
         code = "%s\nresponse._vars=response._caller(%s)\n" % (code, function)
         if is_gae:
             layer = filename + ':' + function
-            code = getcfs(layer, filename,  lambda: compile2(code,layer))
+            code = getcfs(layer, filename, lambda: compile2(code, layer))
         restricted(code, environment, filename)
     response = environment['response']
-    vars=response._vars
+    vars = response._vars
     if response.postprocessing:
         vars = reduce(lambda vars, p: p(vars), response.postprocessing, vars)
-    if isinstance(vars,unicode):
+    if isinstance(vars, unicode):
         vars = vars.encode('utf8')
-    elif hasattr(vars,'xml') and callable(vars.xml):
+    elif hasattr(vars, 'xml') and callable(vars.xml):
         vars = vars.xml()
     return vars
 
+
 def run_view_in(environment):
     """
     Executes the view for the requested action.
@@ -606,7 +619,7 @@ def run_view_in(environment):
     if response.generic_patterns:
         patterns = response.generic_patterns
         regex = re_compile('|'.join(map(fnmatch.translate, patterns)))
-        short_action =  '%(controller)s/%(function)s.%(extension)s' % request
+        short_action = '%(controller)s/%(function)s.%(extension)s' % request
         allow_generic = regex.search(short_action)
     else:
         allow_generic = False
@@ -626,7 +639,7 @@ def run_view_in(environment):
                 files.append('views_generic.pyc')
         # end backward compatibility code
         for f in files:
-            filename = pjoin(path,f)
+            filename = pjoin(path, f)
             if os.path.exists(filename):
                 code = read_pyc(filename)
                 restricted(code, environment, layer=filename)
@@ -648,13 +661,14 @@ def run_view_in(environment):
             ccode = getcfs(layer, filename,
                            lambda: compile2(parse_template(view,
                                             pjoin(folder, 'views'),
-                                            context=environment),layer))
+                                            context=environment), layer))
         else:
             ccode = parse_template(view,
                                    pjoin(folder, 'views'),
                                    context=environment)
         restricted(ccode, environment, layer)
 
+
 def remove_compiled_application(folder):
     """
     Deletes the folder `compiled` containing the compiled application.
@@ -662,7 +676,7 @@ def remove_compiled_application(folder):
     try:
         shutil.rmtree(pjoin(folder, 'compiled'))
         path = pjoin(folder, 'controllers')
-        for file in listdir(path,'.*\.pyc$',drop=False):
+        for file in listdir(path, '.*\.pyc$', drop=False):
             os.unlink(file)
     except OSError:
         pass
diff --git a/gluon/contenttype.py b/gluon/contenttype.py
index 4270bb6c..7d221330 100644
--- a/gluon/contenttype.py
+++ b/gluon/contenttype.py
@@ -700,7 +700,7 @@ CONTENT_TYPE = {
     '.zabw': 'application/x-abiword',
     '.zip': 'application/zip',
     '.zoo': 'application/x-zoo',
-    }
+}
 
 
 def contenttype(filename, default='text/plain'):
@@ -709,11 +709,11 @@ def contenttype(filename, default='text/plain'):
     """
 
     i = filename.rfind('.')
-    if i>=0:
-        default = CONTENT_TYPE.get(filename[i:].lower(),default)
+    if i >= 0:
+        default = CONTENT_TYPE.get(filename[i:].lower(), default)
         j = filename.rfind('.', 0, i)
-        if j>=0:
-            default = CONTENT_TYPE.get(filename[j:].lower(),default)
+        if j >= 0:
+            default = CONTENT_TYPE.get(filename[j:].lower(), default)
     if default.startswith('text/'):
         default += '; charset=utf-8'
     return default
diff --git a/gluon/contrib/AuthorizeNet.py b/gluon/contrib/AuthorizeNet.py
index d54d7ee9..da882d08 100755
--- a/gluon/contrib/AuthorizeNet.py
+++ b/gluon/contrib/AuthorizeNet.py
@@ -21,6 +21,7 @@ import urllib
 
 _known_tuple_types = {}
 
+
 class NamedTupleBase(tuple):
     """Base class for named tuples with the __new__ operator set, named tuples
        yielded by the namedtuple() function will subclass this and add
@@ -29,7 +30,7 @@ class NamedTupleBase(tuple):
         """Create a new instance of this fielded tuple"""
         # May need to unpack named field values here
         if kws:
-            values = list(args) + [None]*(len(cls._fields) - len(args))
+            values = list(args) + [None] * (len(cls._fields) - len(args))
             fields = dict((val, idx) for idx, val in enumerate(cls._fields))
             for kw, val in kws.iteritems():
                 assert kw in kws, "%r not in field list" % kw
@@ -37,6 +38,7 @@ class NamedTupleBase(tuple):
             args = tuple(values)
         return tuple.__new__(cls, args)
 
+
 def namedtuple(typename, fieldnames):
     """
     >>> import namedtuples
@@ -75,24 +77,26 @@ def namedtuple(typename, fieldnames):
     # Done
     return new_tuple_type
 
+
 class AIM:
 
     class AIMError(Exception):
         def __init__(self, value):
             self.parameter = value
+
         def __str__(self):
             return str(self.parameter)
 
     def __init__(self, login, transkey, testmode=False):
-        if str(login).strip() == '' or login == None:
+        if str(login).strip() == '' or login is None:
             raise AIM.AIMError('No login name provided')
-        if str(transkey).strip() == '' or transkey == None:
+        if str(transkey).strip() == '' or transkey is None:
             raise AIM.AIMError('No transaction key provided')
         if testmode != True and testmode != False:
             raise AIM.AIMError('Invalid value for testmode. Must be True or False. "{0}" given.'.format(testmode))
 
         self.testmode = testmode
-        self.proxy = None;
+        self.proxy = None
         self.delimiter = '|'
         self.results = []
         self.error = True
@@ -117,8 +121,9 @@ class AIM:
         else:
             url = 'https://secure.authorize.net/gateway/transact.dll'
 
-        if self.proxy == None:
-            self.results += str(urllib.urlopen(url, encoded_args).read()).split(self.delimiter)
+        if self.proxy is None:
+            self.results += str(urllib.urlopen(
+                url, encoded_args).read()).split(self.delimiter)
         else:
             opener = urllib.FancyURLopener(self.proxy)
             opened = opener.open(url, encoded_args)
@@ -147,36 +152,37 @@ class AIM:
             raise AIM.AIMError(self.response.ResponseText)
 
     def setTransaction(self, creditcard, expiration, total, cvv=None, tax=None, invoice=None):
-        if str(creditcard).strip() == '' or creditcard == None:
+        if str(creditcard).strip() == '' or creditcard is None:
             raise AIM.AIMError('No credit card number passed to setTransaction(): {0}'.format(creditcard))
-        if str(expiration).strip() == '' or expiration == None:
+        if str(expiration).strip() == '' or expiration is None:
             raise AIM.AIMError('No expiration number to setTransaction(): {0}'.format(expiration))
-        if str(total).strip() == '' or total == None:
+        if str(total).strip() == '' or total is None:
             raise AIM.AIMError('No total amount passed to setTransaction(): {0}'.format(total))
 
         self.setParameter('x_card_num', creditcard)
         self.setParameter('x_exp_date', expiration)
         self.setParameter('x_amount', total)
-        if cvv != None:
+        if cvv is not None:
             self.setParameter('x_card_code', cvv)
-        if tax != None:
+        if tax is not None:
             self.setParameter('x_tax', tax)
-        if invoice != None:
+        if invoice is not None:
             self.setParameter('x_invoice_num', invoice)
 
     def setTransactionType(self, transtype=None):
-        types = ['AUTH_CAPTURE', 'AUTH_ONLY', 'PRIOR_AUTH_CAPTURE', 'CREDIT', 'CAPTURE_ONLY', 'VOID']
+        types = ['AUTH_CAPTURE', 'AUTH_ONLY', 'PRIOR_AUTH_CAPTURE',
+                 'CREDIT', 'CAPTURE_ONLY', 'VOID']
         if transtype.upper() not in types:
             raise AIM.AIMError('Incorrect Transaction Type passed to setTransactionType(): {0}'.format(transtype))
         self.setParameter('x_type', transtype.upper())
 
     def setProxy(self, proxy=None):
-        if str(proxy).strip() == '' or proxy == None:
+        if str(proxy).strip() == '' or proxy is None:
             raise AIM.AIMError('No proxy passed to setProxy()')
         self.proxy = {'http': str(proxy).strip()}
 
     def setParameter(self, key=None, value=None):
-        if key != None and value != None and str(key).strip() != '' and str(value).strip() != '':
+        if key is not None and value is not None and str(key).strip() != '' and str(value).strip() != '':
             self.parameters[key] = str(value).strip()
         else:
             raise AIM.AIMError('Incorrect parameters passed to setParameter(): {0}:{1}'.format(key, value))
@@ -194,10 +200,11 @@ class AIM:
         responses = ['', 'Approved', 'Declined', 'Error']
         return responses[int(self.results[0])]
 
-def process(creditcard,expiration,total,cvv=None,tax=None,invoice=None,
-            login='cnpdev4289', transkey='SR2P8g4jdEn7vFLQ',testmode=True):
-    payment = AIM(login,transkey,testmode)
-    expiration = expiration.replace('/','')
+
+def process(creditcard, expiration, total, cvv=None, tax=None, invoice=None,
+            login='cnpdev4289', transkey='SR2P8g4jdEn7vFLQ', testmode=True):
+    payment = AIM(login, transkey, testmode)
+    expiration = expiration.replace('/', '')
     payment.setTransaction(creditcard, expiration, total, cvv, tax, invoice)
     try:
         payment.process()
@@ -205,6 +212,7 @@ def process(creditcard,expiration,total,cvv=None,tax=None,invoice=None,
     except AIM.AIMError:
         return False
 
+
 def test():
     import socket
     import sys
@@ -215,12 +223,14 @@ def test():
     total = '1.00'
     cvv = '123'
     tax = '0.00'
-    invoice = str(time())[4:10] # get a random invoice number
+    invoice = str(time())[4:10]  # get a random invoice number
 
     try:
         payment = AIM('cnpdev4289', 'SR2P8g4jdEn7vFLQ', True)
-        payment.setTransaction(creditcard, expiration, total, cvv, tax, invoice)
-        payment.setParameter('x_duplicate_window', 180) # three minutes duplicate windows
+        payment.setTransaction(
+            creditcard, expiration, total, cvv, tax, invoice)
+        payment.setParameter(
+            'x_duplicate_window', 180)  # three minutes duplicate windows
         payment.setParameter('x_cust_id', '1324')       # customer ID
         payment.setParameter('x_first_name', 'John')
         payment.setParameter('x_last_name', 'Conde')
@@ -232,7 +242,8 @@ def test():
         payment.setParameter('x_country', 'US')
         payment.setParameter('x_phone', '800-555-1234')
         payment.setParameter('x_description', 'Test Transaction')
-        payment.setParameter('x_customer_ip', socket.gethostbyname(socket.gethostname()))
+        payment.setParameter(
+            'x_customer_ip', socket.gethostbyname(socket.gethostname()))
         payment.setParameter('x_email', 'john@example.com')
         payment.setParameter('x_email_customer', False)
         payment.process()
@@ -251,9 +262,9 @@ def test():
     except AIM.AIMError, e:
         print "Exception thrown:", e
         print 'An error occured'
-    print 'approved',payment.isApproved()
-    print 'declined',payment.isDeclined()
-    print 'error',payment.isError()
+    print 'approved', payment.isApproved()
+    print 'declined', payment.isDeclined()
+    print 'error', payment.isError()
 
-if __name__=='__main__':
+if __name__ == '__main__':
     test()
diff --git a/gluon/contrib/DowCommerce.py b/gluon/contrib/DowCommerce.py
index 03d19fd1..d06b088f 100644
--- a/gluon/contrib/DowCommerce.py
+++ b/gluon/contrib/DowCommerce.py
@@ -15,25 +15,27 @@ __all__ = ['DowCommerce']
 from operator import itemgetter
 import urllib
 
+
 class DowCommerce:
 
     class DowCommerceError(Exception):
         def __init__(self, value):
             self.parameter = value
+
         def __str__(self):
             return str(self.parameter)
 
     def __init__(self, username=None, password=None, demomode=False):
         if not demomode:
-            if str(username).strip() == '' or username == None:
+            if str(username).strip() == '' or username is None:
                 raise DowCommerce.DowCommerceError('No username provided')
-            if str(password).strip() == '' or password == None:
+            if str(password).strip() == '' or password is None:
                 raise DowCommerce.DowCommerceError('No password provided')
         else:
             username = 'demo'
             password = 'password'
 
-        self.proxy = None;
+        self.proxy = None
         self.delimiter = '&'
         self.results = {}
         self.error = True
@@ -45,11 +47,11 @@ class DowCommerce:
         self.setParameter('username', username)
         self.setParameter('password', password)
 
-
     def process(self):
         encoded_args = urllib.urlencode(self.parameters)
-        if self.proxy == None:
-            results = str(urllib.urlopen(self.url, encoded_args).read()).split(self.delimiter)
+        if self.proxy is None:
+            results = str(urllib.urlopen(
+                self.url, encoded_args).read()).split(self.delimiter)
         else:
             opener = urllib.FancyURLopener(self.proxy)
             opened = opener.open(self.url, encoded_args)
@@ -59,7 +61,7 @@ class DowCommerce:
                 opened.close()
 
         for result in results:
-            (key,val) = result.split('=')
+            (key, val) = result.split('=')
             self.results[key] = val
 
         if self.results['response'] == '1':
@@ -80,17 +82,18 @@ class DowCommerce:
             self.declined = False
             raise DowCommerce.DowCommerceError(self.results)
 
-    def setTransaction(self, creditcard, expiration, total, cvv=None, orderid=None, orderdescription=None,
-                        ipaddress=None, tax=None, shipping=None,
-                        firstname=None, lastname=None, company=None, address1=None, address2=None, city=None, state=None, zipcode=None,
-                        country=None, phone=None, fax=None, emailaddress=None, website=None,
-                        shipping_firstname=None, shipping_lastname=None, shipping_company=None, shipping_address1=None, shipping_address2=None,
-                        shipping_city=None, shipping_state=None, shipping_zipcode = None, shipping_country=None, shipping_emailaddress=None):
-        if str(creditcard).strip() == '' or creditcard == None:
+    def setTransaction(
+        self, creditcard, expiration, total, cvv=None, orderid=None, orderdescription=None,
+        ipaddress=None, tax=None, shipping=None,
+        firstname=None, lastname=None, company=None, address1=None, address2=None, city=None, state=None, zipcode=None,
+        country=None, phone=None, fax=None, emailaddress=None, website=None,
+        shipping_firstname=None, shipping_lastname=None, shipping_company=None, shipping_address1=None, shipping_address2=None,
+            shipping_city=None, shipping_state=None, shipping_zipcode=None, shipping_country=None, shipping_emailaddress=None):
+        if str(creditcard).strip() == '' or creditcard is None:
             raise DowCommerce.DowCommerceError('No credit card number passed to setTransaction(): {0}'.format(creditcard))
-        if str(expiration).strip() == '' or expiration == None:
+        if str(expiration).strip() == '' or expiration is None:
             raise DowCommerce.DowCommerceError('No expiration number passed to setTransaction(): {0}'.format(expiration))
-        if str(total).strip() == '' or total == None:
+        if str(total).strip() == '' or total is None:
             raise DowCommerce.DowCommerceError('No total amount passed to setTransaction(): {0}'.format(total))
 
         self.setParameter('ccnumber', creditcard)
@@ -165,12 +168,12 @@ class DowCommerce:
         self.setParameter('type', transtype.lower())
 
     def setProxy(self, proxy=None):
-        if str(proxy).strip() == '' or proxy == None:
+        if str(proxy).strip() == '' or proxy is None:
             raise DowCommerce.DowCommerceError('No proxy passed to setProxy()')
         self.proxy = {'http': str(proxy).strip()}
 
     def setParameter(self, key=None, value=None):
-        if key != None and value != None and str(key).strip() != '' and str(value).strip() != '':
+        if key is not None and value is not None and str(key).strip() != '' and str(value).strip() != '':
             self.parameters[key] = str(value).strip()
         else:
             raise DowCommerce.DowCommerceError('Incorrect parameters passed to setParameter(): {0}:{1}'.format(key, value))
@@ -194,6 +197,7 @@ class DowCommerce:
     def getResponseText(self):
         return self.results['responsetext']
 
+
 def test():
     import socket
     import sys
@@ -212,13 +216,14 @@ def test():
     total = '1.00'
     cvv = '999'
     tax = '0.00'
-    orderid = str(time())[4:10] # get a random invoice number
+    orderid = str(time())[4:10]  # get a random invoice number
 
     try:
         payment = DowCommerce(demomode=True)
-        payment.setTransaction(creditcard, expiration, total, cvv=cvv, tax=tax, orderid=orderid, orderdescription='Test Transaction',
-                                firstname='John', lastname='Doe', company='Acme', address1='123 Min Street', city='Hometown', state='VA',
-                                zipcode='12345', country='US', phone='888-555-1212', emailaddress='john@noemail.local', ipaddress='192.168.1.1')
+        payment.setTransaction(
+            creditcard, expiration, total, cvv=cvv, tax=tax, orderid=orderid, orderdescription='Test Transaction',
+            firstname='John', lastname='Doe', company='Acme', address1='123 Min Street', city='Hometown', state='VA',
+            zipcode='12345', country='US', phone='888-555-1212', emailaddress='john@noemail.local', ipaddress='192.168.1.1')
 
         payment.process()
         if payment.isApproved():
@@ -231,9 +236,9 @@ def test():
     except DowCommerce.DowCommerceError, e:
         print "Exception thrown:", e
         print 'An error occured'
-    print 'approved',payment.isApproved()
-    print 'declined',payment.isDeclined()
-    print 'error',payment.isError()
+    print 'approved', payment.isApproved()
+    print 'declined', payment.isDeclined()
+    print 'error', payment.isError()
 
-if __name__=='__main__':
+if __name__ == '__main__':
     test()
diff --git a/gluon/contrib/__init__.py b/gluon/contrib/__init__.py
index 8b137891..e69de29b 100644
--- a/gluon/contrib/__init__.py
+++ b/gluon/contrib/__init__.py
@@ -1 +0,0 @@
-
diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py
index 05f02b64..48f555cb 100644
--- a/gluon/contrib/autolinks.py
+++ b/gluon/contrib/autolinks.py
@@ -42,7 +42,9 @@ revision3.com
 viddler.com
 """
 
-import re, cgi, sys
+import re
+import cgi
+import sys
 from simplejson import loads
 import urllib
 import uuid
@@ -75,23 +77,28 @@ EMBED_MAPS = [
      'http://revision3.com/api/oembed/'),
     (re.compile('http://\S+.viddler.com/\S+'),
      'http://lab.viddler.com/services/oembed/'),
-    ]
+]
+
 
 def image(url):
     return '<img src="%s" style="max-width:100%%"/>' % url
 
+
 def audio(url):
     return '<audio controls="controls" style="max-width:100%%"><source src="%s" /></audio>' % url
 
+
 def video(url):
     return '<video controls="controls" style="max-width:100%%"><source src="%s" /></video>' % url
 
+
 def googledoc_viewer(url):
     return '<iframe src="http://docs.google.com/viewer?url=%s&embedded=true" style="max-width:100%%"></iframe>' % urllib.quote(url)
 
+
 def web2py_component(url):
     code = str(uuid.uuid4())
-    return '<div id="%s"></div><script>\nweb2py_component("%s","%s");\n</script>' % (code,url,code)
+    return '<div id="%s"></div><script>\nweb2py_component("%s","%s");\n</script>' % (code, url, code)
 
 EXTENSION_MAPS = {
     'png': image,
@@ -126,33 +133,37 @@ EXTENSION_MAPS = {
     'xps': googledoc_viewer,
 }
 
+
 class VimeoURLOpener(urllib.FancyURLopener):
     "Vimeo blocks the urllib user agent for some reason"
     version = "Mozilla/4.0"
 urllib._urlopener = VimeoURLOpener()
 
+
 def oembed(url):
-    for k,v in EMBED_MAPS:
+    for k, v in EMBED_MAPS:
         if k.match(url):
-            oembed = v+'?format=json&url='+cgi.escape(url)
+            oembed = v + '?format=json&url=' + cgi.escape(url)
             try:
                 data = urllib.urlopen(oembed).read()
                 print data
-                return loads(data) # json!
+                return loads(data)  # json!
             except:
                 pass
     return {}
 
+
 def extension(url):
     return url.split('?')[0].split('.')[-1].lower()
 
-def expand_one(url,cdict):
+
+def expand_one(url, cdict):
     # try ombed but first check in cache
     if cdict and url in cdict:
         r = cdict[url]
     else:
         r = oembed(url)
-        if isinstance(cdict,dict):
+        if isinstance(cdict, dict):
             cdict[url] = r
     # if oembed service
     if 'html' in r:
@@ -170,21 +181,23 @@ def expand_one(url,cdict):
     # else regular link
     return '<a href="%(u)s">%(u)s</a>' % dict(u=url)
 
-def expand_html(html,cdict=None):
+
+def expand_html(html, cdict=None):
     if not have_soup:
-        raise RuntimeError, "Missing BeautifulSoup"
+        raise RuntimeError("Missing BeautifulSoup")
     soup = BeautifulSoup(html)
-    comments = soup.findAll(text=lambda text:isinstance(text, Comment))
+    comments = soup.findAll(text=lambda text: isinstance(text, Comment))
     [comment.extract() for comment in comments]
     for txt in soup.findAll(text=True):
-        if not txt.parent.name in ('a','script','pre','code','embed','object','audio','video'):
+        if not txt.parent.name in ('a', 'script', 'pre', 'code', 'embed', 'object', 'audio', 'video'):
             ntxt = regex_link.sub(
-                lambda match: expand_one(match.group(0),cdict), txt)
+                lambda match: expand_one(match.group(0), cdict), txt)
             txt.replaceWith(BeautifulSoup(ntxt))
     return str(soup)
 
+
 def test():
-    example="""
+    example = """
 <h3>Fringilla nisi parturient nullam</h3>
 <p>http://www.youtube.com/watch?v=IWBFiI5RrA0</p>
 <p>http://www.web2py.com/examples/static/images/logo_bw.png</p>
@@ -198,8 +211,8 @@ laoreet tortor.</p>
 """
     return expand_html(example)
 
-if __name__=="__main__":
-    if len(sys.argv)>1:
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
         print expand_html(open(sys.argv[1]).read())
     else:
         print test()
diff --git a/gluon/contrib/gae_memcache.py b/gluon/contrib/gae_memcache.py
index ec08fd6a..67efd499 100644
--- a/gluon/contrib/gae_memcache.py
+++ b/gluon/contrib/gae_memcache.py
@@ -12,6 +12,7 @@ cache.ram=cache.disk=MemcacheClient(request)
 import time
 from google.appengine.api.memcache import Client
 
+
 class MemcacheClient(object):
 
     client = Client()
@@ -24,12 +25,12 @@ class MemcacheClient(object):
         key,
         f,
         time_expire=300,
-        ):
+    ):
         key = '%s/%s' % (self.request.application, key)
         dt = time_expire
         value = None
         obj = self.client.get(key)
-        if obj and (dt == None or obj[0] > time.time() - dt):
+        if obj and (dt is None or obj[0] > time.time() - dt):
             value = obj[1]
         elif f is None:
             if obj:
@@ -47,21 +48,21 @@ class MemcacheClient(object):
         self.client.set(key, (time.time(), value))
         return value
 
-    def clear(self, key = None):
+    def clear(self, key=None):
         if key:
             key = '%s/%s' % (self.request.application, key)
             self.client.delete(key)
         else:
             self.client.flush_all()
 
-    def delete(self,*a,**b):
-        return self.client.delete(*a,**b)
+    def delete(self, *a, **b):
+        return self.client.delete(*a, **b)
 
-    def get(self,*a,**b):
-        return self.client.delete(*a,**b)
+    def get(self, *a, **b):
+        return self.client.delete(*a, **b)
 
-    def set(self,*a,**b):
-        return self.client.delete(*a,**b)
+    def set(self, *a, **b):
+        return self.client.delete(*a, **b)
 
-    def flush_all(self,*a,**b):
-        return self.client.delete(*a,**b)
+    def flush_all(self, *a, **b):
+        return self.client.delete(*a, **b)
diff --git a/gluon/contrib/gae_retry.py b/gluon/contrib/gae_retry.py
index 9b0fe426..59844521 100644
--- a/gluon/contrib/gae_retry.py
+++ b/gluon/contrib/gae_retry.py
@@ -51,7 +51,8 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0):
     :param exponent: rate of exponential back-off.
     """
 
-    import time, logging
+    import time
+    import logging
     from google.appengine.api import apiproxy_stub_map
     from google.appengine.runtime import apiproxy_errors
     from google.appengine.datastore import datastore_pb
@@ -60,8 +61,8 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0):
     interval = float(interval)
     exponent = float(exponent)
     wrapped = apiproxy_stub_map.MakeSyncCall
-    errors = {datastore_pb.Error.TIMEOUT:'Timeout',
-        datastore_pb.Error.CONCURRENT_TRANSACTION:'TransactionFailedError'}
+    errors = {datastore_pb.Error.TIMEOUT: 'Timeout',
+              datastore_pb.Error.CONCURRENT_TRANSACTION: 'TransactionFailedError'}
 
     def wrapper(*args, **kwargs):
         count = 0.0
@@ -70,10 +71,12 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0):
                 return wrapped(*args, **kwargs)
             except apiproxy_errors.ApplicationError, err:
                 errno = err.application_error
-                if errno not in errors: raise
+                if errno not in errors:
+                    raise
                 sleep = (exponent ** count) * interval
                 count += 1.0
-                if count > attempts: raise
+                if count > attempts:
+                    raise
                 msg = "Datastore %s: retry #%d in %s seconds.\n%s"
                 vals = ''
                 if count == 1.0:
diff --git a/gluon/contrib/generics.py b/gluon/contrib/generics.py
index fa074416..f1922975 100644
--- a/gluon/contrib/generics.py
+++ b/gluon/contrib/generics.py
@@ -12,6 +12,7 @@ from gluon.sanitizer import sanitize
 from gluon.contrib.markmin.markmin2latex import markmin2latex
 from gluon.contrib.markmin.markmin2pdf import markmin2pdf
 
+
 def wrapper(f):
     def g(data):
         try:
@@ -25,39 +26,47 @@ def wrapper(f):
             raise HTTP(405, '%s error' % e)
     return g
 
+
 def latex_from_html(html):
-    markmin=TAG(html).element('body').flatten(markmin_serializer)
+    markmin = TAG(html).element('body').flatten(markmin_serializer)
     return XML(markmin2latex(markmin))
 
+
 def pdflatex_from_html(html):
-    if os.system('which pdflatex > /dev/null')==0:
-        markmin=TAG(html).element('body').flatten(markmin_serializer)
-        out,warnings,errors=markmin2pdf(markmin)
+    if os.system('which pdflatex > /dev/null') == 0:
+        markmin = TAG(html).element('body').flatten(markmin_serializer)
+        out, warnings, errors = markmin2pdf(markmin)
         if errors:
-            current.response.headers['Content-Type']='text/html'
-            raise HTTP(405,HTML(BODY(H1('errors'),
-                                     UL(*errors),
-                                     H1('warnings'),
-                                     UL(*warnings))).xml())
+            current.response.headers['Content-Type'] = 'text/html'
+            raise HTTP(405, HTML(BODY(H1('errors'),
+                                      UL(*errors),
+                                      H1('warnings'),
+                                      UL(*warnings))).xml())
         else:
             return XML(out)
 
+
 def pyfpdf_from_html(html):
     request = current.request
+
     def image_map(path):
         if path.startswith('/%s/static/' % request.application):
-            return os.path.join(request.folder,path.split('/',2)[2])
-        return 'http%s://%s%s' % (request.is_https and 's' or '',request.env.http_host, path)
-    class MyFPDF(FPDF, HTMLMixin): pass
-    pdf=MyFPDF()
+            return os.path.join(request.folder, path.split('/', 2)[2])
+        return 'http%s://%s%s' % (request.is_https and 's' or '', request.env.http_host, path)
+
+    class MyFPDF(FPDF, HTMLMixin):
+        pass
+    pdf = MyFPDF()
     pdf.add_page()
-    html = sanitize(html, escape=False)  #### should have better list of allowed tags
-    pdf.write_html(html,image_map=image_map)
+    html = sanitize(
+        html, escape=False)  # should have better list of allowed tags
+    pdf.write_html(html, image_map=image_map)
     return XML(pdf.output(dest='S'))
 
+
 def pdf_from_html(html):
     # try use latex and pdflatex
-    if os.system('which pdflatex > /dev/null')==0:
+    if os.system('which pdflatex > /dev/null') == 0:
         return pdflatex_from_html(html)
     else:
         return pyfpdf_from_html(html)
diff --git a/gluon/contrib/google_wallet.py b/gluon/contrib/google_wallet.py
index ffcbd9f8..f24c9074 100644
--- a/gluon/contrib/google_wallet.py
+++ b/gluon/contrib/google_wallet.py
@@ -1,5 +1,6 @@
 from gluon import XML
 
+
 def button(merchant_id="123456789012345",
            products=[dict(name="shoes",
                           quantity=1,
@@ -8,8 +9,8 @@ def button(merchant_id="123456789012345",
                           description="running shoes black")]):
     t = '<input name="item_%(key)s_%(k)s" type="hidden" value="%(value)s"/>'
     list_products = ''
-    for k,product in enumerate(products):
-        for key,value in product.items():
-            list_products += t % dict(k=k+1,key=key,value=value)
+    for k, product in enumerate(products):
+        for key, value in product.items():
+            list_products += t % dict(k=k + 1, key=key, value=value)
     button = '<form action="https://checkout.google.com/api/checkout/v2/checkoutForm/Merchant/%s" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" target="_top">%s<input name="_charset_" type="hidden" value="utf-8"/><input alt="" src="https://checkout.google.com/buttons/buy.gif?merchant_id=%s&amp;w=117&amp;h=48&amp;style=white&amp;variant=text&amp;loc=en_US" type="image"/></form>' % (merchant_id, list_products, merchant_id)
     return XML(button)
diff --git a/gluon/contrib/gql.py b/gluon/contrib/gql.py
index d1023ab1..5438888b 100644
--- a/gluon/contrib/gql.py
+++ b/gluon/contrib/gql.py
@@ -1,5 +1,5 @@
 # this file exists for backward compatibility
 
-__all__ = ['DAL','Field','drivers','gae']
+__all__ = ['DAL', 'Field', 'drivers', 'gae']
 
 from gluon.dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, drivers, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType, gae
diff --git a/gluon/contrib/imageutils.py b/gluon/contrib/imageutils.py
index 96facc08..594fe521 100644
--- a/gluon/contrib/imageutils.py
+++ b/gluon/contrib/imageutils.py
@@ -22,6 +22,7 @@
 #########################################################################
 from gluon import current
 
+
 class RESIZE(object):
     def __init__(self, nx=160, ny=80, error_message=' image resize'):
         (self.nx, self.ny, self.error_message) = (nx, ny, error_message)
@@ -43,6 +44,7 @@ class RESIZE(object):
         else:
             return (value, None)
 
+
 def THUMB(image, nx=120, ny=120, gae=False, name='thumb'):
     if image:
         if not gae:
diff --git a/gluon/contrib/login_methods/__init__.py b/gluon/contrib/login_methods/__init__.py
index b28b04f6..e69de29b 100644
--- a/gluon/contrib/login_methods/__init__.py
+++ b/gluon/contrib/login_methods/__init__.py
@@ -1,3 +0,0 @@
-
-
-
diff --git a/gluon/contrib/login_methods/basic_auth.py b/gluon/contrib/login_methods/basic_auth.py
index fee1c35b..88341d05 100644
--- a/gluon/contrib/login_methods/basic_auth.py
+++ b/gluon/contrib/login_methods/basic_auth.py
@@ -11,9 +11,9 @@ def basic_auth(server="http://127.0.0.1"):
     """
 
     def basic_login_aux(username,
-            password,
-            server=server):
-        key = base64.b64encode(username+':'+password)
+                        password,
+                        server=server):
+        key = base64.b64encode(username + ':' + password)
         headers = {'Authorization': 'Basic ' + key}
         request = urllib2.Request(server, None, headers)
         try:
@@ -22,5 +22,3 @@ def basic_auth(server="http://127.0.0.1"):
         except (urllib2.URLError, urllib2.HTTPError):
             return False
     return basic_login_aux
-
-
diff --git a/gluon/contrib/login_methods/browserid_account.py b/gluon/contrib/login_methods/browserid_account.py
index 83375c8e..c3ccb38c 100644
--- a/gluon/contrib/login_methods/browserid_account.py
+++ b/gluon/contrib/login_methods/browserid_account.py
@@ -25,6 +25,7 @@ from gluon.storage import Storage
 from gluon.tools import fetch
 import gluon.contrib.simplejson as json
 
+
 class BrowserID(object):
     """
     from gluon.contrib.login_methods.browserid_account import BrowserID
@@ -34,17 +35,17 @@ class BrowserID(object):
     """
 
     def __init__(self,
-                request,
-                audience = "",
-                assertion_post_url = "",
-                prompt = "BrowserID Login",
-                issuer = "browserid.org",
-                verify_url = "https://browserid.org/verify",
-                browserid_js = "https://browserid.org/include.js",
-                browserid_button = "https://browserid.org/i/sign_in_red.png",
-                crypto_js = "https://crypto-js.googlecode.com/files/2.2.0-crypto-md5.js",
-                on_login_failure = None,
-                ):
+                 request,
+                 audience="",
+                 assertion_post_url="",
+                 prompt="BrowserID Login",
+                 issuer="browserid.org",
+                 verify_url="https://browserid.org/verify",
+                 browserid_js="https://browserid.org/include.js",
+                 browserid_button="https://browserid.org/i/sign_in_red.png",
+                 crypto_js="https://crypto-js.googlecode.com/files/2.2.0-crypto-md5.js",
+                 on_login_failure=None,
+                 ):
 
         self.request = request
         self.audience = audience
@@ -67,13 +68,13 @@ class BrowserID(object):
         if request.vars.assertion:
             audience = self.audience
             issuer = self.issuer
-            assertion = XML(request.vars.assertion,sanitize=True)
-            verify_data = {'assertion':assertion,'audience':audience}
-            auth_info_json = fetch(self.verify_url,data=verify_data)
+            assertion = XML(request.vars.assertion, sanitize=True)
+            verify_data = {'assertion': assertion, 'audience': audience}
+            auth_info_json = fetch(self.verify_url, data=verify_data)
             j = json.loads(auth_info_json)
-            epoch_time = int(time.time()*1000) # we need 13 digit epoch time
+            epoch_time = int(time.time() * 1000)  # we need 13 digit epoch time
             if j["status"] == "okay" and j["audience"] == audience and j['issuer'] == issuer and j['expires'] >= epoch_time:
-                return dict(email = j['email'])
+                return dict(email=j['email'])
             elif self.on_login_failure:
                 redirect('http://google.com')
             else:
@@ -83,9 +84,8 @@ class BrowserID(object):
     def login_form(self):
         request = self.request
         onclick = "javascript:navigator.id.getVerifiedEmail(gotVerifiedEmail) ; return false"
-        form = DIV(SCRIPT(_src=self.browserid_js,_type="text/javascript"),
-            SCRIPT(_src=self.crypto_js,_type="text/javascript"),
-            A(IMG(_src=self.browserid_button,_alt=self.prompt),_href="#",_onclick=onclick,_class="browserid",_title="Login With BrowserID"),
-            SCRIPT(self.asertion_js))
+        form = DIV(SCRIPT(_src=self.browserid_js, _type="text/javascript"),
+                   SCRIPT(_src=self.crypto_js, _type="text/javascript"),
+                   A(IMG(_src=self.browserid_button, _alt=self.prompt), _href="#", _onclick=onclick, _class="browserid", _title="Login With BrowserID"),
+                   SCRIPT(self.asertion_js))
         return form
-
diff --git a/gluon/contrib/login_methods/cas_auth.py b/gluon/contrib/login_methods/cas_auth.py
index 0c922a56..54abf92e 100644
--- a/gluon/contrib/login_methods/cas_auth.py
+++ b/gluon/contrib/login_methods/cas_auth.py
@@ -11,7 +11,8 @@ Tinkered by Szabolcs Gyuris < szimszo n @ o regpreshaz dot eu>
 
 from gluon import current, redirect
 
-class CasAuth( object ):
+
+class CasAuth(object):
     """
     Login will be done via Web2py's CAS application, instead of web2py's
     login form.
@@ -39,101 +40,105 @@ class CasAuth( object ):
     user's username.
 
     """
-    def __init__(self, g=None, ### g for backward compatibility ###
-                 urlbase = "https://web2py.com/cas/cas",
-                 actions=['login','validate','logout'],
-                 maps=dict(username=lambda v:v.get('username',v['user']),
-                           email=lambda v:v.get('email',None),
-                           user_id=lambda v:v['user']),
-                 casversion = 1,
-                 casusername = 'cas:user'
+    def __init__(self, g=None,  # g for backward compatibility ###
+                 urlbase="https://web2py.com/cas/cas",
+                 actions=['login', 'validate', 'logout'],
+                 maps=dict(username=lambda v: v.get('username', v['user']),
+                           email=lambda v: v.get('email', None),
+                           user_id=lambda v: v['user']),
+                 casversion=1,
+                 casusername='cas:user'
                  ):
-        self.urlbase=urlbase
-        self.cas_login_url="%s/%s"%(self.urlbase,actions[0])
-        self.cas_check_url="%s/%s"%(self.urlbase,actions[1])
-        self.cas_logout_url="%s/%s"%(self.urlbase,actions[2])
-        self.maps=maps
+        self.urlbase = urlbase
+        self.cas_login_url = "%s/%s" % (self.urlbase, actions[0])
+        self.cas_check_url = "%s/%s" % (self.urlbase, actions[1])
+        self.cas_logout_url = "%s/%s" % (self.urlbase, actions[2])
+        self.maps = maps
         self.casversion = casversion
         self.casusername = casusername
-        http_host=current.request.env.http_x_forwarded_host
-        if not http_host: http_host=current.request.env.http_host
-        if current.request.env.wsgi_url_scheme in [ 'https', 'HTTPS' ]:
+        http_host = current.request.env.http_x_forwarded_host
+        if not http_host:
+            http_host = current.request.env.http_host
+        if current.request.env.wsgi_url_scheme in ['https', 'HTTPS']:
             scheme = 'https'
         else:
             scheme = 'http'
-        self.cas_my_url='%s://%s%s'%( scheme, http_host, current.request.env.path_info )
+        self.cas_my_url = '%s://%s%s' % (
+            scheme, http_host, current.request.env.path_info)
 
-    def login_url( self, next = "/" ):
-        current.session.token=self._CAS_login()
+    def login_url(self, next="/"):
+        current.session.token = self._CAS_login()
         return next
-    def logout_url( self, next = "/" ):
-        current.session.token=None
-        current.session.auth=None
+
+    def logout_url(self, next="/"):
+        current.session.token = None
+        current.session.auth = None
         self._CAS_logout()
         return next
-    def get_user( self ):
-        user=current.session.token
+
+    def get_user(self):
+        user = current.session.token
         if user:
-            d = {'source':'web2py cas'}
+            d = {'source': 'web2py cas'}
             for key in self.maps:
-                d[key]=self.maps[key](user)
+                d[key] = self.maps[key](user)
             return d
         return None
-    def _CAS_login( self ):
+
+    def _CAS_login(self):
         """
         exposed as CAS.login(request)
         returns a token on success, None on failed authentication
         """
         import urllib
-        self.ticket=current.request.vars.ticket
+        self.ticket = current.request.vars.ticket
         if not current.request.vars.ticket:
-            redirect( "%s?service=%s"% (self.cas_login_url,
+            redirect("%s?service=%s" % (self.cas_login_url,
                                         self.cas_my_url))
         else:
-            url="%s?service=%s&ticket=%s" % (self.cas_check_url,
-                                             self.cas_my_url,
-                                             self.ticket )
-            data=urllib.urlopen( url ).read()
+            url = "%s?service=%s&ticket=%s" % (self.cas_check_url,
+                                               self.cas_my_url,
+                                               self.ticket)
+            data = urllib.urlopen(url).read()
             if data.startswith('yes') or data.startswith('no'):
                 data = data.split('\n')
-                if data[0]=='yes':
-                    if ':' in data[1]: # for Compatibility with Custom CAS
+                if data[0] == 'yes':
+                    if ':' in data[1]:  # for Compatibility with Custom CAS
                         items = data[1].split(':')
                         a = items[0]
-                        b = len(items)>1 and items[1] or a
-                        c = len(items)>2 and items[2] or b
+                        b = len(items) > 1 and items[1] or a
+                        c = len(items) > 2 and items[2] or b
                     else:
                         a = b = c = data[1]
-                    return dict(user=a,email=b,username=c)
+                    return dict(user=a, email=b, username=c)
                 return None
             import xml.dom.minidom as dom
             import xml.parsers.expat as expat
             try:
-                dxml=dom.parseString(data)
-                envelop = dxml.getElementsByTagName("cas:authenticationSuccess")
-                if len(envelop)>0:
+                dxml = dom.parseString(data)
+                envelop = dxml.getElementsByTagName(
+                    "cas:authenticationSuccess")
+                if len(envelop) > 0:
                     res = dict()
                     for x in envelop[0].childNodes:
                         if x.nodeName.startswith('cas:') and len(x.childNodes):
                             key = x.nodeName[4:].encode('utf8')
                             value = x.childNodes[0].nodeValue.encode('utf8')
                             if not key in res:
-                                res[key]=value
+                                res[key] = value
                             else:
-                                if not isinstance(res[key],list):
-                                    res[key]=[res[key]]
+                                if not isinstance(res[key], list):
+                                    res[key] = [res[key]]
                                 res[key].append(value)
                     return res
-            except expat.ExpatError: pass
-            return None # fallback
+            except expat.ExpatError:
+                pass
+            return None  # fallback
 
-
-    def _CAS_logout( self ):
+    def _CAS_logout(self):
         """
         exposed CAS.logout()
         redirects to the CAS logout page
         """
         import urllib
-        redirect("%s?service=%s" % (self.cas_logout_url,self.cas_my_url))
-
-
+        redirect("%s?service=%s" % (self.cas_logout_url, self.cas_my_url))
diff --git a/gluon/contrib/login_methods/dropbox_account.py b/gluon/contrib/login_methods/dropbox_account.py
index 42877773..8bfc7079 100644
--- a/gluon/contrib/login_methods/dropbox_account.py
+++ b/gluon/contrib/login_methods/dropbox_account.py
@@ -18,11 +18,13 @@ from gluon.tools import fetch
 from gluon.storage import Storage
 import gluon.contrib.simplejson as json
 
+
 class DropboxAccount(object):
 
     """
     from gluon.contrib.login_methods.dropbox_account import DropboxAccount
-    auth.settings.actions_disabled=['register','change_password','request_reset_password']
+    auth.settings.actions_disabled=['register','change_password',
+        'request_reset_password']
     auth.settings.login_form = DropboxAccount(request,
               key="...",
               secret="...",
@@ -34,47 +36,45 @@ class DropboxAccount(object):
 
     def __init__(self,
                  request,
-                 key = "",
-                 secret = "",
+                 key="",
+                 secret="",
                  access_type="app_folder",
-                 login_url = "",
+                 login_url="",
                  on_login_failure=None,
                  ):
-        
-        self.request=request
-        self.key=key
-        self.secret=secret
-        self.access_type=access_type
+
+        self.request = request
+        self.key = key
+        self.secret = secret
+        self.access_type = access_type
         self.login_url = login_url
         self.on_login_failure = on_login_failure
         self.sess = session.DropboxSession(
-            self.key,self.secret,self.access_type)
-
+            self.key, self.secret, self.access_type)
 
     def get_user(self):
         request = self.request
         if not current.session.dropbox_request_token:
             return None
         elif not current.session.dropbox_access_token:
-            
-            request_token = current.session.dropbox_request_token        
-            self.sess.set_request_token(request_token[0],request_token[1])
+
+            request_token = current.session.dropbox_request_token
+            self.sess.set_request_token(request_token[0], request_token[1])
             access_token = self.sess.obtain_access_token(self.sess.token)
             current.session.dropbox_access_token = \
-                (access_token.key,access_token.secret)
+                (access_token.key, access_token.secret)
         else:
             access_token = current.session.dropbox_access_token
-            self.sess.set_token(access_token[0],access_token[1])
+            self.sess.set_token(access_token[0], access_token[1])
 
-        
         user = Storage()
         self.client = client.DropboxClient(self.sess)
         data = self.client.account_info()
-        display_name = data.get('display_name','').split(' ',1)
-        user = dict(email = data.get('email',None),
-                    first_name = display_name[0],
-                    last_name = display_name[-1],
-                    registration_id = data.get('uid',None))
+        display_name = data.get('display_name', '').split(' ', 1)
+        user = dict(email=data.get('email', None),
+                    first_name=display_name[0],
+                    last_name=display_name[-1],
+                    registration_id=data.get('uid', None))
         if not user['registration_id'] and self.on_login_failure:
             redirect(self.on_login_failure)
         return user
@@ -83,7 +83,7 @@ class DropboxAccount(object):
 
         request_token = self.sess.obtain_request_token()
         current.session.dropbox_request_token =  \
-            (request_token.key,request_token.secret)
+            (request_token.key, request_token.secret)
         dropbox_url = self.sess.build_authorize_url(request_token,
                                                     self.login_url)
         redirect(dropbox_url)
@@ -93,29 +93,32 @@ class DropboxAccount(object):
                       _style="width:400px;height:240px;")
         return form
 
-    def logout_url(self, next = "/"):
-        current.session.dropbox_request_token=None
-        current.session.auth=None
+    def logout_url(self, next="/"):
+        current.session.dropbox_request_token = None
+        current.session.auth = None
         redirect('https://www.dropbox.com/logout')
         return next
-    def put(self,filename,file):
-        return json.loads(self.client.put_file(filename,file))['bytes']
-    def get(self,filename,file):
+
+    def put(self, filename, file):
+        return json.loads(self.client.put_file(filename, file))['bytes']
+
+    def get(self, filename, file):
         return self.client.get_file(filename)
-    def dir(self,path):
+
+    def dir(self, path):
         return json.loads(self.client.metadata(path))
 
-def use_dropbox(auth,filename='private/dropbox.key',**kwargs):
-    path = os.path.join(current.request.folder,filename)
+
+def use_dropbox(auth, filename='private/dropbox.key', **kwargs):
+    path = os.path.join(current.request.folder, filename)
     if os.path.exists(path):
         request = current.request
-        key,secret,access_type = open(path,'r').read().strip().split(':')
+        key, secret, access_type = open(path, 'r').read().strip().split(':')
         host = current.request.env.http_host
         login_url = "http://%s/%s/default/user/login" % \
-            (host,request.application)
+            (host, request.application)
         auth.settings.actions_disabled = \
-            ['register','change_password','request_reset_password']
+            ['register', 'change_password', 'request_reset_password']
         auth.settings.login_form = DropboxAccount(
-            request,key=key,secret=secret,access_type=access_type,
-            login_url = login_url,**kwargs)
-
+            request, key=key, secret=secret, access_type=access_type,
+            login_url=login_url, **kwargs)
diff --git a/gluon/contrib/login_methods/email_auth.py b/gluon/contrib/login_methods/email_auth.py
index a53011a2..840fc0c3 100644
--- a/gluon/contrib/login_methods/email_auth.py
+++ b/gluon/contrib/login_methods/email_auth.py
@@ -1,6 +1,7 @@
 import smtplib
 import logging
 
+
 def email_auth(server="smtp.gmail.com:587",
                domain="@gmail.com",
                tls_mode=None):
@@ -17,9 +18,9 @@ def email_auth(server="smtp.gmail.com:587",
                        domain=domain,
                        tls_mode=tls_mode):
         if domain:
-            if not isinstance(domain,(list,tuple)):
-                domain=[str(domain)]
-            if not [d for d in domain if email[-len(d):]==d]:
+            if not isinstance(domain, (list, tuple)):
+                domain = [str(domain)]
+            if not [d for d in domain if email[-len(d):] == d]:
                 return False
         (host, port) = server.split(':')
         if tls_mode is None:  # then auto detect
@@ -43,4 +44,3 @@ def email_auth(server="smtp.gmail.com:587",
                     pass
             return False
     return email_auth_aux
-
diff --git a/gluon/contrib/login_methods/extended_login_form.py b/gluon/contrib/login_methods/extended_login_form.py
index 059d4816..6946531d 100644
--- a/gluon/contrib/login_methods/extended_login_form.py
+++ b/gluon/contrib/login_methods/extended_login_form.py
@@ -8,6 +8,7 @@ So user can choose the built-in login or extended login methods.
 
 from gluon import current, DIV
 
+
 class ExtendedLoginForm(object):
     """
     Put extended_login_form under web2py/gluon/contrib/login_methods folder.
@@ -22,7 +23,8 @@ class ExtendedLoginForm(object):
                                 api_key="...",
                                 domain="...",
                                 url = "http://localhost:8000/%s/default/user/login" % request.application)
-    extended_login_form = ExtendedLoginForm(auth, alt_login_form, signals=['token'])
+    extended_login_form = ExtendedLoginForm(
+        auth, alt_login_form, signals=['token'])
 
     auth.settings.login_form = extended_login_form
 
@@ -37,7 +39,7 @@ class ExtendedLoginForm(object):
                  auth,
                  alt_login_form,
                  signals=[],
-                 login_arg = 'login'
+                 login_arg='login'
                  ):
         self.auth = auth
         self.alt_login_form = alt_login_form
@@ -50,7 +52,7 @@ class ExtendedLoginForm(object):
         """
         if hasattr(self.alt_login_form, 'get_user'):
             return self.alt_login_form.get_user()
-        return None # let gluon.tools.Auth.get_or_create_user do the rest
+        return None  # let gluon.tools.Auth.get_or_create_user do the rest
 
     def login_url(self, next):
         """
@@ -91,8 +93,8 @@ class ExtendedLoginForm(object):
         args = request.args
 
         if (self.signals and
-            any([True for signal in self.signals if request.vars.has_key(signal)])
-           ):
+            any([True for signal in self.signals if signal in request.vars])
+            ):
             return self.alt_login_form.login_form()
 
         self.auth.settings.login_form = self.auth
@@ -101,5 +103,3 @@ class ExtendedLoginForm(object):
 
         form.components.append(self.alt_login_form.login_form())
         return form
-
-
diff --git a/gluon/contrib/login_methods/gae_google_account.py b/gluon/contrib/login_methods/gae_google_account.py
index 9559b42a..49b435b0 100644
--- a/gluon/contrib/login_methods/gae_google_account.py
+++ b/gluon/contrib/login_methods/gae_google_account.py
@@ -11,6 +11,7 @@ Thanks to Hans Donner <hans.donner@pobox.com> for GaeGoogleAccount.
 
 from google.appengine.api import users
 
+
 class GaeGoogleAccount(object):
     """
     Login will be done via Google's Appengine login object, instead of web2py's
@@ -35,5 +36,3 @@ class GaeGoogleAccount(object):
         if user:
             return dict(nickname=user.nickname(), email=user.email(),
                         user_id=user.user_id(), source="google account")
-
-
diff --git a/gluon/contrib/login_methods/ldap_auth.py b/gluon/contrib/login_methods/ldap_auth.py
index 2eb76bcf..a0574318 100644
--- a/gluon/contrib/login_methods/ldap_auth.py
+++ b/gluon/contrib/login_methods/ldap_auth.py
@@ -188,18 +188,23 @@ def ldap_auth(server='ldap', port=None,
                      str(custom_scope), str(manage_groups)))
         if manage_user:
             if user_firstname_attrib.count(':') > 0:
-                (user_firstname_attrib, user_firstname_part) = user_firstname_attrib.split(':', 1)
+                (user_firstname_attrib,
+                 user_firstname_part) = user_firstname_attrib.split(':', 1)
                 user_firstname_part = (int(user_firstname_part) - 1)
             else:
                 user_firstname_part = None
             if user_lastname_attrib.count(':') > 0:
-                (user_lastname_attrib, user_lastname_part) = user_lastname_attrib.split(':', 1)
+                (user_lastname_attrib,
+                 user_lastname_part) = user_lastname_attrib.split(':', 1)
                 user_lastname_part = (int(user_lastname_part) - 1)
             else:
                 user_lastname_part = None
-            user_firstname_attrib = ldap.filter.escape_filter_chars(user_firstname_attrib)
-            user_lastname_attrib = ldap.filter.escape_filter_chars(user_lastname_attrib)
-            user_mail_attrib = ldap.filter.escape_filter_chars(user_mail_attrib)
+            user_firstname_attrib = ldap.filter.escape_filter_chars(
+                user_firstname_attrib)
+            user_lastname_attrib = ldap.filter.escape_filter_chars(
+                user_lastname_attrib)
+            user_mail_attrib = ldap.filter.escape_filter_chars(
+                user_mail_attrib)
         try:
             if allowed_groups:
                 if not is_user_in_allowed_groups(username, password):
@@ -310,7 +315,8 @@ def ldap_auth(server='ldap', port=None,
                     basedns = ldap_basedn
                 else:
                     basedns = [ldap_basedn]
-                filter = '(&(uid=%s)(%s))' % (ldap.filter.escape_filter_chars(username), filterstr)
+                filter = '(&(uid=%s)(%s))' % (
+                    ldap.filter.escape_filter_chars(username), filterstr)
                 found = False
                 for basedn in basedns:
                     try:
@@ -338,7 +344,8 @@ def ldap_auth(server='ldap', port=None,
                 else:
                     basedns = [ldap_basedn]
                 filter = '(&(%s=%s)(%s))' % (username_attrib,
-                                             ldap.filter.escape_filter_chars(username),
+                                             ldap.filter.escape_filter_chars(
+                                                 username),
                                              filterstr)
                 if custom_scope == 'subtree':
                     ldap_scope = ldap.SCOPE_SUBTREE
@@ -368,14 +375,16 @@ def ldap_auth(server='ldap', port=None,
                 logger.info('[%s] Manage user data' % str(username))
                 try:
                     if user_firstname_part is not None:
-                        store_user_firstname = result[user_firstname_attrib][0].split(' ', 1)[user_firstname_part]
+                        store_user_firstname = result[user_firstname_attrib][
+                            0].split(' ', 1)[user_firstname_part]
                     else:
                         store_user_firstname = result[user_firstname_attrib][0]
                 except KeyError, e:
                     store_user_firstname = None
                 try:
                     if user_lastname_part is not None:
-                        store_user_lastname = result[user_lastname_attrib][0].split(' ', 1)[user_lastname_part]
+                        store_user_lastname = result[user_lastname_attrib][
+                            0].split(' ', 1)[user_lastname_part]
                     else:
                         store_user_lastname = result[user_lastname_attrib][0]
                 except KeyError, e:
@@ -464,16 +473,19 @@ def ldap_auth(server='ldap', port=None,
             #
             # Get all group name where the user is in actually in ldap
             # #########################################################
-            ldap_groups_of_the_user = get_user_groups_from_ldap(username, password)
+            ldap_groups_of_the_user = get_user_groups_from_ldap(
+                username, password)
 
             #
             # Get all group name where the user is in actually in local db
             # #############################################################
             try:
-                db_user_id = db(db.auth_user.username == username).select(db.auth_user.id).first().id
+                db_user_id = db(db.auth_user.username == username).select(
+                    db.auth_user.id).first().id
             except:
                 try:
-                    db_user_id = db(db.auth_user.email == username).select(db.auth_user.id).first().id
+                    db_user_id = db(db.auth_user.email == username).select(
+                        db.auth_user.id).first().id
                 except AttributeError, e:
                     #
                     # There is no user in local db
@@ -486,7 +498,8 @@ def ldap_auth(server='ldap', port=None,
                         db_user_id = db.auth_user.insert(email=username,
                                                          first_name=username)
             if not db_user_id:
-                logging.error('There is no username or email for %s!' % username)
+                logging.error(
+                    'There is no username or email for %s!' % username)
                 raise
             db_group_search = db((db.auth_membership.user_id == db_user_id) &
                                 (db.auth_user.id == db.auth_membership.user_id) &
@@ -520,7 +533,8 @@ def ldap_auth(server='ldap', port=None,
                         gid = db.auth_group.insert(role=group_to_add,
                                                    description='Generated from LDAP')
                     else:
-                        gid = db(db.auth_group.role == group_to_add).select(db.auth_group.id).first().id
+                        gid = db(db.auth_group.role == group_to_add).select(
+                            db.auth_group.id).first().id
                     db.auth_membership.insert(user_id=db_user_id,
                                               group_id=gid)
         except:
@@ -634,4 +648,3 @@ def ldap_auth(server='ldap', port=None,
     if filterstr[0] == '(' and filterstr[-1] == ')':  # rfc4515 syntax
         filterstr = filterstr[1:-1]  # parens added again where used
     return ldap_auth_aux
-
diff --git a/gluon/contrib/login_methods/linkedin_account.py b/gluon/contrib/login_methods/linkedin_account.py
index f16deadd..4376a628 100644
--- a/gluon/contrib/login_methods/linkedin_account.py
+++ b/gluon/contrib/login_methods/linkedin_account.py
@@ -14,7 +14,8 @@ from gluon.http import HTTP
 try:
     import linkedin
 except ImportError:
-    raise HTTP(400,"linkedin module not found")
+    raise HTTP(400, "linkedin module not found")
+
 
 class LinkedInAccount(object):
     """
@@ -28,9 +29,9 @@ class LinkedInAccount(object):
 
     """
 
-    def __init__(self,request,key,secret,return_url):
+    def __init__(self, request, key, secret, return_url):
         self.request = request
-        self.api = linkedin.LinkedIn(key,secret,return_url)
+        self.api = linkedin.LinkedIn(key, secret, return_url)
         self.token = result = self.api.requestToken()
 
     def login_url(self, next="/"):
@@ -40,13 +41,12 @@ class LinkedInAccount(object):
         return ''
 
     def get_user(self):
-        result = self.request.vars.verifier and self.api.accessToken(verifier = self.request.vars.verifier )
+        result = self.request.vars.verifier and self.api.accessToken(
+            verifier=self.request.vars.verifier)
         if result:
             profile = self.api.GetProfile()
-            profile = self.api.GetProfile(profile).public_url = "http://www.linkedin.com/in/ozgurv"
-            return dict(first_name = profile.first_name,
-                        last_name = profile.last_name,
-                        username = profile.id)
-
-
-
+            profile = self.api.GetProfile(
+                profile).public_url = "http://www.linkedin.com/in/ozgurv"
+            return dict(first_name=profile.first_name,
+                        last_name=profile.last_name,
+                        username=profile.id)
diff --git a/gluon/contrib/login_methods/loginza.py b/gluon/contrib/login_methods/loginza.py
index a54e3ca9..9c688f77 100644
--- a/gluon/contrib/login_methods/loginza.py
+++ b/gluon/contrib/login_methods/loginza.py
@@ -13,6 +13,7 @@ from gluon.tools import fetch
 from gluon.storage import Storage
 import gluon.contrib.simplejson as json
 
+
 class Loginza(object):
 
     """
@@ -23,13 +24,13 @@ class Loginza(object):
 
     def __init__(self,
                  request,
-                 url = "",
-                 embed = True,
-                 auth_url = "http://loginza.ru/api/authinfo",
-                 language = "en",
-                 prompt = "loginza",
-                 on_login_failure = None,
-                ):
+                 url="",
+                 embed=True,
+                 auth_url="http://loginza.ru/api/authinfo",
+                 language="en",
+                 prompt="loginza",
+                 on_login_failure=None,
+                 ):
 
         self.request = request
         self.token_url = url
@@ -46,49 +47,50 @@ class Loginza(object):
         # FIXME: what if email is unique=True
 
         self.mappings["http://twitter.com/"] = lambda profile:\
-            dict(registration_id = profile.get("identity",""),
-                 username = profile.get("nickname",""),
-                 email = profile.get("email",""),
-                 last_name = profile.get("name","").get("full_name",""),
+            dict(registration_id=profile.get("identity", ""),
+                 username=profile.get("nickname", ""),
+                 email=profile.get("email", ""),
+                 last_name=profile.get("name", "").get("full_name", ""),
                  #avatar = profile.get("photo",""),
-            )
+                 )
         self.mappings["https://www.google.com/accounts/o8/ud"] = lambda profile:\
-            dict(registration_id = profile.get("identity",""),
-                 username = profile.get("name","").get("full_name",""),
-                 email = profile.get("email",""),
-                 first_name = profile.get("name","").get("first_name",""),
-                 last_name = profile.get("name","").get("last_name",""),
+            dict(registration_id=profile.get("identity", ""),
+                 username=profile.get("name", "").get("full_name", ""),
+                 email=profile.get("email", ""),
+                 first_name=profile.get("name", "").get("first_name", ""),
+                 last_name=profile.get("name", "").get("last_name", ""),
                  #avatar = profile.get("photo",""),
-            )
+                 )
         self.mappings["http://vkontakte.ru/"] = lambda profile:\
-            dict(registration_id=profile.get("identity",""),
-                 username = profile.get("name","").get("full_name",""),
-                 email = profile.get("email",""),
-                 first_name = profile.get("name","").get("first_name",""),
-                 last_name = profile.get("name","").get("last_name",""),
+            dict(registration_id=profile.get("identity", ""),
+                 username=profile.get("name", "").get("full_name", ""),
+                 email=profile.get("email", ""),
+                 first_name=profile.get("name", "").get("first_name", ""),
+                 last_name=profile.get("name", "").get("last_name", ""),
                  #avatar = profile.get("photo",""),
-            )
+                 )
         self.mappings.default = lambda profile:\
-            dict(registration_id = profile.get("identity",""),
-                 username = profile.get("name","").get("full_name"),
-                 email = profile.get("email",""),
-                 first_name = profile.get("name","").get("first_name",""),
-                 last_name = profile.get("name","").get("last_name",""),
+            dict(registration_id=profile.get("identity", ""),
+                 username=profile.get("name", "").get("full_name"),
+                 email=profile.get("email", ""),
+                 first_name=profile.get("name", "").get("first_name", ""),
+                 last_name=profile.get("name", "").get("last_name", ""),
                  #avatar = profile.get("photo",""),
-            )
+                 )
 
     def get_user(self):
         request = self.request
         if request.vars.token:
             user = Storage()
-            data = urllib.urlencode(dict(token = request.vars.token))
-            auth_info_json = fetch(self.auth_url+'?'+data)
+            data = urllib.urlencode(dict(token=request.vars.token))
+            auth_info_json = fetch(self.auth_url + '?' + data)
             #print auth_info_json
             auth_info = json.loads(auth_info_json)
-            if auth_info["identity"] != None:
+            if auth_info["identity"] is not None:
                 self.profile = auth_info
                 provider = self.profile["provider"]
-                user = self.mappings.get(provider, self.mappings.default)(self.profile)
+                user = self.mappings.get(
+                    provider, self.mappings.default)(self.profile)
                 #user["password"] = ???
                 #user["avatar"] = ???
                 return user
@@ -106,8 +108,8 @@ class Loginza(object):
                           _frameborder="no",
                           _style="width:359px;height:300px;")
         else:
-            form = DIV(A(self.prompt, _href=LOGINZA_URL % (self.language, self.token_url), _class="loginza"),
-                   SCRIPT(_src="https://s3-eu-west-1.amazonaws.com/s1.loginza.ru/js/widget.js", _type="text/javascript"))
+            form = DIV(
+                A(self.prompt, _href=LOGINZA_URL % (
+                    self.language, self.token_url), _class="loginza"),
+                SCRIPT(_src="https://s3-eu-west-1.amazonaws.com/s1.loginza.ru/js/widget.js", _type="text/javascript"))
         return form
-
-
diff --git a/gluon/contrib/login_methods/motp_auth.py b/gluon/contrib/login_methods/motp_auth.py
index 8d2bfa70..aad9d27b 100644
--- a/gluon/contrib/login_methods/motp_auth.py
+++ b/gluon/contrib/login_methods/motp_auth.py
@@ -4,6 +4,7 @@ import time
 from hashlib import md5
 from gluon.dal import DAL
 
+
 def motp_auth(db=DAL('sqlite://storage.sqlite'),
               time_offset=60):
 
@@ -44,7 +45,8 @@ def motp_auth(db=DAL('sqlite://storage.sqlite'),
               writable=False, readable=False, default=''))
 
     ##validators
-    custom_auth_table = db[auth.settings.table_user_name] # get the custom_auth_table
+    custom_auth_table = db[auth.settings.table_user_name]
+        # get the custom_auth_table
     custom_auth_table.first_name.requires = \
       IS_NOT_EMPTY(error_message=auth.messages.is_empty)
     custom_auth_table.last_name.requires = \
@@ -76,14 +78,15 @@ def motp_auth(db=DAL('sqlite://storage.sqlite'),
     - as of now user field is hardcoded to email. Some way of selecting user table and user field.
     """
 
-    def verify_otp(otp,pin,secret,offset=60):
+    def verify_otp(otp, pin, secret, offset=60):
         epoch_time = int(time.time())
         time_start = int(str(epoch_time - offset)[:-1])
         time_end = int(str(epoch_time + offset)[:-1])
-        for t in range(time_start-1,time_end+1):
-            to_hash = str(t)+secret+pin
+        for t in range(time_start - 1, time_end + 1):
+            to_hash = str(t) + secret + pin
             hash = md5(to_hash).hexdigest()[:6]
-            if otp == hash: return True
+            if otp == hash:
+                return True
         return False
 
     def motp_auth_aux(email,
@@ -91,15 +94,18 @@ def motp_auth(db=DAL('sqlite://storage.sqlite'),
                       db=db,
                       offset=time_offset):
         if db:
-            user_data =  db(db.auth_user.email == email ).select().first()
+            user_data = db(db.auth_user.email == email).select().first()
             if user_data:
                 if user_data['motp_secret'] and user_data['motp_pin']:
                     motp_secret = user_data['motp_secret']
                     motp_pin = user_data['motp_pin']
-                    otp_check = verify_otp(password,motp_pin,motp_secret,offset=offset)
-                    if otp_check: return True
-                    else: return False
-                else: return False
+                    otp_check = verify_otp(
+                        password, motp_pin, motp_secret, offset=offset)
+                    if otp_check:
+                        return True
+                    else:
+                        return False
+                else:
+                    return False
         return False
     return motp_auth_aux
-
diff --git a/gluon/contrib/login_methods/oauth10a_account.py b/gluon/contrib/login_methods/oauth10a_account.py
index 534a7582..1f464f8c 100644
--- a/gluon/contrib/login_methods/oauth10a_account.py
+++ b/gluon/contrib/login_methods/oauth10a_account.py
@@ -19,6 +19,7 @@ from urllib2 import urlopen
 import urllib2
 from urllib import urlencode
 
+
 class OAuthAccount(object):
     """
     Login will be done via   OAuth Framework, instead of web2py's
@@ -51,7 +52,8 @@ class OAuthAccount(object):
         TOKEN_URL="..."
         ACCESS_TOKEN_URL="..."
         from gluon.contrib.login_methods.oauth10a_account import OAuthAccount
-        auth.settings.login_form=OAuthAccount(globals(),CLIENT_ID,CLIENT_SECRET, AUTH_URL, TOKEN_URL, ACCESS_TOKEN_URL)
+        auth.settings.login_form=OAuthAccount(globals(
+            ),CLIENT_ID,CLIENT_SECRET, AUTH_URL, TOKEN_URL, ACCESS_TOKEN_URL)
 
     """
 
@@ -61,20 +63,20 @@ class OAuthAccount(object):
         Appends the _next action to the generated url so the flows continues.
         """
         r = self.request
-        http_host=r.env.http_x_forwarded_for
-        if not http_host: http_host=r.env.http_host
+        http_host = r.env.http_x_forwarded_for
+        if not http_host:
+            http_host = r.env.http_host
 
         url_scheme = r.env.wsgi_url_scheme
         if next:
             path_info = next
         else:
             path_info = r.env.path_info
-        uri = '%s://%s%s' %(url_scheme, http_host, path_info)
+        uri = '%s://%s%s' % (url_scheme, http_host, path_info)
         if r.get_vars and not next:
             uri += '?' + urlencode(r.get_vars)
         return uri
 
-
     def accessToken(self):
         """Return the access token generated by the authenticating server.
 
@@ -97,12 +99,11 @@ class OAuthAccount(object):
             token.set_verifier(self.request.vars.oauth_verifier)
             client = oauth.Client(self.consumer, token)
 
-
             resp, content = client.request(self.access_token_url, "POST")
             if str(resp['status']) != '200':
                 self.session.request_token = None
-                self.globals['redirect'](self.globals['URL'](f='user',args='logout'))
-
+                self.globals['redirect'](self.globals[
+                                         'URL'](f='user', args='logout'))
 
             self.session.access_token = oauth.Token.from_string(content)
 
@@ -111,7 +112,7 @@ class OAuthAccount(object):
         self.session.access_token = None
         return None
 
-    def __init__(self, g, client_id, client_secret, auth_url,  token_url, access_token_url):
+    def __init__(self, g, client_id, client_secret, auth_url, token_url, access_token_url):
         self.globals = g
         self.client_id = client_id
         self.client_secret = client_secret
@@ -125,7 +126,6 @@ class OAuthAccount(object):
         # consumer init
         self.consumer = oauth.Consumer(self.client_id, self.client_secret)
 
-
     def login_url(self, next="/"):
         self.__oauth_login(next)
         return next
@@ -142,7 +142,7 @@ class OAuthAccount(object):
         is, this function must be implemented for the specific
         provider.
         '''
-        raise NotImplementedError, "Must override get_user()"
+        raise NotImplementedError("Must override get_user()")
 
     def __oauth_login(self, next):
         '''This method redirects the user to the authenticating form
@@ -163,10 +163,11 @@ class OAuthAccount(object):
             # putting it in the body seems to work.
             callback_url = self.__redirect_uri(next)
             data = urlencode(dict(oauth_callback=callback_url))
-            resp, content = client.request(self.token_url, "POST",  body=data)
+            resp, content = client.request(self.token_url, "POST", body=data)
             if resp['status'] != '200':
                 self.session.request_token = None
-                self.globals['redirect'](self.globals['URL'](f='user',args='logout'))
+                self.globals['redirect'](self.globals[
+                                         'URL'](f='user', args='logout'))
 
             # Store the request token in session.
             request_token = self.session.request_token = oauth.Token.from_string(content)
@@ -174,18 +175,12 @@ class OAuthAccount(object):
             # Redirect the user to the authentication URL and pass the callback url.
             data = urlencode(dict(oauth_token=request_token.key,
                                   oauth_callback=callback_url))
-            auth_request_url = self.auth_url + '?' +data
-
+            auth_request_url = self.auth_url + '?' + data
 
             HTTP = self.globals['HTTP']
 
-
             raise HTTP(307,
                        "You are not authenticated: you are being redirected to the <a href='" + auth_request_url + "'> authentication server</a>",
                        Location=auth_request_url)
 
         return None
-
-
-
-
diff --git a/gluon/contrib/login_methods/oauth20_account.py b/gluon/contrib/login_methods/oauth20_account.py
index e3d38321..0ed3adb2 100644
--- a/gluon/contrib/login_methods/oauth20_account.py
+++ b/gluon/contrib/login_methods/oauth20_account.py
@@ -17,6 +17,7 @@ import urllib2
 from urllib import urlencode
 from gluon import current, redirect, HTTP
 
+
 class OAuthAccount(object):
     """
     Login will be done via   OAuth Framework, instead of web2py's
@@ -84,7 +85,8 @@ class OAuthAccount(object):
                                username = user['id'])
 
 
-               auth.settings.actions_disabled=['register','change_password','request_reset_password','profile']
+               auth.settings.actions_disabled=['register',
+                   'change_password','request_reset_password','profile']
                auth.settings.login_form=FaceBookAccount()
 
 Any optional arg in the constructor will be passed asis to remote
@@ -99,8 +101,9 @@ server for requests.  It can be used for the optional"scope" parameters for Face
         """
 
         r = current.request
-        http_host=r.env.http_x_forwarded_for
-        if not http_host: http_host=r.env.http_host
+        http_host = r.env.http_x_forwarded_for
+        if not http_host:
+            http_host = r.env.http_host
 
         url_scheme = r.env.wsgi_url_scheme
         if next:
@@ -112,7 +115,6 @@ server for requests.  It can be used for the optional"scope" parameters for Face
             uri += '?' + urlencode(r.get_vars)
         return uri
 
-
     def __build_url_opener(self, uri):
         """
         Build the url opener for managing HTTP Basic Athentication
@@ -128,7 +130,6 @@ server for requests.  It can be used for the optional"scope" parameters for Face
         opener = urllib2.build_opener(auth_handler)
         return opener
 
-
     def accessToken(self):
         """
         Return the access token generated by the authenticating server.
@@ -137,7 +138,7 @@ server for requests.  It can be used for the optional"scope" parameters for Face
         Otherwise the token is fetched from the auth server.
 
         """
-        if current.session.token and current.session.token.has_key('expires'):
+        if current.session.token and 'expires' in current.session.token:
             expires = current.session.token['expires']
             # reuse token until expiration
             if expires == 0 or expires > time.time():
@@ -159,19 +160,19 @@ server for requests.  It can be used for the optional"scope" parameters for Face
                 print tmp
                 raise Exception(tmp)
             finally:
-                del current.session.code # throw it away
+                del current.session.code  # throw it away
 
             if open_url:
                 try:
                     data = open_url.read()
                     tokendata = cgi.parse_qs(data)
                     current.session.token = \
-                        dict([(k,v[-1]) for k,v in tokendata.items()])
+                        dict([(k, v[-1]) for k, v in tokendata.items()])
                     # set expiration absolute time try to avoid broken
                     # implementations where "expires_in" becomes "expires"
-                    if current.session.token.has_key('expires_in'):
+                    if 'expires_in' in current.session.token:
                         exps = 'expires_in'
-                    elif current.session.token.has_key('expires'):
+                    elif 'expires' in current.session.token:
                         exps = 'expires'
                     else:
                         exps = None
@@ -217,11 +218,12 @@ server for requests.  It can be used for the optional"scope" parameters for Face
         Override this method by sublcassing the class.
 
         """
-        if not current.session.token: return None
-        return dict(first_name = 'Pinco',
-                    last_name = 'Pallino',
-                    username = 'pincopallino')
-        raise NotImplementedError, "Must override get_user()"
+        if not current.session.token:
+            return None
+        return dict(first_name='Pinco',
+                    last_name='Pallino',
+                    username='pincopallino')
+        raise NotImplementedError("Must override get_user()")
 
         # Following code is never executed.  It can be used as example
         # for overriding in subclasses.
@@ -239,10 +241,9 @@ server for requests.  It can be used for the optional"scope" parameters for Face
             self.graph = None
 
         if user:
-            return dict(first_name = user['first_name'],
-                        last_name = user['last_name'],
-                        username = user['id'])
-
+            return dict(first_name=user['first_name'],
+                        last_name=user['last_name'],
+                        username=user['id'])
 
     def __oauth_login(self, next):
         """
@@ -258,13 +259,13 @@ server for requests.  It can be used for the optional"scope" parameters for Face
 
         if not self.accessToken():
             if not current.request.vars.code:
-                current.session.redirect_uri=self.__redirect_uri(next)
+                current.session.redirect_uri = self.__redirect_uri(next)
                 data = dict(redirect_uri=current.session.redirect_uri,
-                                  response_type='code',
-                                  client_id=self.client_id)
+                            response_type='code',
+                            client_id=self.client_id)
                 if self.args:
                     data.update(self.args)
-                auth_request_url = self.auth_url + "?" +urlencode(data)
+                auth_request_url = self.auth_url + "?" + urlencode(data)
                 raise HTTP(307,
                            "You are not authenticated: you are being redirected to the <a href='" + auth_request_url + "'> authentication server</a>",
                            Location=auth_request_url)
@@ -273,5 +274,3 @@ server for requests.  It can be used for the optional"scope" parameters for Face
                 self.accessToken()
                 return current.session.code
         return None
-
-
diff --git a/gluon/contrib/login_methods/openid_auth.py b/gluon/contrib/login_methods/openid_auth.py
index a2c22633..4e977030 100644
--- a/gluon/contrib/login_methods/openid_auth.py
+++ b/gluon/contrib/login_methods/openid_auth.py
@@ -49,6 +49,7 @@ except ImportError, err:
 
 DEFAULT = lambda: None
 
+
 class OpenIDAuth(object):
     """
     OpenIDAuth
@@ -94,7 +95,7 @@ class OpenIDAuth(object):
         if not auth.settings.table_user:
             raise
         self.table_user = self.auth.settings.table_user
-        self.openid_expiration = 15 #minutes
+        self.openid_expiration = 15  # minutes
 
         self.messages = self._define_messages()
 
@@ -116,7 +117,7 @@ class OpenIDAuth(object):
         messages.flash_openid_associated = 'OpenID associated'
         messages.flash_associate_openid = 'Please login or register an account for this OpenID.'
         messages.p_openid_not_registered = "This Open ID haven't be registered. " \
-                + "Please login to associate with it or register an account for it."
+            + "Please login to associate with it or register an account for it."
         messages.flash_openid_authenticated = 'OpenID authenticated successfully.'
         messages.flash_openid_fail_authentication = 'OpenID authentication failed. (Error message: %s)'
         messages.flash_openid_canceled = 'OpenID authentication canceled by user.'
@@ -158,7 +159,7 @@ class OpenIDAuth(object):
         and not processed yet. Else return the OpenID form for login.
         """
         request = current.request
-        if request.vars.has_key('janrain_nonce') and not self._processed():
+        if 'janrain_nonce' in request.vars and not self._processed():
             self._process_response()
             return self.auth()
         return self._form()
@@ -172,12 +173,12 @@ class OpenIDAuth(object):
         args = request.args
 
         if args[0] == 'logout':
-            return True # Let logout_url got called
+            return True  # Let logout_url got called
 
         if current.session.w2popenid:
             w2popenid = current.session.w2popenid
             db = self.db
-            if (w2popenid.ok is True and w2popenid.oid): # OpenID authenticated
+            if (w2popenid.ok is True and w2popenid.oid):  # OpenID authenticated
                 if self._w2popenid_expired(w2popenid):
                     del(current.session.w2popenid)
                     flash = self.messages.flash_openid_expired
@@ -196,22 +197,23 @@ class OpenIDAuth(object):
                         if current.session.w2popenid:
                             del(current.session.w2popenid)
                         current.session.flash = self.messages.flash_openid_associated
-                        if request.vars.has_key(nextvar):
+                        if nextvar in request.vars:
                             redirect(request.vars[nextvar])
                         redirect(self.auth.settings.login_next)
 
-                    if not request.vars.has_key(nextvar):
+                    if nextvar not in request.vars:
                         # no next var, add it and do login again
                         # so if user login or register can go back here to associate the OpenID
                         redirect(URL(r=request,
-                                                      args=['login'],
-                                                      vars={nextvar:self.login_url}))
+                                     args=['login'],
+                                     vars={nextvar: self.login_url}))
                     self.login_form = self._form_with_notification()
                     current.session.flash = self.messages.flash_associate_openid
-                    return None # need to login or register to associate this openid
+                    return None  # need to login or register to associate this openid
 
                 # Get existed OpenID user
-                user = db(self.table_user.id==alt_login.user).select().first()
+                user = db(
+                    self.table_user.id == alt_login.user).select().first()
                 if user:
                     if current.session.w2popenid:
                         del(current.session.w2popenid)
@@ -219,16 +221,17 @@ class OpenIDAuth(object):
                     username = 'username'
                 elif 'email' in self.table_user.fields():
                     username = 'email'
-                return {username: user[username]} if user else None # login success (almost)
+                return {username: user[username]} if user else None  # login success (almost)
 
-        return None # just start to login
+        return None  # just start to login
 
     def _find_matched_openid(self, db, oid, type_='openid'):
         """
         Get the matched OpenID for given
         """
-        query = ((db.alt_logins.username == oid) & (db.alt_logins.type == type_))
-        alt_login = db(query).select().first() # Get the OpenID record
+        query = (
+            (db.alt_logins.username == oid) & (db.alt_logins.type == type_))
+        alt_login = db(query).select().first()  # Get the OpenID record
         return alt_login
 
     def _associate_user_openid(self, user, oid):
@@ -275,7 +278,6 @@ class OpenIDAuth(object):
                                                  self.db)
         return self.consumerhelper
 
-
     def _form(self, style=None):
         form = DIV(H3(self.messages.h_openid_login), self._login_form(style))
         return form
@@ -300,7 +302,7 @@ background-color: transparent;
 padding-left: 18px;
 width: 400px;
 """
-        style = style.replace("\n","")
+        style = style.replace("\n", "")
 
         request = current.request
         session = current.session
@@ -308,21 +310,25 @@ width: 400px;
         hidden_next_input = ""
         if _next == 'profile':
             profile_url = URL(r=request, f='user', args=['profile'])
-            hidden_next_input = INPUT(_type="hidden", _name="_next", _value=profile_url)
-        form = FORM(openid_field_label or self.messages.label_alt_login_username,
-                    INPUT(_type="input", _name="oid",
-                          requires=IS_NOT_EMPTY(error_message=messages.openid_fail_discover),
-                          _style=style),
-                    hidden_next_input,
-                    INPUT(_type="submit", _value=submit_button or messages.submit_button),
-                    " ",
-                    A(messages.comment_openid_signin,
-                      _href=messages.comment_openid_help_url,
-                      _title=messages.comment_openid_help_title,
-                      _class='openid-identifier',
-                      _target="_blank"),
-                    _action=self.login_url
-                   )
+            hidden_next_input = INPUT(
+                _type="hidden", _name="_next", _value=profile_url)
+        form = FORM(
+            openid_field_label or self.messages.label_alt_login_username,
+            INPUT(_type="input", _name="oid",
+                  requires=IS_NOT_EMPTY(
+                  error_message=messages.openid_fail_discover),
+                  _style=style),
+            hidden_next_input,
+            INPUT(_type="submit",
+                  _value=submit_button or messages.submit_button),
+            " ",
+            A(messages.comment_openid_signin,
+              _href=messages.comment_openid_help_url,
+              _title=messages.comment_openid_help_title,
+              _class='openid-identifier',
+              _target="_blank"),
+            _action=self.login_url
+        )
         if form.accepts(request.vars, session):
             oid = request.vars.oid
             consumerhelper = self._init_consumerhelper()
@@ -332,8 +338,9 @@ width: 400px;
                 warning_openid_fail(session)
                 redirect(url)
             try:
-                if request.vars.has_key('_next'):
-                    return_to_url = self.return_to_url + '?_next=' + request.vars._next
+                if '_next' in request.vars:
+                    return_to_url = self.return_to_url + \
+                        '?_next=' + request.vars._next
                 url = consumerhelper.begin(oid, self.realm, return_to_url)
             except DiscoveryFailure:
                 warning_openid_fail(session)
@@ -353,7 +360,8 @@ width: 400px;
         """
         Set expiration for OpenID authentication.
         """
-        w2popenid.expiration = datetime.now() + timedelta(minutes=self.openid_expiration)
+        w2popenid.expiration = datetime.now(
+        ) + timedelta(minutes=self.openid_expiration)
 
     def _w2popenid_expired(self, w2popenid):
         """
@@ -369,7 +377,8 @@ width: 400px;
         request = current.request
         request_vars = request.vars
         consumerhelper = self._init_consumerhelper()
-        process_status = consumerhelper.process_response(request_vars, self.return_to_url)
+        process_status = consumerhelper.process_response(
+            request_vars, self.return_to_url)
         if process_status == "success":
             w2popenid = current.session.w2popenid
             user_data = self.consumerhelper.sreg()
@@ -388,7 +397,7 @@ width: 400px;
     def list_user_openids(self):
         messages = self.messages
         request = current.request
-        if request.vars.has_key('delete_openid'):
+        if 'delete_openid' in request.vars:
             self.remove_openid(request.vars.delete_openid)
 
         query = self.db.alt_logins.user == self.auth.user.id
@@ -397,8 +406,8 @@ width: 400px;
         for alt_login in alt_logins:
             username = alt_login.username
             delete_href = URL(r=request, f='user',
-                                          args=['profile'],
-                                          vars={'delete_openid': username})
+                              args=['profile'],
+                              vars={'delete_openid': username})
             delete_link = A(messages.a_delete, _href=delete_href)
             l.append(LI(username, " ", delete_link))
 
@@ -409,23 +418,23 @@ width: 400px;
                               _next='profile',
                               submit_button=messages.submit_button_add,
                               openid_field_label=messages.label_add_alt_login_username)
-                         )
+                          )
         return openid_list
 
-
     def remove_openid(self, openid):
         query = self.db.alt_logins.username == openid
         self.db(query).delete()
 
+
 class ConsumerHelper(object):
     """
     ConsumerHelper knows the python-openid and
     """
 
     def __init__(self, session, db):
-       self.session = session
-       store = self._init_store(db)
-       self.consumer = openid.consumer.consumer.Consumer(session, store)
+        self.session = session
+        store = self._init_store(db)
+        self.consumer = openid.consumer.consumer.Consumer(session, store)
 
     def _init_store(self, db):
         """
@@ -434,7 +443,7 @@ class ConsumerHelper(object):
         if not hasattr(self, "store"):
             store = Web2pyStore(db)
             session = self.session
-            if not session.has_key('w2popenid'):
+            if 'w2popenid' not in session:
                 session.w2popenid = Storage()
             self.store = store
         return self.store
@@ -446,7 +455,7 @@ class ConsumerHelper(object):
         w2popenid = self.session.w2popenid
         w2popenid.oid = oid
         auth_req = self.consumer.begin(oid)
-        auth_req.addExtension(SRegRequest(required=['email','nickname']))
+        auth_req.addExtension(SRegRequest(required=['email', 'nickname']))
         url = auth_req.redirectURL(return_to=return_to_url, realm=realm)
         return url
 
@@ -504,19 +513,27 @@ class Web2pyStore(OpenIDStore):
 
         if self.table_oid_associations_name not in self.database:
             self.database.define_table(self.table_oid_associations_name,
-                            Field('server_url', 'string', length=2047, required=True),
-                            Field('handle', 'string', length=255, required=True),
-                            Field('secret', 'blob', required=True),
-                            Field('issued', 'integer', required=True),
-                            Field('lifetime', 'integer', required=True),
-                            Field('assoc_type', 'string', length=64, required=True)
-                           )
+                                       Field('server_url',
+                                             'string', length=2047, required=True),
+                                       Field('handle',
+                                             'string', length=255, required=True),
+                                       Field('secret', 'blob', required=True),
+                                       Field('issued',
+                                             'integer', required=True),
+                                       Field('lifetime',
+                                             'integer', required=True),
+                                       Field('assoc_type',
+                                             'string', length=64, required=True)
+                                       )
         if self.table_oid_nonces_name not in self.database:
             self.database.define_table(self.table_oid_nonces_name,
-                            Field('server_url', 'string', length=2047, required=True),
-                            Field('timestamp', 'integer', required=True),
-                            Field('salt', 'string', length=40, required=True)
-                           )
+                                       Field('server_url',
+                                             'string', length=2047, required=True),
+                                       Field('timestamp',
+                                             'integer', required=True),
+                                       Field('salt', 'string',
+                                             length=40, required=True)
+                                       )
 
     def storeAssociation(self, server_url, association):
         """
@@ -525,14 +542,15 @@ class Web2pyStore(OpenIDStore):
         """
 
         db = self.database
-        query = (db.oid_associations.server_url == server_url) & (db.oid_associations.handle == association.handle)
+        query = (db.oid_associations.server_url == server_url) & (
+            db.oid_associations.handle == association.handle)
         db(query).delete()
-        db.oid_associations.insert(server_url = server_url,
-                                   handle = association.handle,
-                                   secret = association.secret,
-                                   issued = association.issued,
-                                   lifetime = association.lifetime,
-                                   assoc_type = association.assoc_type), 'insert '*10
+        db.oid_associations.insert(server_url=server_url,
+                                   handle=association.handle,
+                                   secret=association.secret,
+                                   issued=association.issued,
+                                   lifetime=association.lifetime,
+                                   assoc_type=association.assoc_type), 'insert ' * 10
 
     def getAssociation(self, server_url, handle=None):
         """
@@ -550,7 +568,8 @@ class Web2pyStore(OpenIDStore):
         if len(keep_assoc) == 0:
             return None
         else:
-            assoc = keep_assoc.pop() # pop the last one as it should be the latest one
+            assoc = keep_assoc.pop(
+            )  # pop the last one as it should be the latest one
             return Association(assoc['handle'],
                                assoc['secret'],
                                assoc['issued'],
@@ -559,8 +578,9 @@ class Web2pyStore(OpenIDStore):
 
     def removeAssociation(self, server_url, handle):
         db = self.database
-        query = (db.oid_associations.server_url == server_url) & (db.oid_associations.handle == handle)
-        return db(query).delete() != None
+        query = (db.oid_associations.server_url == server_url) & (
+            db.oid_associations.handle == handle)
+        return db(query).delete() is not None
 
     def useNonce(self, server_url, timestamp, salt):
         """
@@ -575,10 +595,10 @@ class Web2pyStore(OpenIDStore):
         if db(query).count() > 0:
             return False
         else:
-           db.oid_nonces.insert(server_url = server_url,
-                                timestamp = timestamp,
-                                salt = salt)
-           return True
+            db.oid_nonces.insert(server_url=server_url,
+                                 timestamp=timestamp,
+                                 salt=salt)
+            return True
 
     def _removeExpiredAssocations(self, rows):
         """
@@ -599,7 +619,7 @@ class Web2pyStore(OpenIDStore):
                 keep_assoc.append(r)
         for r in remove_assoc:
             del db.oid_associations[r['id']]
-        return (keep_assoc, len(remove_assoc)) # return tuple (list of valid associations, number of deleted associations)
+        return (keep_assoc, len(remove_assoc))  # return tuple (list of valid associations, number of deleted associations)
 
     def cleanupNonces(self):
         """
@@ -619,7 +639,7 @@ class Web2pyStore(OpenIDStore):
 
         db = self.database
         query = (db.oid_associations.id > 0)
-        return self._removeExpiredAssocations(db(query).select())[1] #return number of assoc removed
+        return self._removeExpiredAssocations(db(query).select())[1]  # return number of assoc removed
 
     def cleanup(self):
         """
@@ -628,6 +648,3 @@ class Web2pyStore(OpenIDStore):
         """
 
         return self.cleanupNonces(), self.cleanupAssociations()
-
-
-
diff --git a/gluon/contrib/login_methods/pam_auth.py b/gluon/contrib/login_methods/pam_auth.py
index 31c343e0..03564bf2 100644
--- a/gluon/contrib/login_methods/pam_auth.py
+++ b/gluon/contrib/login_methods/pam_auth.py
@@ -1,5 +1,6 @@
 from gluon.contrib.pam import authenticate
 
+
 def pam_auth():
     """
     to use pam_login:
@@ -19,5 +20,3 @@ def pam_auth():
         return authenticate(username, password)
 
     return pam_auth_aux
-
-
diff --git a/gluon/contrib/login_methods/rpx_account.py b/gluon/contrib/login_methods/rpx_account.py
index 34688a69..0cd1c56a 100644
--- a/gluon/contrib/login_methods/rpx_account.py
+++ b/gluon/contrib/login_methods/rpx_account.py
@@ -19,11 +19,13 @@ from gluon.tools import fetch
 from gluon.storage import Storage
 import gluon.contrib.simplejson as json
 
+
 class RPXAccount(object):
 
     """
     from gluon.contrib.login_methods.rpx_account import RPXAccount
-    auth.settings.actions_disabled=['register','change_password','request_reset_password']
+    auth.settings.actions_disabled=['register','change_password',
+        'request_reset_password']
     auth.settings.login_form = RPXAccount(request,
               api_key="...",
               domain="...",
@@ -32,18 +34,18 @@ class RPXAccount(object):
 
     def __init__(self,
                  request,
-                 api_key = "",
-                 domain = "",
-                 url = "",
-                 embed = True,
-                 auth_url = "https://rpxnow.com/api/v2/auth_info",
-                 language= "en",
+                 api_key="",
+                 domain="",
+                 url="",
+                 embed=True,
+                 auth_url="https://rpxnow.com/api/v2/auth_info",
+                 language="en",
                  prompt='rpx',
-                 on_login_failure = None,
+                 on_login_failure=None,
                  ):
 
-        self.request=request
-        self.api_key=api_key
+        self.request = request
+        self.api_key = api_key
         self.embed = embed
         self.auth_url = auth_url
         self.domain = domain
@@ -54,38 +56,40 @@ class RPXAccount(object):
         self.on_login_failure = on_login_failure
         self.mappings = Storage()
 
-        dn = {'givenName':'','familyName':''}
+        dn = {'givenName': '', 'familyName': ''}
         self.mappings.Facebook = lambda profile, dn=dn:\
-            dict(registration_id = profile.get("identifier",""),
-                 username = profile.get("preferredUsername",""),
-                 email = profile.get("email",""),
-                 first_name = profile.get("name",dn).get("givenName",""),
-                 last_name = profile.get("name",dn).get("familyName",""))
+            dict(registration_id=profile.get("identifier", ""),
+                 username=profile.get("preferredUsername", ""),
+                 email=profile.get("email", ""),
+                 first_name=profile.get("name", dn).get("givenName", ""),
+                 last_name=profile.get("name", dn).get("familyName", ""))
         self.mappings.Google = lambda profile, dn=dn:\
-            dict(registration_id=profile.get("identifier",""),
-                 username=profile.get("preferredUsername",""),
-                 email=profile.get("email",""),
-                 first_name=profile.get("name",dn).get("givenName",""),
-                 last_name=profile.get("name",dn).get("familyName",""))
+            dict(registration_id=profile.get("identifier", ""),
+                 username=profile.get("preferredUsername", ""),
+                 email=profile.get("email", ""),
+                 first_name=profile.get("name", dn).get("givenName", ""),
+                 last_name=profile.get("name", dn).get("familyName", ""))
         self.mappings.default = lambda profile:\
-            dict(registration_id=profile.get("identifier",""),
-                 username=profile.get("preferredUsername",""),
-                 email=profile.get("email",""),
-                 first_name=profile.get("preferredUsername",""),
+            dict(registration_id=profile.get("identifier", ""),
+                 username=profile.get("preferredUsername", ""),
+                 email=profile.get("email", ""),
+                 first_name=profile.get("preferredUsername", ""),
                  last_name='')
 
     def get_user(self):
         request = self.request
         if request.vars.token:
             user = Storage()
-            data = urllib.urlencode(dict(apiKey = self.api_key, token=request.vars.token))
-            auth_info_json = fetch(self.auth_url+'?'+data)
+            data = urllib.urlencode(
+                dict(apiKey=self.api_key, token=request.vars.token))
+            auth_info_json = fetch(self.auth_url + '?' + data)
             auth_info = json.loads(auth_info_json)
 
             if auth_info['stat'] == 'ok':
                 self.profile = auth_info['profile']
-                provider = re.sub('[^\w\-]','',self.profile['providerName'])
-                user = self.mappings.get(provider,self.mappings.default)(self.profile)
+                provider = re.sub('[^\w\-]', '', self.profile['providerName'])
+                user = self.mappings.get(
+                    provider, self.mappings.default)(self.profile)
                 return user
             elif self.on_login_failure:
                 redirect(self.on_login_failure)
@@ -95,12 +99,14 @@ class RPXAccount(object):
         request = self.request
         args = request.args
         if self.embed:
-           JANRAIN_URL = \
-               "https://%s.rpxnow.com/openid/embed?token_url=%s&language_preference=%s"
-           rpxform = IFRAME(_src=JANRAIN_URL % (self.domain,self.token_url,self.language),
-                            _scrolling="no",
-                            _frameborder="no",
-                            _style="width:400px;height:240px;")
+            JANRAIN_URL = \
+                "https://%s.rpxnow.com/openid/embed?token_url=%s&language_preference=%s"
+            rpxform = IFRAME(
+                _src=JANRAIN_URL % (
+                    self.domain, self.token_url, self.language),
+                _scrolling="no",
+                _frameborder="no",
+                             _style="width:400px;height:240px;")
         else:
             JANRAIN_URL = \
                 "https://%s.rpxnow.com/openid/v2/signin?token_url=%s"
@@ -114,15 +120,15 @@ class RPXAccount(object):
                                  _type="text/javascript"))
         return rpxform
 
-def use_janrain(auth,filename='private/janrain.key',**kwargs):
-    path = os.path.join(current.request.folder,filename)
+
+def use_janrain(auth, filename='private/janrain.key', **kwargs):
+    path = os.path.join(current.request.folder, filename)
     if os.path.exists(path):
         request = current.request
-        domain,key = open(path,'r').read().strip().split(':')
+        domain, key = open(path, 'r').read().strip().split(':')
         host = current.request.env.http_host
         url = URL('default', 'user', args='login', scheme=True)
         auth.settings.actions_disabled = \
-            ['register','change_password','request_reset_password']
+            ['register', 'change_password', 'request_reset_password']
         auth.settings.login_form = RPXAccount(
-            request, api_key=key,domain=domain, url = url,**kwargs)
-
+            request, api_key=key, domain=domain, url=url, **kwargs)
diff --git a/gluon/contrib/login_methods/x509_auth.py b/gluon/contrib/login_methods/x509_auth.py
index 36db643d..7dbb9a64 100644
--- a/gluon/contrib/login_methods/x509_auth.py
+++ b/gluon/contrib/login_methods/x509_auth.py
@@ -11,13 +11,12 @@ Adds support for x509 authentication.
 
 from gluon.globals import current
 from gluon.storage import Storage
-from gluon.http import HTTP,redirect
+from gluon.http import HTTP, redirect
 
 #requires M2Crypto
 from M2Crypto import X509
 
 
-
 class X509Auth(object):
     """
     Login using x509 cert from client.
@@ -29,8 +28,6 @@ class X509Auth(object):
 
     """
 
-
-
     def __init__(self):
         self.request = current.request
         self.ssl_client_raw_cert = self.request.env.ssl_client_raw_cert
@@ -41,10 +38,11 @@ class X509Auth(object):
 
         if self.ssl_client_raw_cert:
 
-            x509=X509.load_cert_string(self.ssl_client_raw_cert, X509.FORMAT_PEM)
+            x509 = X509.load_cert_string(
+                self.ssl_client_raw_cert, X509.FORMAT_PEM)
             # extract it from the cert
-            self.serial = self.request.env.ssl_client_serial or ('%x' % x509.get_serial_number()).upper()
-
+            self.serial = self.request.env.ssl_client_serial or (
+                '%x' % x509.get_serial_number()).upper()
 
             subject = x509.get_subject()
 
@@ -53,23 +51,17 @@ class X509Auth(object):
             # cn = self.subject.cn
             self.subject = Storage(filter(None,
                                           map(lambda x:
-                                                  (x,map(lambda y:
-                                                         y.get_data().as_text(),
-                                                         subject.get_entries_by_nid(subject.nid[x]))),
+                                              (x, map(lambda y:
+                                                      y.get_data(
+                                                      ).as_text(),
+                                                      subject.get_entries_by_nid(subject.nid[x]))),
                                               subject.nid.keys())))
 
-
-
     def login_form(self, **args):
-        raise HTTP(403,'Login not allowed. No valid x509 crentials')
-
-
+        raise HTTP(403, 'Login not allowed. No valid x509 crentials')
 
     def login_url(self, next="/"):
-        raise HTTP(403,'Login not allowed. No valid x509 crentials')
-
-
-
+        raise HTTP(403, 'Login not allowed. No valid x509 crentials')
 
     def logout_url(self, next="/"):
         return next
@@ -86,10 +78,14 @@ class X509Auth(object):
 
         p = profile = dict()
 
-        username = p['username'] = reduce(lambda a,b: '%s | %s' % (a,b), self.subject.CN or self.subject.commonName)
-        p['first_name'] = reduce(lambda a,b: '%s | %s' % (a,b),self.subject.givenName or username)
-        p['last_name'] = reduce(lambda a,b: '%s | %s' % (a,b),self.subject.surname)
-        p['email'] = reduce(lambda a,b: '%s | %s' % (a,b),self.subject.Email or self.subject.emailAddress)
+        username = p['username'] = reduce(lambda a, b: '%s | %s' % (
+            a, b), self.subject.CN or self.subject.commonName)
+        p['first_name'] = reduce(lambda a, b: '%s | %s' % (a, b),
+                                 self.subject.givenName or username)
+        p['last_name'] = reduce(
+            lambda a, b: '%s | %s' % (a, b), self.subject.surname)
+        p['email'] = reduce(lambda a, b: '%s | %s' % (
+            a, b), self.subject.Email or self.subject.emailAddress)
 
         # IMPORTANT WE USE THE CERT SERIAL AS UNIQUE KEY FOR THE USER
         p['registration_id'] = self.serial
@@ -100,6 +96,3 @@ class X509Auth(object):
         p['certificate'] = self.ssl_client_raw_cert
 
         return profile
-
-
-
diff --git a/gluon/contrib/memdb.py b/gluon/contrib/memdb.py
index 527b051a..382739e8 100644
--- a/gluon/contrib/memdb.py
+++ b/gluon/contrib/memdb.py
@@ -44,22 +44,21 @@ SQL_DIALECTS = {'memcache': {
     'is not null': 'IS NOT NULL',
     'extract': None,
     'left join': None,
-    }}
+}}
 
 
 def cleanup(text):
     if re.compile('[^0-9a-zA-Z_]').findall(text):
-        raise SyntaxError, \
-            'Can\'t cleanup \'%s\': only [0-9a-zA-Z_] allowed in table and field names' % text
+        raise SyntaxError('Can\'t cleanup \'%s\': only [0-9a-zA-Z_] allowed in table and field names' % text)
     return text
 
 
 def assert_filter_fields(*fields):
     for field in fields:
         if isinstance(field, (Field, Expression)) and field.type\
-             in ['text', 'blob']:
-            raise SyntaxError, 'AppEngine does not index by: %s'\
-                 % field.type
+                in ['text', 'blob']:
+            raise SyntaxError('AppEngine does not index by: %s'
+                              % field.type)
 
 
 def dateobj_to_datetime(object):
@@ -78,7 +77,7 @@ def dateobj_to_datetime(object):
             object.minute,
             object.second,
             object.microsecond,
-            )
+        )
     return object
 
 
@@ -96,7 +95,7 @@ def sqlhtml_validators(field_type, length):
         'time': validators.IS_TIME(),
         'datetime': validators.IS_DATETIME(),
         'reference': validators.IS_INT_IN_RANGE(0, 1e100),
-        }
+    }
     try:
         return v[field_type[:9]]
     except KeyError:
@@ -114,7 +113,8 @@ class DALStorage(dict):
 
     def __setattr__(self, key, value):
         if key in self:
-            raise SyntaxError, 'Object \'%s\'exists and cannot be redefined' % key
+            raise SyntaxError(
+                'Object \'%s\'exists and cannot be redefined' % key)
         self[key] = value
 
     def __repr__(self):
@@ -151,14 +151,14 @@ class MEMDB(DALStorage):
         tablename,
         *fields,
         **args
-        ):
+    ):
         tablename = cleanup(tablename)
         if tablename in dir(self) or tablename[0] == '_':
-            raise SyntaxError, 'invalid table name: %s' % tablename
+            raise SyntaxError('invalid table name: %s' % tablename)
         if not tablename in self.tables:
             self.tables.append(tablename)
         else:
-            raise SyntaxError, 'table already defined: %s' % tablename
+            raise SyntaxError('table already defined: %s' % tablename)
         t = self[tablename] = Table(self, tablename, *fields)
         t._create()
         return t
@@ -190,7 +190,7 @@ class Table(DALStorage):
         db,
         tablename,
         *fields
-        ):
+    ):
         self._db = db
         self._tablename = tablename
         self.fields = SQLCallableList()
@@ -219,24 +219,24 @@ class Table(DALStorage):
             if field.type[:9] == 'reference':
                 referenced = field.type[10:].strip()
                 if not referenced:
-                    raise SyntaxError, \
-                        'Table %s: reference \'%s\' to nothing!' % (self._tablename, k)
+                    raise SyntaxError('Table %s: reference \'%s\' to nothing!' % (
+                        self._tablename, k))
                 if not referenced in self._db:
-                    raise SyntaxError, \
-                        'Table: table %s does not exist' % referenced
+                    raise SyntaxError(
+                        'Table: table %s does not exist' % referenced)
                 referee = self._db[referenced]
                 ftype = \
                     self._db._translator[field.type[:9]](
                         self._db[referenced]._tableobj)
                 if self._tablename in referee.fields:  # ## THIS IS OK
-                    raise SyntaxError, \
-                        'Field: table \'%s\' has same name as a field ' \
-                        'in referenced table \'%s\'' % (self._tablename, referenced)
+                    raise SyntaxError('Field: table \'%s\' has same name as a field '
+                                      'in referenced table \'%s\'' % (
+                                          self._tablename, referenced))
                 self._db[referenced]._referenced_by.append((self._tablename,
-                        field.name))
+                                                            field.name))
             elif not field.type in self._db._translator\
-                 or not self._db._translator[field.type]:
-                raise SyntaxError, 'Field: unkown field type %s' % field.type
+                    or not self._db._translator[field.type]:
+                raise SyntaxError('Field: unkown field type %s' % field.type)
         self._tableobj = self._db.client
         return None
 
@@ -269,11 +269,11 @@ class Table(DALStorage):
     def update(self, id, **fields):
         for field in fields:
             if not field in fields and self[field].default\
-                 != None:
+                    is not None:
                 fields[field] = self[field].default
             if field in fields:
                 fields[field] = obj_represent(fields[field],
-                        self[field].type, self._db)
+                                              self[field].type, self._db)
         return self._tableobj.set(self._id_to_key(id), fields)
 
     def delete(self, id):
@@ -293,7 +293,7 @@ class Table(DALStorage):
             if self._tableobj.set(shard_id, '0'):
                 id = 0
             else:
-                raise Exception, 'cannot set memcache'
+                raise Exception('cannot set memcache')
         return long(str(shard) + str(id))
 
     def __str__(self):
@@ -307,7 +307,7 @@ class Expression(object):
         name,
         type='string',
         db=None,
-        ):
+    ):
         (self.name, self.type, self._db) = (name, type, db)
 
     def __str__(self):
@@ -393,11 +393,11 @@ class Field(Expression):
         notnull=False,
         unique=False,
         uploadfield=True,
-        ):
+    ):
 
         self.name = cleanup(fieldname)
         if fieldname in dir(Table) or fieldname[0] == '_':
-            raise SyntaxError, 'Field: invalid field name: %s' % fieldname
+            raise SyntaxError('Field: invalid field name: %s' % fieldname)
         if isinstance(type, Table):
             type = 'reference ' + type._tablename
         if not length:
@@ -437,9 +437,9 @@ MEMDB.Field = Field  # ## required by gluon/globals.py session.connect
 
 
 def obj_represent(object, fieldtype, db):
-    if object != None:
+    if object is not None:
         if fieldtype == 'date' and not isinstance(object,
-                datetime.date):
+                                                  datetime.date):
             (y, m, d) = [int(x) for x in str(object).strip().split('-')]
             object = datetime.date(y, m, d)
         elif fieldtype == 'time' and not isinstance(object, datetime.time):
@@ -450,7 +450,7 @@ def obj_represent(object, fieldtype, db):
                 (h, mi, s) = time_items + [0]
             object = datetime.time(h, mi, s)
         elif fieldtype == 'datetime' and not isinstance(object,
-                datetime.datetime):
+                                                        datetime.datetime):
             (y, m, d) = [int(x) for x in
                          str(object)[:10].strip().split('-')]
             time_items = [int(x) for x in
@@ -466,7 +466,7 @@ def obj_represent(object, fieldtype, db):
                 h,
                 mi,
                 s,
-                )
+            )
         elif fieldtype == 'integer' and not isinstance(object, long):
             object = long(object)
 
@@ -496,10 +496,10 @@ class Query(object):
         left,
         op=None,
         right=None,
-        ):
+    ):
         if isinstance(right, (Field, Expression)):
-            raise SyntaxError, \
-                'Query: right side of filter must be a value or entity'
+            raise SyntaxError(
+                'Query: right side of filter must be a value or entity')
         if isinstance(left, Field) and left.name == 'id':
             if op == '=':
                 self.get_one = \
@@ -507,8 +507,8 @@ class Query(object):
                                    id=long(right))
                 return
             else:
-                raise SyntaxError, 'only equality by id is supported'
-        raise SyntaxError, 'not supported'
+                raise SyntaxError('only equality by id is supported')
+        raise SyntaxError('not supported')
 
     def __str__(self):
         return str(self.left)
@@ -539,7 +539,7 @@ class Set(object):
             self.where = where
             self._tables.insert(0, where.get_all)
         elif hasattr(where, 'get_one') and isinstance(where.get_one,
-                QueryException):
+                                                      QueryException):
             self.where = where.get_one
         else:
 
@@ -553,9 +553,8 @@ class Set(object):
 
     def __call__(self, where):
         if isinstance(self.where, QueryException) or isinstance(where,
-                QueryException):
-            raise SyntaxError, \
-                'neither self.where nor where can be a QueryException instance'
+                                                                QueryException):
+            raise SyntaxError('neither self.where nor where can be a QueryException instance')
         if self.where:
             return Set(self._db, self.where & where)
         else:
@@ -564,9 +563,9 @@ class Set(object):
     def _get_table_or_raise(self):
         tablenames = list(set(self._tables))  # unique
         if len(tablenames) < 1:
-            raise SyntaxError, 'Set: no tables selected'
+            raise SyntaxError('Set: no tables selected')
         if len(tablenames) > 1:
-            raise SyntaxError, 'Set: no join in appengine'
+            raise SyntaxError('Set: no join in appengine')
         return self._db[tablenames[0]]._tableobj
 
     def _getitem_exception(self):
@@ -597,7 +596,7 @@ class Set(object):
         if isinstance(self.where, QueryException):
             return self._select_except()
         else:
-            raise SyntaxError, 'select arguments not supported'
+            raise SyntaxError('select arguments not supported')
 
     def count(self):
         return len(self.select())
@@ -609,7 +608,7 @@ class Set(object):
                 return
             self._db[tablename].delete(id)
         else:
-            raise Exception, 'deletion not implemented'
+            raise Exception('deletion not implemented')
 
     def update(self, **update_fields):
         if isinstance(self.where, QueryException):
@@ -620,7 +619,7 @@ class Set(object):
                 setattr(item, key, value)
             self._db[tablename].update(id, **item)
         else:
-            raise Exception, 'update not implemented'
+            raise Exception('update not implemented')
 
 
 def update_record(
@@ -628,7 +627,7 @@ def update_record(
     s,
     id,
     a,
-    ):
+):
     item = s.get(id)
     for (key, value) in a.items():
         t[key] = value
@@ -650,7 +649,7 @@ class Rows(object):
         db,
         response,
         *colnames
-        ):
+    ):
         self._db = db
         self.colnames = colnames
         self.response = response
@@ -660,9 +659,9 @@ class Rows(object):
 
     def __getitem__(self, i):
         if i >= len(self.response) or i < 0:
-            raise SyntaxError, 'Rows: no such row: %i' % i
+            raise SyntaxError('Rows: no such row: %i' % i)
         if len(self.response[0]) != len(self.colnames):
-            raise SyntaxError, 'Rows: internal error'
+            raise SyntaxError('Rows: internal error')
         row = DALStorage()
         for j in xrange(len(self.colnames)):
             value = self.response[i][j]
@@ -684,7 +683,7 @@ class Rows(object):
                 referee = field.type[10:].strip()
                 rid = value
                 row[tablename][fieldname] = rid
-            elif field.type == 'boolean' and value != None:
+            elif field.type == 'boolean' and value is not None:
 
                 # row[tablename][fieldname]=Set(self._db[referee].id==rid)
 
@@ -692,13 +691,13 @@ class Rows(object):
                     row[tablename][fieldname] = True
                 else:
                     row[tablename][fieldname] = False
-            elif field.type == 'date' and value != None\
-                 and not isinstance(value, datetime.date):
+            elif field.type == 'date' and value is not None\
+                    and not isinstance(value, datetime.date):
                 (y, m, d) = [int(x) for x in
                              str(value).strip().split('-')]
                 row[tablename][fieldname] = datetime.date(y, m, d)
-            elif field.type == 'time' and value != None\
-                 and not isinstance(value, datetime.time):
+            elif field.type == 'time' and value is not None\
+                    and not isinstance(value, datetime.time):
                 time_items = [int(x) for x in
                               str(value).strip().split(':')[:3]]
                 if len(time_items) == 3:
@@ -706,8 +705,8 @@ class Rows(object):
                 else:
                     (h, mi, s) = time_items + [0]
                 row[tablename][fieldname] = datetime.time(h, mi, s)
-            elif field.type == 'datetime' and value != None\
-                 and not isinstance(value, datetime.datetime):
+            elif field.type == 'datetime' and value is not None\
+                    and not isinstance(value, datetime.datetime):
                 (y, m, d) = [int(x) for x in
                              str(value)[:10].strip().split('-')]
                 time_items = [int(x) for x in
@@ -723,19 +722,19 @@ class Rows(object):
                     h,
                     mi,
                     s,
-                    )
+                )
             else:
                 row[tablename][fieldname] = value
             if fieldname == 'id':
                 id = row[tablename].id
                 row[tablename].update_record = lambda t = row[tablename], \
                     s = self._db[tablename], id = id, **a: update_record(t,
-                        s, id, a)
+                                                                         s, id, a)
                 for (referee_table, referee_name) in \
-                    table._referenced_by:
+                        table._referenced_by:
                     s = self._db[referee_table][referee_name]
                     row[tablename][referee_table] = Set(self._db, s
-                             == id)
+                                                        == id)
         if len(row.keys()) == 1:
             return row[row.keys()[0]]
         return row
diff --git a/gluon/contrib/minify/cssmin.py b/gluon/contrib/minify/cssmin.py
index 0a8853cf..f9ed89f9 100644
--- a/gluon/contrib/minify/cssmin.py
+++ b/gluon/contrib/minify/cssmin.py
@@ -11,7 +11,7 @@ Modified for inclusion into web2py by: Ross Peoples <ross.peoples@gmail.com>
 """
 
 
-from StringIO import StringIO # The pure-Python StringIO supports unicode.
+from StringIO import StringIO  # The pure-Python StringIO supports unicode.
 import re
 
 
@@ -20,7 +20,7 @@ __version__ = '0.1.4'
 
 def remove_comments(css):
     """Remove all CSS comment blocks."""
-    
+
     iemac = False
     preserve = False
     comment_start = css.find("/*")
@@ -28,7 +28,7 @@ def remove_comments(css):
         # Preserve comments that look like `/*!...*/`.
         # Slicing is used to make sure we don"t get an IndexError.
         preserve = css[comment_start + 2:comment_start + 3] == "!"
-        
+
         comment_end = css.find("*/", comment_start + 2)
         if comment_end < 0:
             if not preserve:
@@ -48,22 +48,22 @@ def remove_comments(css):
             else:
                 comment_start = comment_end + 2
         comment_start = css.find("/*", comment_start)
-    
+
     return css
 
 
 def remove_unnecessary_whitespace(css):
     """Remove unnecessary whitespace characters."""
-    
+
     def pseudoclasscolon(css):
-        
+
         """
         Prevents 'p :link' from becoming 'p:link'.
-        
+
         Translates 'p :link' into 'p ___PSEUDOCLASSCOLON___link'; this is
         translated back again later.
         """
-        
+
         regex = re.compile(r"(^|\})(([^\{\:])+\:)+([^\{]*\{)")
         match = regex.search(css)
         while match:
@@ -73,43 +73,43 @@ def remove_unnecessary_whitespace(css):
                 css[match.end():]])
             match = regex.search(css)
         return css
-    
+
     css = pseudoclasscolon(css)
     # Remove spaces from before things.
     css = re.sub(r"\s+([!{};:>+\(\)\],])", r"\1", css)
-    
+
     # If there is a `@charset`, then only allow one, and move to the beginning.
     css = re.sub(r"^(.*)(@charset \"[^\"]*\";)", r"\2\1", css)
     css = re.sub(r"^(\s*@charset [^;]+;\s*)+", r"\1", css)
-    
+
     # Put the space back in for a few cases, such as `@media screen` and
     # `(-webkit-min-device-pixel-ratio:0)`.
     css = re.sub(r"\band\(", "and (", css)
-    
+
     # Put the colons back.
     css = css.replace('___PSEUDOCLASSCOLON___', ':')
-    
+
     # Remove spaces from after things.
     css = re.sub(r"([!{}:;>+\(\[,])\s+", r"\1", css)
-    
+
     return css
 
 
 def remove_unnecessary_semicolons(css):
     """Remove unnecessary semicolons."""
-    
+
     return re.sub(r";+\}", "}", css)
 
 
 def remove_empty_rules(css):
     """Remove empty rules."""
-    
+
     return re.sub(r"[^\}\{]+\{\}", "", css)
 
 
 def normalize_rgb_colors_to_hex(css):
     """Convert `rgb(51,102,153)` to `#336699`."""
-    
+
     regex = re.compile(r"rgb\s*\(\s*([0-9,\s]+)\s*\)")
     match = regex.search(css)
     while match:
@@ -122,39 +122,40 @@ def normalize_rgb_colors_to_hex(css):
 
 def condense_zero_units(css):
     """Replace `0(px, em, %, etc)` with `0`."""
-    
+
     return re.sub(r"([\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)", r"\1\2", css)
 
 
 def condense_multidimensional_zeros(css):
     """Replace `:0 0 0 0;`, `:0 0 0;` etc. with `:0;`."""
-    
+
     css = css.replace(":0 0 0 0;", ":0;")
     css = css.replace(":0 0 0;", ":0;")
     css = css.replace(":0 0;", ":0;")
-    
+
     # Revert `background-position:0;` to the valid `background-position:0 0;`.
     css = css.replace("background-position:0;", "background-position:0 0;")
-    
+
     return css
 
 
 def condense_floating_points(css):
     """Replace `0.6` with `.6` where possible."""
-    
+
     return re.sub(r"(:|\s)0+\.(\d+)", r"\1.\2", css)
 
 
 def condense_hex_colors(css):
     """Shorten colors from #AABBCC to #ABC where possible."""
-    
+
     regex = re.compile(r"([^\"'=\s])(\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])")
     match = regex.search(css)
     while match:
         first = match.group(3) + match.group(5) + match.group(7)
         second = match.group(4) + match.group(6) + match.group(8)
         if first.lower() == second.lower():
-            css = css.replace(match.group(), match.group(1) + match.group(2) + '#' + first)
+            css = css.replace(
+                match.group(), match.group(1) + match.group(2) + '#' + first)
             match = regex.search(css, match.end() - 3)
         else:
             match = regex.search(css, match.end())
@@ -163,19 +164,19 @@ def condense_hex_colors(css):
 
 def condense_whitespace(css):
     """Condense multiple adjacent whitespace characters into one."""
-    
+
     return re.sub(r"\s+", " ", css)
 
 
 def condense_semicolons(css):
     """Condense multiple adjacent semicolon characters into one."""
-    
+
     return re.sub(r";;+", ";", css)
 
 
 def wrap_css_lines(css, line_length):
     """Wrap the lines of the given CSS to an approximate length."""
-    
+
     lines = []
     line_start = 0
     for i, char in enumerate(css):
@@ -183,7 +184,7 @@ def wrap_css_lines(css, line_length):
         if char == '}' and (i - line_start >= line_length):
             lines.append(css[line_start:i + 1])
             line_start = i + 1
-    
+
     if line_start < len(css):
         lines.append(css[line_start:])
     return '\n'.join(lines)
@@ -212,19 +213,19 @@ def cssmin(css, wrap=None):
 def main():
     import optparse
     import sys
-    
+
     p = optparse.OptionParser(
         prog="cssmin", version=__version__,
         usage="%prog [--wrap N]",
         description="""Reads raw CSS from stdin, and writes compressed CSS to stdout.""")
-    
+
     p.add_option(
         '-w', '--wrap', type='int', default=None, metavar='N',
         help="Wrap output to approximately N chars per line.")
-    
+
     options, args = p.parse_args()
     sys.stdout.write(cssmin(sys.stdin.read(), wrap=options.wrap))
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/gluon/contrib/minify/htmlmin.py b/gluon/contrib/minify/htmlmin.py
index fbb3896b..ea4971ea 100644
--- a/gluon/contrib/minify/htmlmin.py
+++ b/gluon/contrib/minify/htmlmin.py
@@ -2,12 +2,14 @@
 
 import re
 
+
 def minify(response):
-  def _replace(match):
-    match = match.group()
-    # save whole <pre>, <textarea> tags, and opening <!-- (so it doesn't break <script>)
-    # otherwise, replace all whitespace with a single space character
-    return match if match.startswith(('<pre', '<textarea', '<!--')) else ' '
-  
-  cpat = re.compile(r'\s+|<pre(.*?)</pre>|<textarea(.*?)</textarea>|<!--\s', re.DOTALL)
-  return cpat.sub(_replace, response)
+    def _replace(match):
+        match = match.group()
+        # save whole <pre>, <textarea> tags, and opening <!-- (so it doesn't break <script>)
+        # otherwise, replace all whitespace with a single space character
+        return match if match.startswith(('<pre', '<textarea', '<!--')) else ' '
+
+    cpat = re.compile(
+        r'\s+|<pre(.*?)</pre>|<textarea(.*?)</textarea>|<!--\s', re.DOTALL)
+    return cpat.sub(_replace, response)
diff --git a/gluon/contrib/minify/jsmin.py b/gluon/contrib/minify/jsmin.py
index 4c021994..76f80e0a 100644
--- a/gluon/contrib/minify/jsmin.py
+++ b/gluon/contrib/minify/jsmin.py
@@ -49,7 +49,7 @@ Both python 2 and python 3 are supported.
 
 .. _jsmin.c by Douglas Crockford:
    http://www.crockford.com/javascript/jsmin.c
-   
+
 Original author of Python version: Andr\xe9 Malo
 Home page: http://opensource.perlig.de/rjsmin/
 Modified by Ross Peoples <ross.peoples@gmail.com> for inclusion into web2py.
@@ -96,7 +96,7 @@ def _make_jsmin(extended=True, python_only=True):
     try:
         xrange
     except NameError:
-        xrange = range # pylint: disable = W0622
+        xrange = range  # pylint: disable = W0622
 
     space_chars = r'[\000-\011\013\014\016-\040]'
 
@@ -151,13 +151,13 @@ def _make_jsmin(extended=True, python_only=True):
                 last != first and chr(last) or ''
             ) for first, last in result])
 
-        return _re.sub(r'([\000-\040\047])', # for better portability
-            lambda m: '\\%03o' % ord(m.group(1)), (sequentize(result)
-                .replace('\\', '\\\\')
-                .replace('[', '\\[')
-                .replace(']', '\\]')
-            )
-        )
+        return _re.sub(r'([\000-\040\047])',  # for better portability
+                       lambda m: '\\%03o' % ord(m.group(1)), (sequentize(result)
+                                                              .replace('\\', '\\\\')
+                                                              .replace('[', '\\[')
+                                                              .replace(']', '\\]')
+                                                              )
+                       )
 
     def id_literal_(what):
         """ Make id_literal like char class """
@@ -190,25 +190,33 @@ def _make_jsmin(extended=True, python_only=True):
             r'|(?:(?<=%(preregex1)s)%(space)s*(%(regex)s[^\047"/\000-\040]*))'
             r'|(?:(?<=%(preregex2)s)%(space)s*(%(regex)s[^\047"/\000-\040]*))'
             r'|(?<=%(id_literal_close)s)'
-                r'%(space)s*(?:(%(newline)s)%(space)s*)+'
-                r'(?=%(id_literal_open)s)'
+            r'%(space)s*(?:(%(newline)s)%(space)s*)+'
+            r'(?=%(id_literal_open)s)'
             r'|(?<=%(id_literal)s)(%(space)s)+(?=%(id_literal)s)'
             r'|%(space)s+'
             r'|(?:%(newline)s%(space)s*)+'
         ) % locals()).sub
+
         def space_subber(match):
             """ Substitution callback """
             # pylint: disable = C0321, R0911
             groups = match.groups()
-            if groups[0]: return groups[0]
-            elif groups[1]: return groups[1]
-            elif groups[2]: return groups[2]
-            elif groups[3]: return groups[3]
-            elif groups[4]: return '\n'
-            elif groups[5]: return ' '
-            else: return ''
+            if groups[0]:
+                return groups[0]
+            elif groups[1]:
+                return groups[1]
+            elif groups[2]:
+                return groups[2]
+            elif groups[3]:
+                return groups[3]
+            elif groups[4]:
+                return '\n'
+            elif groups[5]:
+                return ' '
+            else:
+                return ''
 
-        def jsmin(script): # pylint: disable = W0621
+        def jsmin(script):  # pylint: disable = W0621
             r"""
             Minify javascript based on `jsmin.c by Douglas Crockford`_\.
 
@@ -239,20 +247,26 @@ def _make_jsmin(extended=True, python_only=True):
             r'|(%(space)s)+'
             r'|(?:(%(newline)s)%(space)s*)+'
         ) % locals()).sub
+
         def space_norm_subber(match):
             """ Substitution callback """
             # pylint: disable = C0321
             groups = match.groups()
-            if groups[0]: return groups[0]
-            elif groups[1]: return groups[1].replace('\r', '\n') + groups[2]
-            elif groups[3]: return ' '
-            elif groups[4]: return '\n'
+            if groups[0]:
+                return groups[0]
+            elif groups[1]:
+                return groups[1].replace('\r', '\n') + groups[2]
+            elif groups[3]:
+                return ' '
+            elif groups[4]:
+                return '\n'
 
         space_sub1 = _re.compile((
             r'[\040\n]?(%(strings)s|%(pre_regex)s%(regex)s)'
             r'|\040(%(not_id_literal)s)'
             r'|\n(%(not_id_literal_open)s)'
         ) % locals()).sub
+
         def space_subber1(match):
             """ Substitution callback """
             groups = match.groups()
@@ -264,6 +278,7 @@ def _make_jsmin(extended=True, python_only=True):
             r'|(%(not_id_literal)s)\040'
             r'|(%(not_id_literal_close)s)\n'
         ) % locals()).sub
+
         def space_subber2(match):
             """ Substitution callback """
             groups = match.groups()
@@ -295,10 +310,11 @@ def _make_jsmin(extended=True, python_only=True):
             :Rtype: ``str``
             """
             return space_sub2(space_subber2,
-                space_sub1(space_subber1,
-                    space_norm_sub(space_norm_subber, '\n%s\n' % script)
-                )
-            ).strip()
+                              space_sub1(space_subber1,
+                                         space_norm_sub(space_norm_subber,
+                                                        '\n%s\n' % script)
+                                         )
+                              ).strip()
     return jsmin
 
 jsmin = _make_jsmin()
@@ -311,6 +327,7 @@ jsmin = _make_jsmin()
 # jsmin.jsmin(script)
 #
 
+
 def jsmin_for_posers(script):
     r"""
     Minify javascript based on `jsmin.c by Douglas Crockford`_\.
diff --git a/gluon/contrib/minify/minify.py b/gluon/contrib/minify/minify.py
index 5311b219..8749acd7 100644
--- a/gluon/contrib/minify/minify.py
+++ b/gluon/contrib/minify/minify.py
@@ -14,24 +14,27 @@ import os
 import hashlib
 import re
 
+
 def read_binary_file(filename):
-    f = open(filename,'rb')
+    f = open(filename, 'rb')
     data = f.read()
     f.close()
     return data
 
-def write_binary_file(filename,data):
-    f =open(filename,'wb')
+
+def write_binary_file(filename, data):
+    f = open(filename, 'wb')
     f.write(data)
     f.close()
 
-def fix_links(css,static_path):
+
+def fix_links(css, static_path):
     return re.sub(r'url\((["\'])\.\./', 'url(\\1' + static_path, css)
-    
-    
+
+
 def minify(files, path_info, folder, optimize_css, optimize_js,
-           ignore_concat = [],
-           ignore_minify = ['/jquery.js', '/anytime.js']):
+           ignore_concat=[],
+           ignore_minify=['/jquery.js', '/anytime.js']):
 
     """
     Input:
@@ -45,7 +48,7 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
     Returns a new list of:
     - filename (absolute or relative, css or js, actual or temporary) or
     - ('css:inline','...css..')
-    - ('js:inline','...js..')    
+    - ('js:inline','...js..')
     """
     optimize_css = optimize_css or ''
     optimize_js = optimize_js or ''
@@ -55,27 +58,27 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
     concat_js = 'concat' in optimize_js
     minify_js = 'minify' in optimize_js
     inline_js = 'inline' in optimize_js
-    static_path,temp = path_info.rsplit('/',1)
+    static_path, temp = path_info.rsplit('/', 1)
     new_files = []
     css = []
     js = []
     processed = []
-    for k,filename in enumerate(files):
+    for k, filename in enumerate(files):
         if not filename.startswith('/') or \
-                any(filename.endswith(x) \
-                        for x in ignore_concat):
+                any(filename.endswith(x)
+                    for x in ignore_concat):
             new_files.append(filename)
             continue
 
         abs_filename = os.path.join(
-            folder,'static', filename[len(static_path)+1:])
+            folder, 'static', filename[len(static_path) + 1:])
 
         if filename.lower().endswith('.css'):
             processed.append(filename)
             spath_info, sfilename = \
                 path_info.split('/'), filename.split('/')
             u = 0
-            for i,a in enumerate(sfilename):
+            for i, a in enumerate(sfilename):
                 try:
                     if a != spath_info[i]:
                         u = i
@@ -99,8 +102,8 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
 
                 if minify_js and \
                         not filename.endswith('.min.js') and \
-                        not any(filename.endswith(x) \
-                                    for x in ignore_minify):
+                        not any(filename.endswith(x)
+                                for x in ignore_minify):
                     js.append(jsmin.jsmin(contents))
                 else:
                     js.append(contents)
@@ -110,32 +113,31 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
     if css and concat_css:
         css = '\n\n'.join(contents for contents in css)
         if not inline_css:
-            temppath = os.path.join(folder,'static',temp)
+            temppath = os.path.join(folder, 'static', temp)
             if not os.path.exists(temppath):
                 os.mkdir(temppath)
             dest = "compressed_%s.css" % dest_key
             tempfile = os.path.join(temppath, dest)
-            write_binary_file(tempfile,css)
-            css = path_info+'/%s' % dest
+            write_binary_file(tempfile, css)
+            css = path_info + '/%s' % dest
             new_files.append(css)
         else:
-            new_files.append(('css:inline',css))
+            new_files.append(('css:inline', css))
     else:
         new_files += css
     if js and concat_js:
         js = '\n'.join(contents for contents in js)
         if inline_js:
-            js = ('js:inline',js)
+            js = ('js:inline', js)
         else:
-            temppath = os.path.join(folder,'static',temp)
-            if not os.path.exists(temppath): 
+            temppath = os.path.join(folder, 'static', temp)
+            if not os.path.exists(temppath):
                 os.mkdir(temppath)
             dest = "compressed_%s.js" % dest_key
-            tempfile = os.path.join(folder,'static',temp,dest)
-            write_binary_file(tempfile,js)
-            js = path_info+'/%s' % dest
+            tempfile = os.path.join(folder, 'static', temp, dest)
+            write_binary_file(tempfile, js)
+            js = path_info + '/%s' % dest
         new_files.append(js)
     else:
         new_files += js
     return new_files
-        
diff --git a/gluon/contrib/pam.py b/gluon/contrib/pam.py
index c05f3e8e..5b200376 100644
--- a/gluon/contrib/pam.py
+++ b/gluon/contrib/pam.py
@@ -24,7 +24,7 @@ CALLOC.argtypes = [c_uint, c_uint]
 
 STRDUP = LIBC.strdup
 STRDUP.argstypes = [c_char_p]
-STRDUP.restype = POINTER(c_char) # NOT c_char_p !!!!
+STRDUP.restype = POINTER(c_char)  # NOT c_char_p !!!!
 
 # Various constants
 PAM_PROMPT_ECHO_OFF = 1
@@ -32,56 +32,61 @@ PAM_PROMPT_ECHO_ON = 2
 PAM_ERROR_MSG = 3
 PAM_TEXT_INFO = 4
 
+
 class PamHandle(Structure):
     """wrapper class for pam_handle_t"""
     _fields_ = [
-            ("handle", c_void_p)
-            ]
+        ("handle", c_void_p)
+    ]
 
     def __init__(self):
         Structure.__init__(self)
         self.handle = 0
 
+
 class PamMessage(Structure):
     """wrapper class for pam_message structure"""
     _fields_ = [
-            ("msg_style", c_int),
-            ("msg", c_char_p),
-            ]
+        ("msg_style", c_int),
+        ("msg", c_char_p),
+    ]
 
     def __repr__(self):
         return "<PamMessage %i '%s'>" % (self.msg_style, self.msg)
 
+
 class PamResponse(Structure):
     """wrapper class for pam_response structure"""
     _fields_ = [
-            ("resp", c_char_p),
-            ("resp_retcode", c_int),
-            ]
+        ("resp", c_char_p),
+        ("resp_retcode", c_int),
+    ]
 
     def __repr__(self):
         return "<PamResponse %i '%s'>" % (self.resp_retcode, self.resp)
 
 CONV_FUNC = CFUNCTYPE(c_int,
-        c_int, POINTER(POINTER(PamMessage)),
-               POINTER(POINTER(PamResponse)), c_void_p)
+                      c_int, POINTER(POINTER(PamMessage)),
+                      POINTER(POINTER(PamResponse)), c_void_p)
+
 
 class PamConv(Structure):
     """wrapper class for pam_conv structure"""
     _fields_ = [
-            ("conv", CONV_FUNC),
-            ("appdata_ptr", c_void_p)
-            ]
+        ("conv", CONV_FUNC),
+        ("appdata_ptr", c_void_p)
+    ]
 
 PAM_START = LIBPAM.pam_start
 PAM_START.restype = c_int
 PAM_START.argtypes = [c_char_p, c_char_p, POINTER(PamConv),
-        POINTER(PamHandle)]
+                      POINTER(PamHandle)]
 
 PAM_AUTHENTICATE = LIBPAM.pam_authenticate
 PAM_AUTHENTICATE.restype = c_int
 PAM_AUTHENTICATE.argtypes = [PamHandle, c_int]
 
+
 def authenticate(username, password, service='login'):
     """Returns True if the given username and password authenticate for the
     given service.  Returns False otherwise
diff --git a/gluon/contrib/qdb.py b/gluon/contrib/qdb.py
index 732ff831..fe2b40d2 100644
--- a/gluon/contrib/qdb.py
+++ b/gluon/contrib/qdb.py
@@ -24,6 +24,7 @@ import cmd
 import pydoc
 import threading
 
+
 class Qdb(bdb.Bdb):
     "Qdb Debugger Backend"
 
@@ -36,7 +37,7 @@ class Qdb(bdb.Bdb):
         self.frame = None
         self.i = 1  # sequential RPC call id
         self.waiting = False
-        self.pipe = pipe # for communication
+        self.pipe = pipe  # for communication
         self._wait_for_mainpyfile = False
         self._wait_for_breakpoint = False
         self.mainpyfile = ""
@@ -67,7 +68,7 @@ class Qdb(bdb.Bdb):
             # dispatch message (JSON RPC like)
             method = getattr(self, request['method'])
             response['result'] = method.__call__(*request['args'],
-                                        **request.get('kwargs', {}))
+                                                 **request.get('kwargs', {}))
         except Exception, e:
             response['error'] = {'code': 0, 'message': str(e)}
         # send the result for normal method calls, not for notifications
@@ -83,7 +84,7 @@ class Qdb(bdb.Bdb):
             self.pull_actions()
         # process the frame (see Bdb.trace_dispatch)
         if self.quitting:
-            return # None
+            return  # None
         if event == 'line':
             return self.dispatch_line(frame)
         if event == 'call':
@@ -106,7 +107,7 @@ class Qdb(bdb.Bdb):
         """This function is called when we stop or break at this line."""
         if self._wait_for_mainpyfile:
             if (not self.canonic(frame.f_code.co_filename).startswith(self.mainpyfile)
-                or frame.f_lineno<= 0):
+                    or frame.f_lineno <= 0):
                 return
             self._wait_for_mainpyfile = 0
         if self._wait_for_breakpoint:
@@ -150,11 +151,11 @@ class Qdb(bdb.Bdb):
         import __main__
         import imp
         __main__.__dict__.clear()
-        __main__.__dict__.update({"__name__"    : "__main__",
-                                  "__file__"    : filename,
+        __main__.__dict__.update({"__name__": "__main__",
+                                  "__file__": filename,
                                   "__builtins__": __builtins__,
-                                  "imp"         : imp,          # need for run
-                                 })
+                                  "imp": imp,          # need for run
+                                  })
 
         # avoid stopping before we reach the main script
         self._wait_for_mainpyfile = 1
@@ -200,8 +201,8 @@ class Qdb(bdb.Bdb):
                     if self.params.get('environment'):
                         kwargs['environment'] = self.do_environment()
                     self.pipe.send({'method': 'interaction', 'id': None,
-                                'args': (filename, self.frame.f_lineno, line),
-                                'kwargs': kwargs})
+                                    'args': (filename, self.frame.f_lineno, line),
+                                    'kwargs': kwargs})
 
                 self.pull_actions()
 
@@ -278,7 +279,7 @@ class Qdb(bdb.Bdb):
         filename = self.frame.f_code.co_filename
         breaklist = self.get_file_breaks(filename)
         lines = []
-        for lineno in range(first, last+1):
+        for lineno in range(first, last + 1):
             line = linecache.getline(filename, lineno,
                                      self.frame.f_globals)
             if not line:
@@ -303,7 +304,7 @@ class Qdb(bdb.Bdb):
             for bp in bdb.Breakpoint.bpbynumber:
                 if bp:
                     breaks.append((bp.number, bp.file, bp.line,
-                        bp.temporary, bp.enabled, bp.hits, bp.cond, ))
+                                   bp.temporary, bp.enabled, bp.hits, bp.cond, ))
         return breaks
 
     def do_clear_breakpoint(self, filename, lineno):
@@ -320,7 +321,7 @@ class Qdb(bdb.Bdb):
 
     def do_eval(self, arg, safe=True):
         ret = eval(arg, self.frame.f_globals,
-                    self.frame_locals)
+                   self.frame_locals)
         if safe:
             ret = pydoc.cram(repr(ret), 255)
         return ret
@@ -354,9 +355,11 @@ class Qdb(bdb.Bdb):
         # converts the frame global and locals to a short text representation:
         if self.frame:
             for name, value in self.frame_locals.items():
-                env['locals'][name] = pydoc.cram(repr(value), 255), repr(type(value))
+                env['locals'][name] = pydoc.cram(repr(
+                    value), 255), repr(type(value))
             for name, value in self.frame.f_globals.items():
-                env['globals'][name] = pydoc.cram(repr(value), 20), repr(type(value))
+                env['globals'][name] = pydoc.cram(repr(
+                    value), 20), repr(type(value))
         return env
 
     def get_autocomplete_list(self, expression):
@@ -589,8 +592,8 @@ class Frontend(object):
                 result = self.readline()
             if result:
                 response = {'version': '1.1', 'id': request.get('id'),
-                        'result': result,
-                        'error': None}
+                            'result': result,
+                            'error': None}
                 self.send(response)
             return True
 
@@ -609,7 +612,8 @@ class Frontend(object):
                 # nested request received (i.e. readline)! process it!
                 self.process_message(res)
             elif long(req['id']) != long(res['id']):
-                print "DEBUGGER wrong packet received: expecting id", req['id'], res['id']
+                print "DEBUGGER wrong packet received: expecting id", req[
+                    'id'], res['id']
                 # protocol state is unknown
             elif 'error' in res and res['error']:
                 raise RPCError(res['error']['message'])
@@ -736,7 +740,7 @@ class Cli(Frontend, cmd.Cmd):
         return raw_input()
 
     def postcmd(self, stop, line):
-        return not line.startswith("h") # stop
+        return not line.startswith("h")  # stop
 
     do_h = cmd.Cmd.do_help
 
@@ -838,6 +842,7 @@ def test():
     class Test(Frontend):
         def interaction(self, *args):
             print "interaction!", args
+
         def exception(self, *args):
             print "exception", args
             #raise RuntimeError("exception %s" % repr(args))
@@ -877,7 +882,7 @@ def main(host='localhost', port=6000, authkey='secret password'):
         print "usage: pdb.py scriptfile [arg] ..."
         sys.exit(2)
 
-    mainpyfile =  sys.argv[1]     # Get script filename
+    mainpyfile = sys.argv[1]     # Get script filename
     if not os.path.exists(mainpyfile):
         print 'Error:', mainpyfile, 'does not exist'
         sys.exit(1)
@@ -913,6 +918,8 @@ def main(host='localhost', port=6000, authkey='secret password'):
 
 
 qdb = None
+
+
 def set_trace(host='localhost', port=6000, authkey='secret password'):
     "Simplified interface to debug running programs"
     global qdb, listener, conn
@@ -950,7 +957,7 @@ if __name__ == '__main__':
     # Check environment for configuration parameters:
     kwargs = {}
     for param in 'host', 'port', 'authkey':
-       if 'QDB_%s' % param.upper() in os.environ:
+        if 'QDB_%s' % param.upper() in os.environ:
             kwargs[param] = os.environ['QDB_%s' % param.upper()]
 
     if not sys.argv[1:]:
diff --git a/gluon/contrib/redis_cache.py b/gluon/contrib/redis_cache.py
index 8fc30ab7..16454c1b 100644
--- a/gluon/contrib/redis_cache.py
+++ b/gluon/contrib/redis_cache.py
@@ -17,6 +17,7 @@ logger = logging.getLogger("web2py.cache.redis")
 
 locker = thread.allocate_lock()
 
+
 def RedisCache(*args, **vars):
     """
     Usage example: put in models
@@ -47,10 +48,11 @@ class RedisClient(object):
     meta_storage = {}
     MAX_RETRIES = 5
     RETRIES = 0
+
     def __init__(self, server='localhost:6379', db=None, debug=False):
         self.server = server
         self.db = db or 0
-        host,port = (self.server.split(':')+['6379'])[:2]
+        host, port = (self.server.split(':') + ['6379'])[:2]
         port = int(port)
         self.request = current.request
         self.debug = debug
@@ -64,7 +66,7 @@ class RedisClient(object):
                 CacheAbstract.cache_stats_name: {
                     'hit_total': 0,
                     'misses': 0,
-                    }}
+                }}
         else:
             self.storage = self.meta_storage[app]
 
@@ -72,8 +74,8 @@ class RedisClient(object):
 
     def __call__(self, key, f, time_expire=300):
         try:
-            if time_expire == None:
-                time_expire = 24*60*60
+            if time_expire is None:
+                time_expire = 24 * 60 * 60
             newKey = self.__keyFormat__(key)
             value = None
             obj = self.r_server.get(newKey)
@@ -100,13 +102,15 @@ class RedisClient(object):
     def retry_call(self, key, f, time_expire):
         self.RETRIES += 1
         if self.RETRIES <= self.MAX_RETRIES:
-            logger.error("sleeping %s seconds before reconnecting" % (2 * self.RETRIES))
+            logger.error("sleeping %s seconds before reconnecting" %
+                         (2 * self.RETRIES))
             time.sleep(2 * self.RETRIES)
             self.__init__(self.server, self.db, self.debug)
             return self.__call__(key, f, time_expire)
         else:
             self.RETRIES = 0
-            raise ConnectionError , 'Redis instance is unavailable at %s' % (self.server)
+            raise ConnectionError('Redis instance is unavailable at %s' % (
+                self.server))
 
     def increment(self, key, value=1, time_expire=300):
         try:
@@ -129,7 +133,8 @@ class RedisClient(object):
             return self.increment(key, value, time_expire)
         else:
             self.RETRIES = 0
-            raise ConnectionError , 'Redis instance is unavailable at %s' % (self.server)
+            raise ConnectionError('Redis instance is unavailable at %s' % (
+                self.server))
 
     def clear(self, regex):
         """
@@ -139,8 +144,8 @@ class RedisClient(object):
         r = re.compile(regex)
         prefix = "w2p:%s:" % (self.request.application)
         pipe = self.r_server.pipeline()
-        for a in self.r_server.keys("%s*" % \
-                                        (prefix)):
+        for a in self.r_server.keys("%s*" %
+                                    (prefix)):
             if r.match(str(a).replace(prefix, '', 1)):
                 pipe.delete(a)
         pipe.execute()
@@ -149,10 +154,10 @@ class RedisClient(object):
         statscollector = self.r_server.info()
         if self.debug:
             statscollector['w2p_stats'] = dict(
-                hit_total = self.r_server.get(
+                hit_total=self.r_server.get(
                     'web2py_cache_statistics:hit_total'),
                 misses=self.r_server.get('web2py_cache_statistics:misses')
-                )
+            )
         statscollector['w2p_keys'] = dict()
         for a in self.r_server.keys("w2p:%s:*" % (
                 self.request.application)):
diff --git a/gluon/contrib/redis_session.py b/gluon/contrib/redis_session.py
index 8497fac7..ca7a1c6a 100644
--- a/gluon/contrib/redis_session.py
+++ b/gluon/contrib/redis_session.py
@@ -16,6 +16,7 @@ logger = logging.getLogger("web2py.session.redis")
 
 locker = thread.allocate_lock()
 
+
 def RedisSession(*args, **vars):
     """
     Usage example: put in models
@@ -48,7 +49,7 @@ class RedisClient(object):
         """
         self.server = server
         self.db = db or 0
-        host,port = (self.server.split(':')+['6379'])[:2]
+        host, port = (self.server.split(':') + ['6379'])[:2]
         port = int(port)
         self.debug = debug
         if current and current.request:
@@ -63,12 +64,13 @@ class RedisClient(object):
         return self.tablename
 
     def Field(self, fieldname, type='string', length=None, default=None,
-              required=False,requires=None):
+              required=False, requires=None):
         return None
 
-    def define_table(self,tablename,*fields,**args):
+    def define_table(self, tablename, *fields, **args):
         if not self.tablename:
-            self.tablename = MockTable(self, self.r_server, tablename, self.session_expiry)
+            self.tablename = MockTable(
+                self, self.r_server, tablename, self.session_expiry)
         return self.tablename
 
     def __getitem__(self, key):
@@ -82,6 +84,7 @@ class RedisClient(object):
         #this is only called by session2trash.py
         pass
 
+
 class MockTable(object):
 
     def __init__(self, db, r_server, tablename, session_expiry):
@@ -89,7 +92,8 @@ class MockTable(object):
         self.r_server = r_server
         self.tablename = tablename
         #set the namespace for sessions of this app
-        self.keyprefix = 'w2p:sess:%s' % tablename.replace('web2py_session_', '')
+        self.keyprefix = 'w2p:sess:%s' % tablename.replace(
+            'web2py_session_', '')
         #fast auto-increment id (needed for session handling)
         self.serial = "%s:serial" % self.keyprefix
         #index of all the session keys of this app
@@ -125,6 +129,7 @@ class MockTable(object):
             self.r_server.expire(key, self.session_expiry)
         return newid
 
+
 class MockQuery(object):
     """a fake Query object that supports querying by id
        and listing all keys. No other operation is supported
@@ -171,7 +176,8 @@ class MockQuery(object):
                         continue
                 val = Storage(val)
                 #add a delete_record method (necessary for sessions2trash.py)
-                val.delete_record = RecordDeleter(self.db, sess, self.keyprefix)
+                val.delete_record = RecordDeleter(
+                    self.db, sess, self.keyprefix)
                 rtn.append(val)
             return rtn
         else:
@@ -185,6 +191,7 @@ class MockQuery(object):
                 self.db.expire(key, self.session.expiry)
             return rtn
 
+
 class RecordDeleter(object):
     """Dumb record deleter to support sessions2trash.py"""
 
diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py
index bad60074..d6dedf50 100755
--- a/gluon/contrib/shell.py
+++ b/gluon/contrib/shell.py
@@ -54,14 +54,14 @@ UNPICKLABLE_TYPES = (
     types.TypeType,
     types.ClassType,
     types.FunctionType,
-    )
+)
 
 # Unpicklable statements to seed new historys with.
 INITIAL_UNPICKLABLES = [
     'import logging',
     'import os',
     'import sys',
-    ]
+]
 
 
 class History:
@@ -154,6 +154,7 @@ class History:
         if name in self.unpicklable_names:
             self.unpicklable_names.remove(name)
 
+
 def represent(obj):
     """Returns a string representing the given object's value, which should allow the
     code below to determine whether the object changes over time.
@@ -163,6 +164,7 @@ def represent(obj):
     except:
         return repr(obj)
 
+
 def run(history, statement, env={}):
     """
     Evaluates a python statement in a given history and returns the result.
@@ -180,7 +182,6 @@ def run(history, statement, env={}):
     # single-line expressions such as 'class Foo: pass' evaluate happily.
     statement += '\n\n'
 
-
     # log and compile the statement up front
     try:
         logging.info('Compiling and evaluating:\n%s' % statement)
@@ -224,7 +225,8 @@ def run(history, statement, env={}):
                 history.remove_global(name)
 
         # run!
-        old_globals = dict((key,represent(value)) for key,value in statement_module.__dict__.items())
+        old_globals = dict((key, represent(
+            value)) for key, value in statement_module.__dict__.items())
         try:
             old_stdout, old_stderr = sys.stdout, sys.stderr
             try:
@@ -261,6 +263,7 @@ def run(history, statement, env={}):
         sys.modules['__main__'] = old_main
     return output.getvalue()
 
-if __name__=='__main__':
-    history=History()
-    while True: print run(history, raw_input('>>> ')).rstrip()
+if __name__ == '__main__':
+    history = History()
+    while True:
+        print run(history, raw_input('>>> ')).rstrip()
diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py
index 8847f374..5143cea7 100644
--- a/gluon/contrib/simplejsonrpc.py
+++ b/gluon/contrib/simplejsonrpc.py
@@ -46,8 +46,10 @@ class JSONDummyParser:
     "json wrapper for xmlrpclib parser interfase"
     def __init__(self):
         self.buf = StringIO()
+
     def feed(self, data):
         self.buf.write(data)
+
     def close(self):
         return self.buf.getvalue()
 
@@ -72,6 +74,7 @@ class JSONTransportMixin:
 class JSONTransport(JSONTransportMixin, Transport):
     pass
 
+
 class JSONSafeTransport(JSONTransportMixin, SafeTransport):
     pass
 
@@ -79,7 +82,7 @@ class JSONSafeTransport(JSONTransportMixin, SafeTransport):
 class ServerProxy(object):
     "JSON RPC Simple Client Service Proxy"
 
-    def __init__(self,  uri, transport=None, encoding=None, verbose=0):
+    def __init__(self, uri, transport=None, encoding=None, verbose=0):
         self.location = uri             # server location (url)
         self.trace = verbose            # show debug messages
         self.exceptions = True          # raise errors? (JSONRPCError)
@@ -88,7 +91,7 @@ class ServerProxy(object):
 
         type, uri = urllib.splittype(uri)
         if type not in ("http", "https"):
-            raise IOError, "unsupported JSON-RPC protocol"
+            raise IOError("unsupported JSON-RPC protocol")
         self.__host, self.__handler = urllib.splithost(uri)
 
         if transport is None:
@@ -118,7 +121,7 @@ class ServerProxy(object):
             self.__handler,
             request,
             verbose=self.__verbose
-            )
+        )
 
         # store plain request and response for further debugging
         self.json_request = request
diff --git a/gluon/contrib/sms_utils.py b/gluon/contrib/sms_utils.py
index 7d6378ef..7c5947e9 100644
--- a/gluon/contrib/sms_utils.py
+++ b/gluon/contrib/sms_utils.py
@@ -1,112 +1,115 @@
 SMSCODES = {
-    'Aliant':'@chat.wirefree.ca',
-    'Alltel':'@message.alltel.com',
-    'Ameritech':'@paging.acswireless.com',
-    'AT&T':'@txt.att.net',
-    'AU by KDDI':'@ezweb.ne.jp',
-    'BeeLine GSM':'@sms.beemail.ru',
-    'Bell Mobility Canada':'@txt.bellmobility.ca',
-    'Bellsouth':'@bellsouth.cl',
-    'BellSouth Mobility':'@blsdcs.net',
-    'Blue Sky Frog':'@blueskyfrog.com',
-    'Boost':'@myboostmobile.com',
-    'Cellular South':'@csouth1.com',
-    'CellularOne':'@mobile.celloneusa.com',
-    'CellularOne West':'@mycellone.com',
-    'Cincinnati Bell':'@gocbw.com',
-    'Claro':'@clarotorpedo.com.br',
-    'Comviq':'@sms.comviq.se',
-    'Dutchtone/Orange-NL':'@sms.orange.nl',
-    'Edge Wireless':'@sms.edgewireless.com',
-    'EinsteinPCS / Airadigm Communications':'@einsteinsms.com',
-    'EPlus':'@smsmail.eplus.de',
-    'Fido Canada':'@fido.ca',
-    'Golden Telecom':'@sms.goldentele.com',
-    'Idea Cellular':'@ideacellular.net',
-    'Kyivstar':'@sms.kyivstar.net',
-    'LMT':'@sms.lmt.lv',
-    'Manitoba Telecom Systems':'@text.mtsmobility.com',
-    'Meteor':'@sms.mymeteor.ie',
-    'Metro PCS':'@mymetropcs.com',
-    'Metrocall Pager':'@page.metrocall.com',
-    'MobileOne':'@m1.com.sg',
-    'Mobilfone':'@page.mobilfone.com',
-    'Mobility Bermuda':'@ml.bm',
-    'Netcom':'@sms.netcom.no',
-    'Nextel':'@messaging.nextel.com',
-    'NPI Wireless':'@npiwireless.com',
-    'O2':'@o2.co.uk',
-    'O2 M-mail':'@mmail.co.uk',
-    'Optus':'@optusmobile.com.au',
-    'Orange':'@orange.net',
-    'Oskar':'@mujoskar.cz',
-    'Pagenet':'@pagenet.net',
-    'PCS Rogers':'@pcs.rogers.com',
-    'Personal Communication':'@pcom.ru',
-    'Plus GSM Poland':'@text.plusgsm.pl',
-    'Powertel':'@ptel.net',
-    'Primtel':'@sms.primtel.ru',
-    'PSC Wireless':'@sms.pscel.com',
-    'Qualcomm':'@pager.qualcomm.com',
-    'Qwest':'@qwestmp.com',
-    'Safaricom':'@safaricomsms.com',
-    'Satelindo GSM':'@satelindogsm.com',
-    'SCS-900':'@scs-900.ru',
-    'Simple Freedom':'@text.simplefreedom.net',
-    'Skytel - Alphanumeric':'@skytel.com',
-    'Smart Telecom':'@mysmart.mymobile.ph',
-    'Southern Linc':'@page.southernlinc.com',
-    'Sprint PCS':'@messaging.sprintpcs.com',
-    'Sprint PCS - Short Mail':'@sprintpcs.com',
-    'SunCom':'@tms.suncom.com',
-    'SureWest Communications':'@mobile.surewest.com',
-    'SwissCom Mobile':'@bluewin.ch',
-    'T-Mobile Germany':'@T-D1-SMS.de',
-    'T-Mobile Netherlands':'@gin.nl',
-    'T-Mobile UK':'@t-mobile.uk.net',
-    'T-Mobile USA (tmail)':'@tmail.com',
-    'T-Mobile USA (tmomail)':'@tmomail.net',
-    'Tele2 Latvia':'@sms.tele2.lv',
-    'Telefonica Movistar':'@movistar.net',
-    'Telenor':'@mobilpost.no',
-    'Telia Denmark':'@gsm1800.telia.dk',
-    'Telus Mobility':'@msg.telus.com',
-    'The Phone House':'@sms.phonehouse.de',
-    'TIM':'@timnet.com',
-    'UMC':'@sms.umc.com.ua',
-    'Unicel':'@utext.com',
-    'US Cellular':'@email.uscc.net',
-    'Verizon Wireless (vtext)':'@vtext.com',
-    'Verizon Wireless (airtouchpaging)':'@airtouchpaging.com',
-    'Verizon Wireless (myairmail)':'@myairmail.com',
-    'Vessotel':'@pager.irkutsk.ru',
-    'Virgin Mobile Canada':'@vmobile.ca',
-    'Virgin Mobile USA':'@vmobl.com',
-    'Vodafone Italy':'@sms.vodafone.it',
-    'Vodafone Japan (n)':'@n.vodafone.ne.jp',
-    'Vodafone Japan (d)':'@d.vodafone.ne.jp',
-    'Vodafone Japan (r)':'@r.vodafone.ne.jp',
-    'Vodafone Japan (k)':'@k.vodafone.ne.jp',
-    'Vodafone Japan (t)':'@t.vodafone.ne.jp',
-    'Vodafone Japan (q)':'@q.vodafone.ne.jp',
-    'Vodafone Japan (s)':'@s.vodafone.ne.jp',
-    'Vodafone Japan (h)':'@h.vodafone.ne.jp',
-    'Vodafone Japan (c)':'@c.vodafone.ne.jp',
-    'Vodafone Spain':'@vodafone.es',
-    'Vodafone UK':'@vodafone.net',
-    'Weblink Wireless':'@airmessage.net',
-    'WellCom':'@sms.welcome2well.com',
-    'WyndTell':'@wyndtell.com',
-    }
+    'Aliant': '@chat.wirefree.ca',
+    'Alltel': '@message.alltel.com',
+    'Ameritech': '@paging.acswireless.com',
+    'AT&T': '@txt.att.net',
+    'AU by KDDI': '@ezweb.ne.jp',
+    'BeeLine GSM': '@sms.beemail.ru',
+    'Bell Mobility Canada': '@txt.bellmobility.ca',
+    'Bellsouth': '@bellsouth.cl',
+    'BellSouth Mobility': '@blsdcs.net',
+    'Blue Sky Frog': '@blueskyfrog.com',
+    'Boost': '@myboostmobile.com',
+    'Cellular South': '@csouth1.com',
+    'CellularOne': '@mobile.celloneusa.com',
+    'CellularOne West': '@mycellone.com',
+    'Cincinnati Bell': '@gocbw.com',
+    'Claro': '@clarotorpedo.com.br',
+    'Comviq': '@sms.comviq.se',
+    'Dutchtone/Orange-NL': '@sms.orange.nl',
+    'Edge Wireless': '@sms.edgewireless.com',
+    'EinsteinPCS / Airadigm Communications': '@einsteinsms.com',
+    'EPlus': '@smsmail.eplus.de',
+    'Fido Canada': '@fido.ca',
+    'Golden Telecom': '@sms.goldentele.com',
+    'Idea Cellular': '@ideacellular.net',
+    'Kyivstar': '@sms.kyivstar.net',
+    'LMT': '@sms.lmt.lv',
+    'Manitoba Telecom Systems': '@text.mtsmobility.com',
+    'Meteor': '@sms.mymeteor.ie',
+    'Metro PCS': '@mymetropcs.com',
+    'Metrocall Pager': '@page.metrocall.com',
+    'MobileOne': '@m1.com.sg',
+    'Mobilfone': '@page.mobilfone.com',
+    'Mobility Bermuda': '@ml.bm',
+    'Netcom': '@sms.netcom.no',
+    'Nextel': '@messaging.nextel.com',
+    'NPI Wireless': '@npiwireless.com',
+    'O2': '@o2.co.uk',
+    'O2 M-mail': '@mmail.co.uk',
+    'Optus': '@optusmobile.com.au',
+    'Orange': '@orange.net',
+    'Oskar': '@mujoskar.cz',
+    'Pagenet': '@pagenet.net',
+    'PCS Rogers': '@pcs.rogers.com',
+    'Personal Communication': '@pcom.ru',
+    'Plus GSM Poland': '@text.plusgsm.pl',
+    'Powertel': '@ptel.net',
+    'Primtel': '@sms.primtel.ru',
+    'PSC Wireless': '@sms.pscel.com',
+    'Qualcomm': '@pager.qualcomm.com',
+    'Qwest': '@qwestmp.com',
+    'Safaricom': '@safaricomsms.com',
+    'Satelindo GSM': '@satelindogsm.com',
+    'SCS-900': '@scs-900.ru',
+    'Simple Freedom': '@text.simplefreedom.net',
+    'Skytel - Alphanumeric': '@skytel.com',
+    'Smart Telecom': '@mysmart.mymobile.ph',
+    'Southern Linc': '@page.southernlinc.com',
+    'Sprint PCS': '@messaging.sprintpcs.com',
+    'Sprint PCS - Short Mail': '@sprintpcs.com',
+    'SunCom': '@tms.suncom.com',
+    'SureWest Communications': '@mobile.surewest.com',
+    'SwissCom Mobile': '@bluewin.ch',
+    'T-Mobile Germany': '@T-D1-SMS.de',
+    'T-Mobile Netherlands': '@gin.nl',
+    'T-Mobile UK': '@t-mobile.uk.net',
+    'T-Mobile USA (tmail)': '@tmail.com',
+    'T-Mobile USA (tmomail)': '@tmomail.net',
+    'Tele2 Latvia': '@sms.tele2.lv',
+    'Telefonica Movistar': '@movistar.net',
+    'Telenor': '@mobilpost.no',
+    'Telia Denmark': '@gsm1800.telia.dk',
+    'Telus Mobility': '@msg.telus.com',
+    'The Phone House': '@sms.phonehouse.de',
+    'TIM': '@timnet.com',
+    'UMC': '@sms.umc.com.ua',
+    'Unicel': '@utext.com',
+    'US Cellular': '@email.uscc.net',
+    'Verizon Wireless (vtext)': '@vtext.com',
+    'Verizon Wireless (airtouchpaging)': '@airtouchpaging.com',
+    'Verizon Wireless (myairmail)': '@myairmail.com',
+    'Vessotel': '@pager.irkutsk.ru',
+    'Virgin Mobile Canada': '@vmobile.ca',
+    'Virgin Mobile USA': '@vmobl.com',
+    'Vodafone Italy': '@sms.vodafone.it',
+    'Vodafone Japan (n)': '@n.vodafone.ne.jp',
+    'Vodafone Japan (d)': '@d.vodafone.ne.jp',
+    'Vodafone Japan (r)': '@r.vodafone.ne.jp',
+    'Vodafone Japan (k)': '@k.vodafone.ne.jp',
+    'Vodafone Japan (t)': '@t.vodafone.ne.jp',
+    'Vodafone Japan (q)': '@q.vodafone.ne.jp',
+    'Vodafone Japan (s)': '@s.vodafone.ne.jp',
+    'Vodafone Japan (h)': '@h.vodafone.ne.jp',
+    'Vodafone Japan (c)': '@c.vodafone.ne.jp',
+    'Vodafone Spain': '@vodafone.es',
+    'Vodafone UK': '@vodafone.net',
+    'Weblink Wireless': '@airmessage.net',
+    'WellCom': '@sms.welcome2well.com',
+    'WyndTell': '@wyndtell.com',
+}
 
-def sms_email(number,provider):
+
+def sms_email(number, provider):
     """
     >>> print sms_email('1 (312) 375-6536','T-Mobile USA (tmail)')
     print 13123756536@tmail.com
     """
     import re
-    if number[0]=='+1': number=number[1:]
-    elif number[0]=='+': number=number[3:]
-    elif number[:2]=='00': number=number[3:]
-    number=re.sub('[^\d]','',number)
-    return number+SMSCODES[provider]
+    if number[0] == '+1':
+        number = number[1:]
+    elif number[0] == '+':
+        number = number[3:]
+    elif number[:2] == '00': number = number[3:]
+    number = re.sub('[^\d]', '', number)
+    return number + SMSCODES[provider]
diff --git a/gluon/contrib/spreadsheet.py b/gluon/contrib/spreadsheet.py
index 22b7d025..1ff05e73 100644
--- a/gluon/contrib/spreadsheet.py
+++ b/gluon/contrib/spreadsheet.py
@@ -9,13 +9,14 @@ import pickle
 import copy
 import simplejson
 
+
 def quote(text):
     return str(text).replace('\\', '\\\\').replace("'", "\\'")
 
 
 class Node:
     def __init__(self, name, value, url='.', readonly=False, active=True,
-            onchange=None, **kwarg):
+                 onchange=None, **kwarg):
         self.url = url
         self.name = name
         self.value = str(value)
@@ -246,8 +247,8 @@ class Sheet:
             r, c = int(r), int(c)
         except (ValueError, IndexError, TypeError), e:
             error = "%s. %s" % \
-            ("Unexpected position parameter",
-            "Must be a key of type 'rncn'")
+                ("Unexpected position parameter",
+                 "Must be a key of type 'rncn'")
             raise ValueError(error)
         return r, c
 
@@ -316,7 +317,6 @@ class Sheet:
 
         return changes
 
-
     def process(self, request, db=None, db_callback=None):
         """
         call this in action that creates table, it will handle ajax callbacks
@@ -333,22 +333,22 @@ class Sheet:
 
             if request.args(0) == 'focus':
                 return "jQuery('#%(cell)s').val('%(value)s');" % \
-                dict(cell=cell, value=quote(self[cell].value))
+                    dict(cell=cell, value=quote(self[cell].value))
 
             value = request.vars[cell]
             self[cell] = value
 
             if request.args(0) == 'blur':
                 return "jQuery('#%(cell)s').val('%(value)s');" % \
-                dict(cell=cell, value=quote(self[cell].computed_value))
+                    dict(cell=cell, value=quote(self[cell].computed_value))
 
             elif request.args(0) == 'keyup':
                 jquery = ''
                 for other_key in self.modified:
                     if other_key != cell:
                         jquery += "jQuery('#%(other_key)s').val('%(value)s');" % \
-                        dict(other_key=other_key,
-                            value=quote(self[other_key].computed_value))
+                            dict(other_key=other_key,
+                                 value=quote(self[other_key].computed_value))
 
         else:
             # spreadsheet db update
@@ -390,8 +390,8 @@ class Sheet:
             return "odd"
 
     def __init__(self, rows, cols, url='.', readonly=False,
-            active=True, onchange=None, value=None, data=None,
-            headers=None, update_button="", **kwarg):
+                 active=True, onchange=None, value=None, data=None,
+                 headers=None, update_button="", **kwarg):
 
         """
         Arguments:
@@ -418,7 +418,7 @@ class Sheet:
         self.nodes = {}
         self.error = 'ERROR: %(error)s'
         self.allowed_keywords = ['for', 'in', 'if', 'else', 'and', 'or', 'not',
-                               'i', 'j', 'k', 'x', 'y', 'z', 'sum']
+                                 'i', 'j', 'k', 'x', 'y', 'z', 'sum']
         self.value = value
         self.environment = {}
         self.attributes = self.get_attributes(kwarg)
@@ -431,14 +431,14 @@ class Sheet:
         self.update_button = update_button
 
         self.client = {
-                        "columns": {},
-                        "colnames": {},
-                        "id_columns": [],
-                        "id_colnames": {},
-                        "cells": {},
-                        "modified": {},
-                        "headers": headers
-                        }
+            "columns": {},
+            "colnames": {},
+            "id_columns": [],
+            "id_colnames": {},
+            "cells": {},
+            "modified": {},
+            "headers": headers
+        }
 
         # if db and query:
         if self.data is not None:
@@ -467,10 +467,10 @@ class Sheet:
                         self.client["id_columns"].append(y)
                         self.client["id_colnames"][colname] = y
 
-        for k in xrange(self.rows*self.cols):
-            key = 'r%sc%s'%(k/self.cols, k%self.cols)
+        for k in xrange(self.rows * self.cols):
+            key = 'r%sc%s' % (k / self.cols, k % self.cols)
             r, c = self.position(key)
-            if self.client["cells"].has_key(key):
+            if key in self.client["cells"]:
                 value = self.client["cells"][key]
                 # readonly id values
                 if c in self.client["id_columns"]:
@@ -485,7 +485,7 @@ class Sheet:
             else:
                 value = '0.00'
             self.cell(key, value,
-                    readonly, active, onchange)
+                      readonly, active, onchange)
 
         exec('from math import *', {}, self.environment)
 
@@ -565,7 +565,7 @@ class Sheet:
             for col, data in cells.iteritems():
                 key = "r%sc%s" % (row, col)
                 active, onchange, readonly, cell_value = \
-                self.get_cell_arguments(data, default=kwarg)
+                    self.get_cell_arguments(data, default=kwarg)
                 if value is None:
                     v = cell_value
                 else:
@@ -575,7 +575,7 @@ class Sheet:
                           onchange=onchange, **attributes)
         else:
             active, onchange, readonly, all_value = \
-            self.get_cell_arguments(kwarg)
+                self.get_cell_arguments(kwarg)
             for col, cell_value in enumerate(cells):
                 key = "r%sc%s" % (row, col)
                 if value is None:
@@ -601,7 +601,7 @@ class Sheet:
             for row, data in cells.iteritems():
                 key = "r%sc%s" % (row, col)
                 active, onchange, readonly, cell_value = \
-                self.get_cell_arguments(data, default=kwarg)
+                    self.get_cell_arguments(data, default=kwarg)
                 if value is None:
                     v = cell_value
                 else:
@@ -610,7 +610,7 @@ class Sheet:
                           onchange=onchange, **attributes)
         else:
             active, onchange, readonly, all_value = \
-            self.get_cell_arguments(kwarg)
+                self.get_cell_arguments(kwarg)
             for row, cell_value in enumerate(cells):
                 key = "r%sc%s" % (row, col)
                 if value is None:
@@ -646,36 +646,36 @@ class Sheet:
         if isinstance(cells, dict):
             for key, data in cells.iteritems():
                 r, c = self.position(key)
-                key = "r%sc%s" % (r+starts_r, c+starts_c)
+                key = "r%sc%s" % (r + starts_r, c + starts_c)
                 active, onchange, readonly, cell_value = \
-                self.get_cell_arguments(data, default=kwarg)
+                    self.get_cell_arguments(data, default=kwarg)
                 if value is None:
                     v = cell_value
                 else:
                     v = value
-                if (ends is None) or ((ends_r >= r+starts_r) and\
-                                      (ends_c >= c+starts_c)):
+                if (ends is None) or ((ends_r >= r + starts_r) and
+                                      (ends_c >= c + starts_c)):
                     self.cell(key, v, active=active,
-                            readonly=readonly,
-                            onchange=onchange, **attributes)
+                              readonly=readonly,
+                              onchange=onchange, **attributes)
         else:
             active, onchange, readonly, all_value = \
-            self.get_cell_arguments(kwarg)
+                self.get_cell_arguments(kwarg)
             for r, row in enumerate(cells):
                 for c, cell_value in enumerate(row):
                     if value is None:
                         v = cell_value
                     else:
                         v = value
-                    key = "r%sc%s" % (r+starts_r, c+starts_c)
+                    key = "r%sc%s" % (r + starts_r, c + starts_c)
                     if (ends is None) or \
-                       ((ends_r >= r+starts_r) and\
-                        (ends_c >= c+starts_c)):
+                       ((ends_r >= r + starts_r) and
+                            (ends_c >= c + starts_c)):
                         self.cell(key, v,
-                                active=active,
-                                onchange=onchange,
-                                readonly=readonly,
-                                **attributes)
+                                  active=active,
+                                  onchange=onchange,
+                                  readonly=readonly,
+                                  **attributes)
 
     def __setitem__(self, key, value):
         key = str(key)
@@ -694,7 +694,7 @@ class Sheet:
                 other_key = match.group()
                 if other_key == key:
                     self.computed_value = self.error % dict(error='cycle')
-                    self.modified={}
+                    self.modified = {}
                     break
                 if other_key in self.nodes:
                     other_node = self.nodes[other_key]
@@ -704,7 +704,8 @@ class Sheet:
                         not other_key in self.environment:
                     node.locked = True
                     node.computed_value = \
-                        self.error % dict(error='invalid keyword: ' + other_key)
+                        self.error % dict(
+                            error='invalid keyword: ' + other_key)
                     self.modified = {}
                     break
             self.compute(node)
@@ -737,7 +738,7 @@ class Sheet:
         output = {node.name: node.computed_value}
         changed_nodes = self.changed(node)
         while changed_nodes:
-            ok=False
+            ok = False
             set_changed_nodes = set(changed_nodes)
             for (k, other_node) in enumerate(changed_nodes):
                 #print other_node, changed_nodes
@@ -758,7 +759,7 @@ class Sheet:
         return self.nodes[str(key)]
 
     def get_computed_values(self):
-        d={}
+        d = {}
         for key in self.nodes:
             node = self.nodes[key]
             if node.value[:1] != '=' or not node.active:
@@ -780,21 +781,21 @@ class Sheet:
              gluon.html.TH, gluon.html.BR, gluon.html.SCRIPT)
         regex = re.compile('r\d+c\d+')
 
-        header = TR(TH(), *[TH('c%s' % c) \
-                          for c in range(self.cols)])
+        header = TR(TH(), *[TH('c%s' % c)
+                            for c in range(self.cols)])
         rows = []
         for r in range(self.rows):
-            tds = [TH('r%s' % r),]
+            tds = [TH('r%s' % r), ]
             for c in range(self.cols):
-                key = 'r%sc%s'%(r, c)
-                attributes = {"_class": "w2p_spreadsheet_col_%s" % \
-                self.even_or_odd(c)}
+                key = 'r%sc%s' % (r, c)
+                attributes = {"_class": "w2p_spreadsheet_col_%s" %
+                              self.even_or_odd(c)}
                 if key in self.td_attributes:
                     attributes.update(self.td_attributes[key])
                 td = TD(self.nodes[key], **attributes)
                 tds.append(td)
-            attributes = {"_class": "w2p_spreadsheet_row_%s" % \
-            self.even_or_odd(r)}
+            attributes = {"_class": "w2p_spreadsheet_row_%s" %
+                          self.even_or_odd(r)}
             if str(r) in self.tr_attributes:
                 attributes.update(self.tr_attributes[str(r)])
             rows.append(TR(*tds, **attributes))
@@ -805,8 +806,8 @@ class Sheet:
         table = TABLE(header, *rows, **self.attributes)
 
         if len(self.client["cells"]) >= 1:
-            data = SCRIPT(\
-            """
+            data = SCRIPT(
+                """
             var w2p_spreadsheet_data = %(data)s;
             var w2p_spreadsheet_update_button = "%(update_button)s";
             var w2p_spreadsheet_update_result = null;
@@ -835,7 +836,8 @@ class Sheet:
 
             if (w2p_spreadsheet_update_button != ""){
               jQuery(function(){
-                jQuery("#" + w2p_spreadsheet_update_button).click(w2p_spreadsheet_update_db);
+                jQuery("#" + w2p_spreadsheet_update_button).click(
+                    w2p_spreadsheet_update_db);
               });
             }
             """ % dict(data=simplejson.dumps(self.client),
@@ -848,22 +850,22 @@ class Sheet:
             if self.client["headers"] is not None:
                 for fieldname, name in self.client["headers"].iteritems():
                     unsorted_headers.append((self.client["columns"][fieldname],
-                                         name))
+                                             name))
             else:
                 for fieldname, c in self.client["columns"].iteritems():
                     unsorted_headers.append((c, fieldname))
 
-            sorted_headers = [TH(),] + \
-            [TH(header[1]) for header in sorted(unsorted_headers)]
+            sorted_headers = [TH(), ] + \
+                [TH(header[1]) for header in sorted(unsorted_headers)]
             table.insert(0, TR(*sorted_headers,
-                                **{_class:"%s_fieldnames" % \
-                                       attributes["_class"]}))
+                               **{_class: "%s_fieldnames" %
+                                  attributes["_class"]}))
         else:
             data = SCRIPT(""" // web2py Spreadsheets: no db data.""")
 
         return DIV(table,
                    BR(),
-                   TABLE(*[TR(TH(key), TD(self.nodes[key])) \
+                   TABLE(*[TR(TH(key), TD(self.nodes[key]))
                            for key in self.nodes if not regex.match(key)]),
                    data, **attributes)
 
diff --git a/gluon/contrib/stripe.py b/gluon/contrib/stripe.py
index 3e42c8f0..ec7d939a 100644
--- a/gluon/contrib/stripe.py
+++ b/gluon/contrib/stripe.py
@@ -1,6 +1,7 @@
 import urllib
 import simplejson
 
+
 class Stripe:
     """
     Usage:
@@ -22,8 +23,9 @@ class Stripe:
     if paid is True than transaction was processed
     """
 
-    def __init__(self,key):
+    def __init__(self, key):
         self.key = key
+
     def charge(self,
                amount,
                currency='usd',
@@ -32,33 +34,33 @@ class Stripe:
                card_exp_year='2012',
                card_cvc_check='123',
                description='test charge'):
-        params = urllib.urlencode({'amount':amount,
-                                   'currency':currency,
-                                   'card[number]':card_number,
-                                   'card[exp_month]':card_exp_month,
-                                   'card[exp_year]':card_exp_year,
-                                   'card[cvc_check]':card_cvc_check,
-                                   'description':description})
-        u = urllib.urlopen('https://%s:@api.stripe.com/v1/charges' % \
-                               self.key,params)
+        params = urllib.urlencode({'amount': amount,
+                                   'currency': currency,
+                                   'card[number]': card_number,
+                                   'card[exp_month]': card_exp_month,
+                                   'card[exp_year]': card_exp_year,
+                                   'card[cvc_check]': card_cvc_check,
+                                   'description': description})
+        u = urllib.urlopen('https://%s:@api.stripe.com/v1/charges' %
+                           self.key, params)
         return simplejson.loads(u.read())
 
-    def check(self,charge_id):
-        u = urllib.urlopen('https://%s:@api.stripe.com/v1/charges/%s' % \
-                               (self.key,charge_id))
+    def check(self, charge_id):
+        u = urllib.urlopen('https://%s:@api.stripe.com/v1/charges/%s' %
+                           (self.key, charge_id))
         return simplejson.loads(u.read())
 
-    def refund(self,charge_id):
+    def refund(self, charge_id):
         params = urllib.urlencode({})
-        u = urllib.urlopen('https://%s:@api.stripe.com/v1/charges/%s/refund'%\
-                               (self.key,charge_id),params)
+        u = urllib.urlopen('https://%s:@api.stripe.com/v1/charges/%s/refund' %
+                           (self.key, charge_id), params)
         return simplejson.loads(u.read())
 
-if __name__=='__main__':
+if __name__ == '__main__':
     key = raw_input('user>')
-    d=Stripe(key).charge(100)
-    print 'charged',d['paid']
+    d = Stripe(key).charge(100)
+    print 'charged', d['paid']
     s = Stripe(key).check(d[u'id'])
-    print 'paid',s['paid'],s['amount'] ,s['currency']
+    print 'paid', s['paid'], s['amount'], s['currency']
     s = Stripe(key).refund(d[u'id'])
-    print 'refunded',s['refunded']
+    print 'refunded', s['refunded']
diff --git a/gluon/contrib/taskbar_widget.py b/gluon/contrib/taskbar_widget.py
index 313585a7..1d0ec7d8 100644
--- a/gluon/contrib/taskbar_widget.py
+++ b/gluon/contrib/taskbar_widget.py
@@ -28,7 +28,7 @@ class TaskBarIcon:
             win32con.WM_DESTROY: self.OnDestroy,
             win32con.WM_COMMAND: self.OnCommand,
             win32con.WM_USER + 20: self.OnTaskbarNotify,
-            }
+        }
 
         # Register the Window class.
 
@@ -56,7 +56,7 @@ class TaskBarIcon:
             0,
             hinst,
             None,
-            )
+        )
         win32gui.UpdateWindow(self.hwnd)
         self.SetServerStopped()
 
@@ -82,7 +82,7 @@ class TaskBarIcon:
                 hicon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
 
         flags = win32gui.NIF_ICON | win32gui.NIF_MESSAGE\
-             | win32gui.NIF_TIP
+            | win32gui.NIF_TIP
         nid = (
             self.hwnd,
             0,
@@ -90,7 +90,7 @@ class TaskBarIcon:
             win32con.WM_USER + 20,
             hicon,
             'web2py Framework',
-            )
+        )
         try:
             win32gui.Shell_NotifyIcon(win32gui.NIM_MODIFY, nid)
         except:
@@ -111,7 +111,7 @@ class TaskBarIcon:
         msg,
         wparam,
         lparam,
-        ):
+    ):
         self._DoCreateIcons()
 
     def OnDestroy(
@@ -120,7 +120,7 @@ class TaskBarIcon:
         msg,
         wparam,
         lparam,
-        ):
+    ):
         nid = (self.hwnd, 0)
         win32gui.Shell_NotifyIcon(win32gui.NIM_DELETE, nid)
 
@@ -130,7 +130,7 @@ class TaskBarIcon:
         msg,
         wparam,
         lparam,
-        ):
+    ):
         if lparam == win32con.WM_LBUTTONUP:
             pass
         elif lparam == win32con.WM_LBUTTONDBLCLK:
@@ -144,14 +144,14 @@ class TaskBarIcon:
                 win32gui.AppendMenu(menu, win32con.MF_STRING, 1024,
                                     'Start Server')
                 win32gui.AppendMenu(menu, win32con.MF_STRING
-                                     | win32con.MF_GRAYED, 1025,
+                                    | win32con.MF_GRAYED, 1025,
                                     'Restart Server')
                 win32gui.AppendMenu(menu, win32con.MF_STRING
-                                     | win32con.MF_GRAYED, 1026,
+                                    | win32con.MF_GRAYED, 1026,
                                     'Stop Server')
             else:
                 win32gui.AppendMenu(menu, win32con.MF_STRING
-                                     | win32con.MF_GRAYED, 1024,
+                                    | win32con.MF_GRAYED, 1024,
                                     'Start Server')
                 win32gui.AppendMenu(menu, win32con.MF_STRING, 1025,
                                     'Restart Server')
@@ -173,7 +173,7 @@ class TaskBarIcon:
                 0,
                 self.hwnd,
                 None,
-                )
+            )
             win32api.PostMessage(self.hwnd, win32con.WM_NULL, 0, 0)
         return 1
 
@@ -183,7 +183,7 @@ class TaskBarIcon:
         msg,
         wparam,
         lparam,
-        ):
+    ):
         id = win32api.LOWORD(wparam)
         if id == 1023:
             self.status.append(self.EnumStatus.TOGGLE)
@@ -226,7 +226,7 @@ class TaskBarIcon:
             0,
             0,
             icon_flags,
-            )
+        )
         return hicon
 
     class EnumStatus:
diff --git a/gluon/contrib/timecollect.py b/gluon/contrib/timecollect.py
index aeafc75c..fc497c44 100644
--- a/gluon/contrib/timecollect.py
+++ b/gluon/contrib/timecollect.py
@@ -3,16 +3,20 @@ import time
 from collections import namedtuple
 Score = namedtuple('Score', ['tag', 'stamp'])
 
+
 class TimeCollector(object):
     def __init__(self):
         '''The first time stamp is created here'''
-        self.scores = [Score(tag='start',stamp=time.clock())]
+        self.scores = [Score(tag='start', stamp=time.clock())]
+
     def addStamp(self, description):
         '''Adds a new time stamp, with a description.'''
         self.scores.append(Score(tag=description, stamp=time.clock()))
+
     def _stampDelta(self, index1, index2):
         '''Private utility function to clean up this common calculation.'''
         return self.scores[index1].stamp - self.scores[index2].stamp
+
     def getReportItems(self, orderByCost=True):
         '''Returns a list of dicts. Each dict has
             start (ms),
@@ -25,23 +29,24 @@ class TimeCollector(object):
         total_time = self._stampDelta(-1, 0)
         data = []
         for i in range(1, len(self.scores)):
-            delta = self._stampDelta(i, i-1)
+            delta = self._stampDelta(i, i - 1)
             if abs(total_time) < 1e-6:
                 perc = 0
             else:
                 perc = delta / total_time * 100
             data.append(
                 dict(
-                    start = self._stampDelta(i-1, 0) * 1000,
-                    end = self._stampDelta(i, 0) * 1000,
-                    delta = delta * 1000,
-                    perc = perc,
-                    tag = self.scores[i].tag
-                    )
+                    start=self._stampDelta(i - 1, 0) * 1000,
+                    end=self._stampDelta(i, 0) * 1000,
+                    delta=delta * 1000,
+                    perc=perc,
+                    tag=self.scores[i].tag
                 )
+            )
         if orderByCost:
             data.sort(key=lambda x: x['perc'], reverse=True)
         return data
+
     def getReportLines(self, orderByCost=True):
         '''Produces a report of logged time-stamps as a list of strings.
         if orderByCost is False, then the order of the stamps is
@@ -51,14 +56,16 @@ class TimeCollector(object):
         headerData = ('Start(ms)', 'End(ms)', 'Delta(ms)', 'Time Cost',
                       'Description')
         bodyTemplate = '%(start)10.0f | %(end)10.0f | %(delta)10.0f |' \
-          + ' %(perc)10.0f%% | %(tag)-30s'
+            + ' %(perc)10.0f%% | %(tag)-30s'
         return [headerTemplate % headerData] + [bodyTemplate % d for d in data]
+
     def getReportText(self, **kwargs):
         return '\n'.join(self.getReportLines(**kwargs))
-    def restart(self):
-        self.scores = [Score(tag='start',stamp=time.clock())]
 
-if __name__=='__main__':
+    def restart(self):
+        self.scores = [Score(tag='start', stamp=time.clock())]
+
+if __name__ == '__main__':
     print('')
     print('Testing:')
     print('')
@@ -87,7 +94,7 @@ if __name__=='__main__':
     print(t.getReportText())
     t.restart()
     for y in range(1, 200, 20):
-        x = [i for i in range(10000)*y]
+        x = [i for i in range(10000) * y]
         t.addStamp('Iteration when y = ' + str(y))
 
     print('')
diff --git a/gluon/contrib/user_agent_parser.py b/gluon/contrib/user_agent_parser.py
index 48de2b09..bbf6c93f 100644
--- a/gluon/contrib/user_agent_parser.py
+++ b/gluon/contrib/user_agent_parser.py
@@ -15,6 +15,7 @@ Symbian.
 """
 import sys
 
+
 class DetectorsHub(dict):
     _known_types = ['os', 'dist', 'flavor', 'browser']
 
@@ -38,6 +39,7 @@ class DetectorsHub(dict):
             return detectors
         else:
             prefs.insert(0, '')
+
             def key_name(d):
                 return d.name in prefs and prefs.index(d.name) or sys.maxint
             return sorted(detectors, key=key_name)
@@ -46,24 +48,24 @@ class DetectorsHub(dict):
         return iter(self._known_types)
 
     def registerDetectors(self):
-        detectors = [v() for v in globals().values() \
-                         if DetectorBase in getattr(v, '__mro__', [])]
+        detectors = [v() for v in globals().values()
+                     if DetectorBase in getattr(v, '__mro__', [])]
         for d in detectors:
             if d.can_register:
                 self.register(d)
 
 
 class DetectorBase(object):
-    name = "" # "to perform match in DetectorsHub object"
-    info_type = '' #override me
-    result_key = '' #override me
-    order = 10 # 0 is highest
-    look_for = [] # list of words to look for
-    skip_if_found = [] # strings if present stop processin
+    name = ""  # "to perform match in DetectorsHub object"
+    info_type = ''  # override me
+    result_key = ''  # override me
+    order = 10  # 0 is highest
+    look_for = []  # list of words to look for
+    skip_if_found = []  # strings if present stop processin
     can_register = False
     is_mobile = False
     is_tablet = False
-    prefs = dict() # dict(info_type = [name1, name2], ..)
+    prefs = dict()  # dict(info_type = [name1, name2], ..)
     version_splitters = ["/", " "]
     _suggested_detectors = None
 
@@ -75,8 +77,8 @@ class DetectorBase(object):
     def detect(self, agent, result):
         if agent and self.checkWords(agent):
             result[self.info_type] = dict(name=self.name)
-            is_mobile=self.is_mobile
-            is_tablet=self.is_tablet
+            is_mobile = self.is_mobile
+            is_tablet = self.is_tablet
             if is_mobile:
                 result['is_mobile'] = is_mobile
             if is_tablet:
@@ -131,6 +133,7 @@ class Browser(DetectorBase):
 class Macintosh(OS):
     look_for = ['Macintosh']
     prefs = dict(dist=None)
+
     def getVersion(self, agent):
         pass
 
@@ -146,12 +149,15 @@ class Konqueror(Browser):
 
 class Opera(Browser):
     look_for = ["Opera"]
+
     def getVersion(self, agent):
         return agent.partition(self.look_for[0])[2][1:].partition(' ')[0]
 
+
 class Netscape(Browser):
     look_for = ["Netscape"]
 
+
 class MSIE(Browser):
     look_for = ["MSIE"]
     skip_if_found = ["Opera"]
@@ -171,6 +177,7 @@ class Safari(Browser):
         if "Version/" in agent:
             return agent.partition('Version/')[2].partition(' ')[0].strip()
 
+
 class SafariTablet(Browser):
     name = "Safari"
     look_for = ['Safari', 'Android']
@@ -182,6 +189,7 @@ class SafariTablet(Browser):
         if "Version/" in agent:
             return agent.partition('Version/')[2].partition(' ')[0].strip()
 
+
 class SafariMobile(Browser):
     name = "Safari"
     look_for = ["Safari", "Mobile"]
@@ -191,6 +199,7 @@ class SafariMobile(Browser):
         if "Version/" in agent:
             return agent.partition('Version/')[2].partition(' ')[0].strip()
 
+
 class SafariNokia(Browser):
     name = "Safari"
     look_for = ["Safari", "SymbianOS"]
@@ -199,6 +208,7 @@ class SafariNokia(Browser):
     def getVersion(self, agent):
         pass
 
+
 class SafariiPad(Browser):
     name = "Safari"
     look_for = ["Safari", "iPad"]
@@ -218,9 +228,10 @@ class Linux(OS):
     def getVersion(self, agent):
         pass
 
+
 class BlackBerry(OS):
     look_for = ['BlackBerry']
-    prefs = dict( flavor=['PlayBook'])
+    prefs = dict(flavor=['PlayBook'])
     is_mobile = True
 
     # Manual check for tablet
@@ -232,14 +243,16 @@ class BlackBerry(OS):
     def getVersion(self, agent):
         pass
 
+
 class PlayBook(Flavor):
     look_for = ['PlayBook']
-    is_mobile=True
-    is_tablet=True
+    is_mobile = True
+    is_tablet = True
 
     def getVersion(self, agent):
         return agent.partition('Tablet OS')[2].partition(';')[0].strip()
 
+
 class Macintosh(OS):
     look_for = ['Macintosh']
     prefs = dict(dist=None, flavor=['MacOS'])
@@ -250,7 +263,8 @@ class Macintosh(OS):
 
 class MacOS(Flavor):
     look_for = ['Mac OS']
-    prefs = dict(browser=['Safari','SafariMobile', 'SafariIpad', 'Firefox', 'Opera', "Microsoft Internet Explorer"])
+    prefs = dict(browser=['Safari', 'SafariMobile', 'SafariIpad',
+                 'Firefox', 'Opera', "Microsoft Internet Explorer"])
 
     def getVersion(self, agent):
         version_end_chars = [';', ')']
@@ -269,7 +283,8 @@ class Windows(OS):
 
     def getVersion(self, agent):
         v = agent.partition('NT')
-        return v[1]+' '+v[2].replace(')',';').partition(';')[0].strip()
+        return v[1] + ' ' + v[2].replace(')', ';').partition(';')[0].strip()
+
 
 class WindowsMobile(Dist):
     name = 'Phone'
@@ -277,7 +292,8 @@ class WindowsMobile(Dist):
     is_mobile = True
 
     def getVersion(self, agent):
-        return agent.partition('Windows Phone')[2].replace(')','').partition(';')[0].strip()
+        return agent.partition('Windows Phone')[2].replace(')', '').partition(';')[0].strip()
+
 
 class Ubuntu(Dist):
     look_for = ['Ubuntu']
@@ -295,13 +311,16 @@ class Chrome(Browser):
     look_for = ['Chrome']
     version_splitters = ["/", " "]
 
+
 class ChromeOS(OS):
     look_for = ['CrOS']
     version_splitters = [" ", ")"]
     prefs = dict(browser=['Chrome'])
+
     def getVersion(self, agent):
         vs = self.version_splitters
-        return agent.partition(self.look_for[0]+vs[0])[2].partition(vs[1])[0].partition(" ")[2].strip()
+        return agent.partition(self.look_for[0] + vs[0])[2].partition(vs[1])[0].partition(" ")[2].strip()
+
 
 class Android(Dist):
     look_for = ['Android']
@@ -311,23 +330,27 @@ class Android(Dist):
     def getVersion(self, agent):
         return agent.partition('Android')[2].partition(';')[0].strip()
 
+
 class SymbianOS(OS):
     look_for = ['SymbianOS']
-    prefs = dict(dist = ['Series'], browser = ['Safari', 'Opera'])
+    prefs = dict(dist=['Series'], browser=['Safari', 'Opera'])
     is_mobile = True
     version_splitters = ['/', '; ']
 
+
 class Series(Flavor):
     look_for = ['SymbianOS', 'Series']
     version_splitters = ['/', ';']
 
     def getVersion(self, agent):
-        return agent.partition('Series')[2].partition(' ')[0].replace('/',' ')
+        return agent.partition('Series')[2].partition(' ')[0].replace('/', ' ')
+
 
 class BrowserNG(Browser):
     look_for = ['BrowserNG']
     version_splitters = ['/', ';']
 
+
 class iPhone(Dist):
     look_for = ['iPhone']
     is_mobile = True
@@ -344,6 +367,7 @@ class iPhone(Dist):
                 break
         return version.replace('_', '.')
 
+
 class iPad(Dist):
     look_for = ['iPad']
     is_mobile = True
@@ -362,6 +386,7 @@ class iPad(Dist):
 
 detectorshub = DetectorsHub()
 
+
 def detect(agent):
     result = dict()
     prefs = dict()
@@ -385,21 +410,26 @@ class Result(dict):
     def __missing__(self, k):
         return ""
 
+
 def simple_detect(agent):
     """
     -> (os, browser, is_mobile) # tuple of strings
     """
     result = detect(agent)
     os_list = []
-    if 'flavor' in result: os_list.append(result['flavor']['name'])
-    if 'dist' in result: os_list.append(result['dist']['name'])
-    if 'os' in result: os_list.append(result['os']['name'])
+    if 'flavor' in result:
+        os_list.append(result['flavor']['name'])
+    if 'dist' in result:
+        os_list.append(result['dist']['name'])
+    if 'os' in result:
+        os_list.append(result['os']['name'])
 
     os = os_list and " ".join(os_list) or "Unknown OS"
     os_version = os_list and ('flavor' in result and result['flavor'] and result['flavor'].get(
-            'version')) or ('dist' in result and result['dist'] and result['dist'].get('version')) \
-            or ('os' in result and result['os'] and result['os'].get('version')) or ""
-    browser = 'browser' in result and result['browser']['name'] or 'Unknown Browser'
+        'version')) or ('dist' in result and result['dist'] and result['dist'].get('version')) \
+        or ('os' in result and result['os'] and result['os'].get('version')) or ""
+    browser = 'browser' in result and result['browser'][
+        'name'] or 'Unknown Browser'
     browser_version = 'browser' in result \
         and result['browser'].get('version') or ""
     if browser_version:
@@ -417,64 +447,82 @@ if __name__ == '__main__':
     data = (
 
 
-        ('Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 Nokia6120c/3.83; Profile/MIDP-2.0 Configuration/CLDC-1.1) AppleWebKit/413 (KHTML, like Gecko) Safari/413',
-         ('Series SymbianOS 60 3.1', 'Safari', True),
-            {'is_mobile': True, 'is_tablet': False, 'flavor': {'name': 'Series', 'version': '60 3.1'}, 'os': {'name': 'SymbianOS',  'version': '9.2'}, 'browser': {'name': 'Safari'}},),
-        ('Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 NokiaN97-1/20.0.019; Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebKit/525 (KHTML, like Gecko) BrowserNG/7.1.18124',
-         ('Series SymbianOS 60 5.0', 'BrowserNG 7.1.18124', True),
+        (
+            'Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 Nokia6120c/3.83; Profile/MIDP-2.0 Configuration/CLDC-1.1) AppleWebKit/413 (KHTML, like Gecko) Safari/413',
+            ('Series SymbianOS 60 3.1', 'Safari', True),
+            {'is_mobile': True, 'is_tablet': False, 'flavor': {'name': 'Series', 'version': '60 3.1'}, 'os': {'name': 'SymbianOS', 'version': '9.2'}, 'browser': {'name': 'Safari'}},),
+        (
+            'Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 NokiaN97-1/20.0.019; Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebKit/525 (KHTML, like Gecko) BrowserNG/7.1.18124',
+            ('Series SymbianOS 60 5.0', 'BrowserNG 7.1.18124', True),
             {'is_mobile': True, 'is_tablet': False, 'flavor': {'name': 'Series', 'version': '60 5.0'}, 'os': {'name': 'SymbianOS', 'version': '9.4'}, 'browser': {'name': 'BrowserNG', 'version': '7.1.18124'}},),
-        ('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Windows Phone 6.5.3.5)',
-         ('Phone Windows 6.5.3.5', 'Microsoft Internet Explorer 6.0', True),
-            {'is_mobile': True, 'is_tablet': False,  'dist': {'name': 'Phone', 'version': '6.5.3.5'}, 'os': {'name': 'Windows',  'version': 'NT 5.1'}, 'browser': {'name': 'Microsoft Internet Explorer', 'version': '6.0'}},),
-        ('Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/0.0.1 Safari/534.8+',
-         ('PlayBook BlackBerry 1.0.0', 'Safari 0.0.1', True),
+        (
+            'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Windows Phone 6.5.3.5)',
+            ('Phone Windows 6.5.3.5', 'Microsoft Internet Explorer 6.0', True),
+            {'is_mobile': True, 'is_tablet': False, 'dist': {'name': 'Phone', 'version': '6.5.3.5'}, 'os': {'name': 'Windows', 'version': 'NT 5.1'}, 'browser': {'name': 'Microsoft Internet Explorer', 'version': '6.0'}},),
+        (
+            'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/0.0.1 Safari/534.8+',
+            ('PlayBook BlackBerry 1.0.0', 'Safari 0.0.1', True),
             {'is_mobile': True, 'is_tablet': True, 'flavor': {'name': 'PlayBook', 'version': '1.0.0'}, 'os': {'name': 'BlackBerry'}, 'browser': {'name': 'Safari', 'version': '0.0.1'}},),
-        ('Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+',
-         ('BlackBerry', 'Safari 6.0.0.246', True),
+        (
+            'Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+',
+            ('BlackBerry', 'Safari 6.0.0.246', True),
             {'is_mobile': True, 'is_tablet': False, 'os': {'name': 'BlackBerry'}, 'browser': {'name': 'Safari', 'version': '6.0.0.246'}},),
-        ('Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.600 Mobile Safari/534.8+',
-         ('BlackBerry', 'Safari 6.0.0.600', True),
+        (
+            'Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.600 Mobile Safari/534.8+',
+            ('BlackBerry', 'Safari 6.0.0.600', True),
             {'is_mobile': True, 'is_tablet': False, 'os': {'name': 'BlackBerry'}, 'browser': {'name': 'Safari', 'version': '6.0.0.600'}},),
-        ('Mozilla/5.0 (iPad; U; CPU OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5',
-         ('MacOS iPad X', 'Safari 5.0.2', True),
-            {'is_mobile': True, 'is_tablet': True,  'flavor': {'version': 'X', 'name': 'MacOS'},  'dist': {'version': 'iOS 4.2.1', 'name': 'iPad'}, 'browser': {'name': 'Safari', 'version': '5.0.2'}},),
-        ('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 Netscape/8.1',
-         ('Windows NT 5.1', 'Netscape 8.1', False),
+        (
+            'Mozilla/5.0 (iPad; U; CPU OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5',
+            ('MacOS iPad X', 'Safari 5.0.2', True),
+            {'is_mobile': True, 'is_tablet': True, 'flavor': {'version': 'X', 'name': 'MacOS'}, 'dist': {'version': 'iOS 4.2.1', 'name': 'iPad'}, 'browser': {'name': 'Safari', 'version': '5.0.2'}},),
+        (
+            'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 Netscape/8.1',
+            ('Windows NT 5.1', 'Netscape 8.1', False),
             {'is_mobile': False, 'is_tablet': False, 'os': {'name': 'Windows', 'version': 'NT 5.1'}, 'browser': {'name': 'Netscape', 'version': '8.1'}},),
-        ('Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; A500 Build/HRI66) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13',
-         ('Android Linux 3.0.1', 'Safari 4.0', True),
+        (
+            'Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; A500 Build/HRI66) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13',
+            ('Android Linux 3.0.1', 'Safari 4.0', True),
             {'is_mobile': True, 'is_tablet': True, 'dist': {'version': '3.0.1', 'name': 'Android'}, 'os': {'name': 'Linux'}, 'browser': {'version': '4.0', 'name': 'Safari'}},),
-        ('Mozilla/5.0 (Linux; U; Android 2.3.7; it-it; Dream/Sapphire Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
-         ('Android Linux 2.3.7', 'Safari 4.0', True),
-            {'is_mobile': True,  'is_tablet': False, 'dist': {'version': '2.3.7', 'name': 'Android'}, 'os': {'name': 'Linux'}, 'browser': {'version': '4.0', 'name': 'Safari'}},),
-        ('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-GB; rv:1.9.0.10) Gecko/2009042315 Firefox/3.0.10',
-         ('MacOS Macintosh X 10.5', 'Firefox 3.0.10', False),
-            { 'is_mobile': False, 'is_tablet': False, 'flavor': {'version': 'X 10.5', 'name': 'MacOS'}, 'os': {'name': 'Macintosh'}, 'browser': {'version': '3.0.10', 'name': 'Firefox'}},),
-        ('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_6) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.3 Safari/534.24,gzip(gfe)',
-         ('MacOS Macintosh X 10.6.6', 'Chrome 11.0.696.3', False),
+        (
+            'Mozilla/5.0 (Linux; U; Android 2.3.7; it-it; Dream/Sapphire Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+            ('Android Linux 2.3.7', 'Safari 4.0', True),
+            {'is_mobile': True, 'is_tablet': False, 'dist': {'version': '2.3.7', 'name': 'Android'}, 'os': {'name': 'Linux'}, 'browser': {'version': '4.0', 'name': 'Safari'}},),
+        (
+            'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-GB; rv:1.9.0.10) Gecko/2009042315 Firefox/3.0.10',
+            ('MacOS Macintosh X 10.5', 'Firefox 3.0.10', False),
+            {'is_mobile': False, 'is_tablet': False, 'flavor': {'version': 'X 10.5', 'name': 'MacOS'}, 'os': {'name': 'Macintosh'}, 'browser': {'version': '3.0.10', 'name': 'Firefox'}},),
+        (
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_6) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.3 Safari/534.24,gzip(gfe)',
+            ('MacOS Macintosh X 10.6.6', 'Chrome 11.0.696.3', False),
             {'is_mobile': False, 'is_tablet': False, 'flavor': {'version': 'X 10.6.6', 'name': 'MacOS'}, 'os': {'name': 'Macintosh'}, 'browser': {'version': '11.0.696.3', 'name': 'Chrome'}},),
-        ('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2) Gecko/20100308 Ubuntu/10.04 (lucid) Firefox/3.6 GTB7.1',
-         ('Ubuntu Linux 10.04', 'Firefox 3.6', False),
+        (
+            'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2) Gecko/20100308 Ubuntu/10.04 (lucid) Firefox/3.6 GTB7.1',
+            ('Ubuntu Linux 10.04', 'Firefox 3.6', False),
             {'is_mobile': False, 'is_tablet': False, 'dist': {'version': '10.04', 'name': 'Ubuntu'}, 'os': {'name': 'Linux'}, 'browser': {'version': '3.6', 'name': 'Firefox'}},),
-        ('Mozilla/5.0 (Linux; U; Android 2.2.1; fr-ch; A43 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
-         ('Android Linux 2.2.1', 'Safari 4.0', True),
+        (
+            'Mozilla/5.0 (Linux; U; Android 2.2.1; fr-ch; A43 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+            ('Android Linux 2.2.1', 'Safari 4.0', True),
             {'is_mobile': True, 'is_tablet': False, 'dist': {'version': '2.2.1', 'name': 'Android'}, 'os': {'name': 'Linux'}, 'browser': {'version': '4.0', 'name': 'Safari'}},),
-        ('Mozilla/5.0 (Linux; U; Android 2.3.4; it-it; LG-P990 Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 MMS/LG-Android-MMS-V1.0/1.2',
-         ('Android Linux 2.3.4', 'Safari 4.0', True),
+        (
+            'Mozilla/5.0 (Linux; U; Android 2.3.4; it-it; LG-P990 Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 MMS/LG-Android-MMS-V1.0/1.2',
+            ('Android Linux 2.3.4', 'Safari 4.0', True),
             {'is_mobile': True, 'is_tablet': False, 'dist': {'version': '2.3.4', 'name': 'Android'}, 'os': {'name': 'Linux'}, 'browser': {'version': '4.0', 'name': 'Safari'}},),
-        ('Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3',
-         ('MacOS iPhone X', 'Safari 3.0', True),
+        (
+            'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3',
+            ('MacOS iPhone X', 'Safari 3.0', True),
             {'is_mobile': True, 'is_tablet': False, 'flavor': {'version': 'X', 'name': 'MacOS'}, 'dist': {'version': 'X', 'name': 'iPhone'}, 'browser': {'version': '3.0', 'name': 'Safari'}},),
-        ('Mozilla/5.0 (X11; CrOS i686 0.0.0) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.27 Safari/534.24,gzip(gfe)',
-         ('ChromeOS 0.0.0', 'Chrome 11.0.696.27', False),
+        (
+            'Mozilla/5.0 (X11; CrOS i686 0.0.0) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.27 Safari/534.24,gzip(gfe)',
+            ('ChromeOS 0.0.0', 'Chrome 11.0.696.27', False),
             {'is_mobile': False, 'is_tablet': False, 'os': {'name': 'ChromeOS', 'version': '0.0.0'}, 'browser': {'name': 'Chrome', 'version': '11.0.696.27'}},),
-        ('Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.1) Opera 7.02 [en]',
-         ('Windows NT 5.1', 'Opera 7.02', False),
+        (
+            'Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.1) Opera 7.02 [en]',
+            ('Windows NT 5.1', 'Opera 7.02', False),
             {'is_mobile': False, 'is_tablet': False, 'os': {'name': 'Windows', 'version': 'NT 5.1'}, 'browser': {'name': 'Opera', 'version': '7.02'}},),
         ('Opera/9.80 (X11; Linux i686; U; en) Presto/2.9.168 Version/11.50',
          ('Linux', 'Opera 9.80', False),
             {'is_mobile': False, 'is_tablet': False, 'os': {'name': 'Linux'}, 'browser': {'name': 'Opera', 'version': '9.80'}},),
-        )
+    )
 
     class TestHAP(unittest.TestCase):
         def setUp(self):
@@ -513,6 +561,6 @@ class mobilize(object):
         user_agent = current.request.user_agent()
         if user_agent.is_mobile:
             items = current.response.view.split('.')
-            items.insert(-1,'mobile')
+            items.insert(-1, 'mobile')
             current.response.view = '.'.join(items)
         return self.func()
diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py
index 19068802..ec8d5fd2 100644
--- a/gluon/contrib/webclient.py
+++ b/gluon/contrib/webclient.py
@@ -22,21 +22,22 @@ import urllib
 import urllib2
 
 DEFAULT_HEADERS = {
-    'user-agent': 'Mozilla/4.0', # some servers are picky
+    'user-agent': 'Mozilla/4.0',  # some servers are picky
     'accept-language': 'en',
-    }
+}
 
 FORM_REGEX = re.compile('(\<input name\="_formkey" type\="hidden" value\="(?P<formkey>.+?)" \/\>)?\<input name\="_formname" type\="hidden" value\="(?P<formname>.+?)" \/\>')
 
 SESSION_REGEX = 'session_id_(?P<name>.+)'
 
+
 class WebClient(object):
 
     def __init__(self,
-                 app = '',
-                 postbacks = True,
-                 default_headers = DEFAULT_HEADERS,
-                 session_regex = SESSION_REGEX):
+                 app='',
+                 postbacks=True,
+                 default_headers=DEFAULT_HEADERS,
+                 session_regex=SESSION_REGEX):
         self.app = app
         self.postbacks = postbacks
         self.forms = {}
@@ -46,18 +47,18 @@ class WebClient(object):
         self.sessions = {}
         self.session_regex = session_regex and re.compile(session_regex)
 
-    def get(self,url,cookies=None,headers=None,auth=None):
-        return self.post(url,data=None,cookies=cookies,headers=headers)
+    def get(self, url, cookies=None, headers=None, auth=None):
+        return self.post(url, data=None, cookies=cookies, headers=headers)
 
-    def post(self,url,data=None,cookies=None,headers=None,auth=None):
-        self.url = self.app+url
+    def post(self, url, data=None, cookies=None, headers=None, auth=None):
+        self.url = self.app + url
 
         # if this POST form requires a postback do it
         if data and '_formname' in data and self.postbacks and \
-                self.history and self.history[-1][1]!=self.url:
+                self.history and self.history[-1][1] != self.url:
             # to bypass the web2py CSRF need to get formkey
             # before submitting the form
-            self.get(url,cookies=cookies,headers=headers,auth=auth)
+            self.get(url, cookies=cookies, headers=headers, auth=auth)
 
         # unless cookies are specified, recycle cookies
         if cookies is None:
@@ -75,22 +76,23 @@ class WebClient(object):
 
         # copy headers from dict to list of key,value
         headers_list = []
-        for key,value in self.default_headers.iteritems():
+        for key, value in self.default_headers.iteritems():
             if not key in headers:
                 headers[key] = value
-        for key,value in headers.iteritems():
-            if isinstance(value,(list,tuple)):
-                for v in value: headers_list.append((key,v))
+        for key, value in headers.iteritems():
+            if isinstance(value, (list, tuple)):
+                for v in value:
+                    headers_list.append((key, v))
             else:
-                headers_list.append((key,value))
+                headers_list.append((key, value))
 
         # move cookies to headers
-        for key,value in cookies.iteritems():
-            headers_list.append(('Cookie','%s=%s' % (key,value)))
+        for key, value in cookies.iteritems():
+            headers_list.append(('Cookie', '%s=%s' % (key, value)))
 
         # add headers to request
-        for key,value in headers_list:
-            opener.addheaders.append((key,str(value)))
+        for key, value in headers_list:
+            opener.addheaders.append((key, str(value)))
 
         # assume everything is ok and make http request
         error = None
@@ -99,7 +101,7 @@ class WebClient(object):
                 self.method = 'POST'
 
                 # if there is only one form, set _formname automatically
-                if not '_formname' in data and len(self.forms)==1:
+                if not '_formname' in data and len(self.forms) == 1:
                     data['_formname'] = self.forms.keys()[0]
 
                 # if there is no formkey but it is known, set it
@@ -110,18 +112,18 @@ class WebClient(object):
                 # time the POST request
                 data = urllib.urlencode(data)
                 t0 = time.time()
-                self.response = opener.open(self.url,data)
-                self.time = time.time()-t0
+                self.response = opener.open(self.url, data)
+                self.time = time.time() - t0
             else:
                 self.method = 'GET'
 
                 # time the GET request
                 t0 = time.time()
                 self.response = opener.open(self.url)
-                self.time = time.time()-t0
+                self.time = time.time() - t0
         except urllib2.HTTPError, error:
             # catch HTTP errors
-            self.time = time.time()-t0
+            self.time = time.time() - t0
             self.response = error
 
         self.status = self.response.getcode()
@@ -131,7 +133,7 @@ class WebClient(object):
         # treat web2py tickets as special types of errors
         if error is not None:
             if 'web2py_error' in self.headers:
-                raise RuntimeError, self.headers['web2py_error']
+                raise RuntimeError(self.headers['web2py_error'])
             else:
                 raise error
 
@@ -139,8 +141,8 @@ class WebClient(object):
         self.cookies = {}
         if 'set-cookie' in self.headers:
             for item in self.headers['set-cookie'].split(','):
-                key,value = item[:item.find(';')].split('=')
-            self.cookies[key.strip()]=value.strip()
+                key, value = item[:item.find(';')].split('=')
+            self.cookies[key.strip()] = value.strip()
 
         # check is a new session id has been issued, symptom of broken session
         if self.session_regex is not None:
@@ -148,8 +150,8 @@ class WebClient(object):
                 match = self.session_regex.match(cookie)
                 if match:
                     name = match.group('name')
-                    if name in self.sessions and self.sessions[name]!=value:
-                        raise RuntimeError, 'Broken sessions %s' % name
+                    if name in self.sessions and self.sessions[name] != value:
+                        raise RuntimeError('Broken sessions %s' % name)
                     self.sessions[name] = value
 
         # find all forms and formkeys in page
@@ -158,7 +160,8 @@ class WebClient(object):
             self.forms[match.group('formname')] = match.group('formkey')
 
         # log this request
-        self.history.append((self.method,self.url,self.status,self.time))
+        self.history.append((self.method, self.url, self.status, self.time))
+
 
 def test_web2py_registration_and_login():
     # from gluon.contrib.webclient import WebClient
@@ -168,13 +171,13 @@ def test_web2py_registration_and_login():
     client.get('index')
 
     # register
-    data = dict(first_name = 'Homer',
-                last_name = 'Simpson',
-                email = 'homer@web2py.com',
-                password = 'test',
-                password_two = 'test',
-                _formname = 'register')
-    client.post('user/register',data = data)
+    data = dict(first_name='Homer',
+                last_name='Simpson',
+                email='homer@web2py.com',
+                password='test',
+                password_two='test',
+                _formname='register')
+    client.post('user/register', data=data)
 
     # logout
     client.get('user/logout')
@@ -182,18 +185,18 @@ def test_web2py_registration_and_login():
     # login
     data = dict(email='homer@web2py.com',
                 password='test',
-                _formname = 'login')
-    client.post('user/login',data = data)
+                _formname='login')
+    client.post('user/login', data=data)
 
     # check registration and login were successful
     client.get('user/profile')
     assert 'Welcome Homer' in client.text
 
     # print some variables
-    print '\nsessions:\n',client.sessions
-    print '\nheaders:\n',client.headers
-    print '\ncookies:\n',client.cookies
-    print '\nforms:\n',client.forms
+    print '\nsessions:\n', client.sessions
+    print '\nheaders:\n', client.headers
+    print '\ncookies:\n', client.cookies
+    print '\nforms:\n', client.forms
     print
     for method, url, status, t in client.history:
         print method, url, status, t
diff --git a/gluon/contrib/websocket_messaging.py b/gluon/contrib/websocket_messaging.py
index cd42356d..dae2feb3 100644
--- a/gluon/contrib/websocket_messaging.py
+++ b/gluon/contrib/websocket_messaging.py
@@ -61,7 +61,8 @@ Here is a complete sample web2py action:
         form=SQLFORM.factory(Field('message'))
         if form.accepts(request,session):
             from gluon.contrib.websocket_messaging import websocket_send
-            websocket_send('http://127.0.0.1:8888',form.vars.message,'mykey','mygroup')
+            websocket_send(
+                'http://127.0.0.1:8888',form.vars.message,'mykey','mygroup')
         return form
 
 Acknowledgements:
@@ -83,31 +84,38 @@ listeners = {}
 names = {}
 tokens = {}
 
-def websocket_send(url,message,hmac_key=None,group='default'):
-    sig = hmac_key and hmac.new(hmac_key,message).hexdigest() or ''
-    params = urllib.urlencode({'message': message, 'signature': sig, 'group':group})
+
+def websocket_send(url, message, hmac_key=None, group='default'):
+    sig = hmac_key and hmac.new(hmac_key, message).hexdigest() or ''
+    params = urllib.urlencode(
+        {'message': message, 'signature': sig, 'group': group})
     f = urllib.urlopen(url, params)
-    data= f.read()
+    data = f.read()
     f.close()
     return data
 
+
 class PostHandler(tornado.web.RequestHandler):
     """
     only authorized parties can post messages
     """
     def post(self):
-        if hmac_key and not 'signature' in self.request.arguments: return 'false'
+        if hmac_key and not 'signature' in self.request.arguments:
+            return 'false'
         if 'message' in self.request.arguments:
             message = self.request.arguments['message'][0]
-            group = self.request.arguments.get('group',['default'])[0]
+            group = self.request.arguments.get('group', ['default'])[0]
             print '%s:MESSAGE to %s:%s' % (time.time(), group, message)
             if hmac_key:
                 signature = self.request.arguments['signature'][0]
-                if not hmac.new(hmac_key,message).hexdigest()==signature: return 'false'
-            for client in listeners.get(group,[]): client.write_message(message)
+                if not hmac.new(hmac_key, message).hexdigest() == signature:
+                    return 'false'
+            for client in listeners.get(group, []):
+                client.write_message(message)
             return 'true'
         return 'false'
 
+
 class TokenHandler(tornado.web.RequestHandler):
     """
     if running with -t post a token to allow a client to join using the token
@@ -115,46 +123,55 @@ class TokenHandler(tornado.web.RequestHandler):
     allows only authorized parties to joins, for example, a chat
     """
     def post(self):
-        if hmac_key and not 'message' in self.request.arguments: return 'false'
+        if hmac_key and not 'message' in self.request.arguments:
+            return 'false'
         if 'message' in self.request.arguments:
             message = self.request.arguments['message'][0]
             if hmac_key:
                 signature = self.request.arguments['signature'][0]
-                if not hmac.new(hmac_key,message).hexdigest()==signature: return 'false'
+                if not hmac.new(hmac_key, message).hexdigest() == signature:
+                    return 'false'
             tokens[message] = None
             return 'true'
         return 'false'
 
+
 class DistributeHandler(tornado.websocket.WebSocketHandler):
-    def open(self,params):
-        group,token,name = params.split('/')+[None,None]
+    def open(self, params):
+        group, token, name = params.split('/') + [None, None]
         self.group = group or 'default'
         self.token = token or 'none'
         self.name = name or 'anonymous'
         # only authorized parties can join
         if DistributeHandler.tokens:
-            if not self.token in tokens or not token[self.token]==None:
+            if not self.token in tokens or not token[self.token] is None:
                 self.close()
             else:
                 tokens[self.token] = self
-        if not self.group in listeners: listeners[self.group]=[]
+        if not self.group in listeners:
+            listeners[self.group] = []
         # notify clients that a member has joined the groups
-        for client in listeners.get(self.group,[]): client.write_message('+'+self.name)
+        for client in listeners.get(self.group, []):
+            client.write_message('+' + self.name)
         listeners[self.group].append(self)
         names[self] = self.name
         print '%s:CONNECT to %s' % (time.time(), self.group)
+
     def on_message(self, message):
         pass
+
     def on_close(self):
-        if self.group in listeners: listeners[self.group].remove(self)
+        if self.group in listeners:
+            listeners[self.group].remove(self)
         del names[self]
         # notify clients that a member has left the groups
-        for client in listeners.get(self.group,[]): client.write_message('-'+self.name)
+        for client in listeners.get(self.group, []):
+            client.write_message('-' + self.name)
         print '%s:DISCONNECT from %s' % (time.time(), self.group)
 
 if __name__ == "__main__":
     usage = __doc__
-    version= ""
+    version = ""
     parser = optparse.OptionParser(usage, None, optparse.Option, version)
     parser.add_option('-p',
                       '--port',
@@ -180,7 +197,7 @@ if __name__ == "__main__":
     (options, args) = parser.parse_args()
     hmac_key = options.hmac_key
     DistributeHandler.tokens = options.tokens
-    urls=[
+    urls = [
         (r'/', PostHandler),
         (r'/token', TokenHandler),
         (r'/realtime/(.*)', DistributeHandler)]
diff --git a/gluon/custom_import.py b/gluon/custom_import.py
index 6db23d2e..19d7703a 100644
--- a/gluon/custom_import.py
+++ b/gluon/custom_import.py
@@ -10,24 +10,30 @@ import traceback
 from gluon import current
 
 NATIVE_IMPORTER = __builtin__.__import__
-INVALID_MODULES = set(('','gluon','applications','custom_import'))
+INVALID_MODULES = set(('', 'gluon', 'applications', 'custom_import'))
 
 # backward compatibility API
+
+
 def custom_import_install():
     if __builtin__.__import__ != custom_importer:
         INVALID_MODULES.update(sys.modules.keys())
         __builtin__.__import__ = custom_importer
 
+
 def track_changes(track=True):
-    assert track in (True,False), "must be True or False"
+    assert track in (True, False), "must be True or False"
     current.request._custom_import_track_changes = track
 
+
 def is_tracking_changes():
     return current.request._custom_import_track_changes
 
+
 class CustomImportException(ImportError):
     pass
 
+
 def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
     """
     The web2py custom importer. Like the standard Python importer but it
@@ -45,25 +51,26 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
             base_importer = TRACK_IMPORTER
         else:
             base_importer = NATIVE_IMPORTER
-    except: # there is no current.request (should never happen)
+    except:  # there is no current.request (should never happen)
         base_importer = NATIVE_IMPORTER
 
     # if not relative and not from applications:
-    if hasattr(current,'request') \
-            and level<=0 \
+    if hasattr(current, 'request') \
+            and level <= 0 \
             and not name.split('.')[0] in INVALID_MODULES \
             and isinstance(globals, dict):
         import_tb = None
         try:
             items = current.request.folder.split(os.path.sep)
-            if not items[-1]: items = items[:-1]
-            modules_prefix = '.'.join(items[-2:])+'.modules'
+            if not items[-1]:
+                items = items[:-1]
+            modules_prefix = '.'.join(items[-2:]) + '.modules'
             if not fromlist:
                 # import like "import x" or "import x.y"
                 result = None
                 for itemname in name.split("."):
                     new_mod = base_importer(
-                        modules_prefix, globals,locals, [itemname], level)
+                        modules_prefix, globals, locals, [itemname], level)
                     try:
                         result = result or new_mod.__dict__[itemname]
                     except KeyError, e:
@@ -77,16 +84,16 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
         except ImportError, e1:
             import_tb = sys.exc_info()[2]
             try:
-                return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
+                return NATIVE_IMPORTER(name, globals, locals, fromlist, level)
             except ImportError, e3:
-                raise ImportError, e1, import_tb # there an import error in the module
+                raise ImportError, e1, import_tb  # there an import error in the module
         except Exception, e2:
-            raise e2 # there is an error in the module
+            raise e2  # there is an error in the module
         finally:
             if import_tb:
                 import_tb = None
 
-    return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
+    return NATIVE_IMPORTER(name, globals, locals, fromlist, level)
 
 
 class TrackImporter(object):
@@ -96,19 +103,19 @@ class TrackImporter(object):
     """
 
     THREAD_LOCAL = threading.local()
-    PACKAGE_PATH_SUFFIX = os.path.sep+"__init__.py"
+    PACKAGE_PATH_SUFFIX = os.path.sep + "__init__.py"
 
     def __init__(self):
-        self._import_dates = {} # Import dates of the files of the modules
+        self._import_dates = {}  # Import dates of the files of the modules
 
-    def __call__(self,name,globals=None,locals=None,fromlist=None,level=-1):
+    def __call__(self, name, globals=None, locals=None, fromlist=None, level=-1):
         """
         The import method itself.
         """
         globals = globals or {}
         locals = locals or {}
         fromlist = fromlist or []
-        if not hasattr(self.THREAD_LOCAL,'_modules_loaded'):
+        if not hasattr(self.THREAD_LOCAL, '_modules_loaded'):
             self.THREAD_LOCAL._modules_loaded = set()
         try:
             # Check the date and reload if needed:
@@ -119,7 +126,7 @@ class TrackImporter(object):
             self._update_dates(name, globals, locals, fromlist, level)
             return result
         except Exception, e:
-            raise # Don't hide something that went wrong
+            raise  # Don't hide something that went wrong
 
     def _update_dates(self, name, globals, locals, fromlist, level):
         """
@@ -143,7 +150,7 @@ class TrackImporter(object):
             date = self._import_dates.get(file)
             new_date = None
             reload_mod = False
-            mod_to_pack = False # Module turning into a package? (special case)
+            mod_to_pack = False  # Module turning into a package? (special case)
             try:
                 new_date = os.path.getmtime(file)
             except:
@@ -154,13 +161,13 @@ class TrackImporter(object):
                     # Get path without file ext:
                     file = os.path.splitext(file)[0]
                     reload_mod = os.path.isdir(file) \
-                      and os.path.isfile(file+self.PACKAGE_PATH_SUFFIX)
+                        and os.path.isfile(file + self.PACKAGE_PATH_SUFFIX)
                     mod_to_pack = reload_mod
-                else: # Package turning into module?
+                else:  # Package turning into module?
                     file += ".py"
                     reload_mod = os.path.isfile(file)
                 if reload_mod:
-                    new_date = os.path.getmtime(file) # Refresh file date
+                    new_date = os.path.getmtime(file)  # Refresh file date
             if reload_mod or not date or new_date > date:
                 self._import_dates[file] = new_date
             if reload_mod or (date and new_date > date):
@@ -168,7 +175,7 @@ class TrackImporter(object):
                     if mod_to_pack:
                         # Module turning into a package:
                         mod_name = module.__name__
-                        del sys.modules[mod_name] # Delete the module
+                        del sys.modules[mod_name]  # Delete the module
                         # Reload the module:
                         NATIVE_IMPORTER(mod_name, globals, locals, [], level)
                     else:
@@ -182,7 +189,7 @@ class TrackImporter(object):
         file = getattr(module, "__file__", None)
         if file:
             # Make path absolute if not:
-            file = os.path.splitext(file)[0]+".py" # Change .pyc for .py
+            file = os.path.splitext(file)[0] + ".py"  # Change .pyc for .py
             if file.endswith(self.PACKAGE_PATH_SUFFIX):
                 file = os.path.dirname(file)  # Track dir for packages
         return file
diff --git a/gluon/dal.py b/gluon/dal.py
index 9e1dd50d..deecf6a6 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -61,6 +61,7 @@ Example of usage:
 
 ### update one record
 >>> james.update_record(name='Jim')
+<Row {'id': 1, 'name': 'Jim'}>
 
 ### update multiple records by query
 >>> db(person.name.like('J%')).update(name='James')
@@ -9390,6 +9391,7 @@ def test_all():
     Update a single record
 
     >>> me.update_record(name=\"Max\")
+    <Row {'name': 'Max', 'birth': datetime.date(1971, 12, 21), 'id': 2}>
     >>> me.name
     'Max'
 
diff --git a/gluon/debug.py b/gluon/debug.py
index 8d184ce0..525604a6 100644
--- a/gluon/debug.py
+++ b/gluon/debug.py
@@ -17,6 +17,7 @@ import sys
 
 logger = logging.getLogger("web2py")
 
+
 class Pipe(Queue.Queue):
     def __init__(self, name, mode='r', *args, **kwargs):
         self.__name = name
@@ -52,6 +53,7 @@ pipe_out = Pipe('out')
 
 debugger = pdb.Pdb(completekey=None, stdin=pipe_in, stdout=pipe_out,)
 
+
 def set_trace():
     "breakpoint shortcut (like pdb)"
     logger.info("DEBUG: set_trace!")
@@ -67,6 +69,7 @@ def stop_trace():
     pipe_out.write(None)
     #pipe_out.flush()
 
+
 def communicate(command=None):
     "send command to debbuger, wait result"
     if command is not None:
@@ -91,6 +94,7 @@ from threading import RLock
 interact_lock = RLock()
 run_lock = RLock()
 
+
 def check_interaction(fn):
     "Decorator to clean and prevent interaction when not available"
     def check_fn(self, *args, **kwargs):
@@ -181,7 +185,8 @@ front_conn = qdb.QueuePipe("parent", parent_queue, child_queue)
 child_conn = qdb.QueuePipe("child", child_queue, parent_queue)
 
 web_debugger = WebDebugger(front_conn)                          # frontend
-qdb_debugger = qdb.Qdb(pipe=child_conn, redirect_stdio=False, skip=None)   # backend
+qdb_debugger = qdb.Qdb(
+    pipe=child_conn, redirect_stdio=False, skip=None)   # backend
 dbg = qdb_debugger
 
 # enable getting context (stack, globals/locals) at interaction
diff --git a/gluon/decoder.py b/gluon/decoder.py
index e3d6a560..c2b9960e 100644
--- a/gluon/decoder.py
+++ b/gluon/decoder.py
@@ -1,4 +1,5 @@
-import codecs, encodings
+import codecs
+import encodings
 
 """Caller will hand this library a buffer and ask it to either convert
 it or auto-detect the type.
@@ -9,16 +10,17 @@ Licensed under the PSF License
 """
 
 # None represents a potentially variable byte. "##" in the XML spec...
-autodetect_dict={ # bytepattern     : ("name",
-                (0x00, 0x00, 0xFE, 0xFF) : ("ucs4_be"),
-                (0xFF, 0xFE, 0x00, 0x00) : ("ucs4_le"),
-                (0xFE, 0xFF, None, None) : ("utf_16_be"),
-                (0xFF, 0xFE, None, None) : ("utf_16_le"),
-                (0x00, 0x3C, 0x00, 0x3F) : ("utf_16_be"),
-                (0x3C, 0x00, 0x3F, 0x00) : ("utf_16_le"),
-                (0x3C, 0x3F, 0x78, 0x6D): ("utf_8"),
-                (0x4C, 0x6F, 0xA7, 0x94): ("EBCDIC")
-                 }
+autodetect_dict = {  # bytepattern     : ("name",
+                                         (0x00, 0x00, 0xFE, 0xFF): ("ucs4_be"),
+    (0xFF, 0xFE, 0x00, 0x00): ("ucs4_le"),
+    (0xFE, 0xFF, None, None): ("utf_16_be"),
+    (0xFF, 0xFE, None, None): ("utf_16_le"),
+    (0x00, 0x3C, 0x00, 0x3F): ("utf_16_be"),
+    (0x3C, 0x00, 0x3F, 0x00): ("utf_16_le"),
+    (0x3C, 0x3F, 0x78, 0x6D): ("utf_8"),
+    (0x4C, 0x6F, 0xA7, 0x94): ("EBCDIC")
+}
+
 
 def autoDetectXMLEncoding(buffer):
     """ buffer -> encoding_name
@@ -31,14 +33,14 @@ def autoDetectXMLEncoding(buffer):
     # buffer at once but otherwise we'd have to decode a character at
     # a time looking for the quote character...that's a pain
 
-    encoding = "utf_8" # according to the XML spec, this is the default
+    encoding = "utf_8"  # according to the XML spec, this is the default
                           # this code successively tries to refine the default
                           # whenever it fails to refine, it falls back to
                           # the last place encoding was set.
-    if len(buffer)>=4:
+    if len(buffer) >= 4:
         bytes = (byte1, byte2, byte3, byte4) = tuple(map(ord, buffer[0:4]))
         enc_info = autodetect_dict.get(bytes, None)
-        if not enc_info: # try autodetection again removing potentially
+        if not enc_info:  # try autodetection again removing potentially
             # variable bytes
             bytes = (byte1, byte2, None, None)
             enc_info = autodetect_dict.get(bytes)
@@ -46,29 +48,30 @@ def autoDetectXMLEncoding(buffer):
         enc_info = None
 
     if enc_info:
-        encoding = enc_info # we've got a guess... these are
+        encoding = enc_info  # we've got a guess... these are
                             #the new defaults
 
         # try to find a more precise encoding using xml declaration
         secret_decoder_ring = codecs.lookup(encoding)[1]
-        (decoded,length) = secret_decoder_ring(buffer)
+        (decoded, length) = secret_decoder_ring(buffer)
         first_line = decoded.split("\n")[0]
         if first_line and first_line.startswith(u"<?xml"):
             encoding_pos = first_line.find(u"encoding")
-            if encoding_pos!=-1:
+            if encoding_pos != -1:
                 # look for double quote
-                quote_pos=first_line.find('"', encoding_pos)
+                quote_pos = first_line.find('"', encoding_pos)
 
-                if quote_pos==-1:                 # look for single quote
-                    quote_pos=first_line.find("'", encoding_pos)
+                if quote_pos == -1:                 # look for single quote
+                    quote_pos = first_line.find("'", encoding_pos)
 
-                if quote_pos>-1:
-                    quote_char,rest=(first_line[quote_pos],
-                                                first_line[quote_pos+1:])
-                    encoding=rest[:rest.find(quote_char)]
+                if quote_pos > -1:
+                    quote_char, rest = (first_line[quote_pos],
+                                        first_line[quote_pos + 1:])
+                    encoding = rest[:rest.find(quote_char)]
 
     return encoding
 
+
 def decoder(buffer):
     encoding = autoDetectXMLEncoding(buffer)
     return buffer.decode(encoding).encode('utf8')
diff --git a/gluon/fileutils.py b/gluon/fileutils.py
index 5d0412eb..a19cc73b 100644
--- a/gluon/fileutils.py
+++ b/gluon/fileutils.py
@@ -40,15 +40,17 @@ __all__ = [
     'w2p_unpack_plugin',
     'fix_newlines',
     'make_fake_file_like_object',
-    ]
+]
 
-def parse_version(version = "Version 1.99.0 (2011-09-19 08:23:26)"):
+
+def parse_version(version="Version 1.99.0 (2011-09-19 08:23:26)"):
     re_version = re.compile('[^\d]+ (\d+)\.(\d+)\.(\d+)\s*\((?P<datetime>.+?)\)\s*(?P<type>[a-z]+)?')
     m = re_version.match(version)
-    a,b,c = int(m.group(1)),int(m.group(2)),int(m.group(3)),
+    a, b, c = int(m.group(1)), int(m.group(2)), int(m.group(3)),
     s = m.group('type') or 'dev'
-    d = datetime.datetime.strptime(m.group('datetime'),'%Y-%m-%d %H:%M:%S')
-    return (a,b,c,d,s)
+    d = datetime.datetime.strptime(m.group('datetime'), '%Y-%m-%d %H:%M:%S')
+    return (a, b, c, d, s)
+
 
 def read_file(filename, mode='r'):
     "returns content from filename, making sure to close the file explicitly on exit."
@@ -58,6 +60,7 @@ def read_file(filename, mode='r'):
     finally:
         f.close()
 
+
 def write_file(filename, value, mode='w'):
     "writes <value> to filename, making sure to close the file explicitly on exit."
     f = open(filename, mode)
@@ -66,25 +69,28 @@ def write_file(filename, value, mode='w'):
     finally:
         f.close()
 
+
 def readlines_file(filename, mode='r'):
     "applies .split('\n') to the output of read_file()"
     return read_file(filename, mode).split('\n')
 
 
 def mktree(path):
-    head,tail =os.path.split(path)
+    head, tail = os.path.split(path)
     if head:
-        if tail: mktree(head)
+        if tail:
+            mktree(head)
         if not os.path.exists(head):
             os.mkdir(head)
 
+
 def listdir(
     path,
     expression='^.+$',
     drop=True,
     add_dirs=False,
     sort=True,
-    ):
+):
     """
     like os.listdir() but you can specify a regex pattern to filter files.
     if add_dirs is True, the returned items will have the full path.
@@ -115,7 +121,7 @@ def listdir(
 def recursive_unlink(f):
     if os.path.isdir(f):
         for s in os.listdir(f):
-            recursive_unlink(os.path.join(f,s))
+            recursive_unlink(os.path.join(f, s))
         os.rmdir(f)
     elif os.path.isfile(f):
         os.unlink(f)
@@ -130,7 +136,7 @@ def cleanpath(path):
     items = path.split('.')
     if len(items) > 1:
         path = re.sub('[^\w\.]+', '_', '_'.join(items[:-1]) + '.'
-                       + ''.join(items[-1:]))
+                      + ''.join(items[-1:]))
     else:
         path = re.sub('[^\w\.]+', '_', ''.join(items[-1:]))
     return path
@@ -161,7 +167,7 @@ def _extractall(filename, path='.', members=None):
 
                         try:
                             os.makedirs(os.path.join(path,
-                                    tarinfo.name), 0777)
+                                                     tarinfo.name), 0777)
                         except EnvironmentError:
                             pass
                         directories.append(tarinfo)
@@ -187,7 +193,6 @@ def _extractall(filename, path='.', members=None):
                         else:
                             self._dbg(1, 'tarfile: %s' % e)
 
-
         _cls = TarFile
     else:
         _cls = tarfile.TarFile
@@ -197,6 +202,7 @@ def _extractall(filename, path='.', members=None):
     tar.close()
     return ret
 
+
 def tar(file, dir, expression='^.+$'):
     """
     tars dir into file, only tars file that match expression
@@ -209,6 +215,7 @@ def tar(file, dir, expression='^.+$'):
     finally:
         tar.close()
 
+
 def untar(file, dir):
     """
     untar file into dir
@@ -232,6 +239,7 @@ def w2p_pack(filename, path, compiled=False):
     tarfp.close()
     os.unlink(tarname)
 
+
 def w2p_unpack(filename, path, delete_tar=True):
     filename = abspath(filename)
     path = abspath(path)
@@ -261,16 +269,18 @@ def w2p_pack_plugin(filename, path, plugin_name):
     filename = abspath(filename)
     path = abspath(path)
     if not filename.endswith('web2py.plugin.%s.w2p' % plugin_name):
-        raise Exception, "Not a web2py plugin name"
+        raise Exception("Not a web2py plugin name")
     plugin_tarball = tarfile.open(filename, 'w:gz')
     try:
         app_dir = path
-        while app_dir[-1]=='/':
+        while app_dir[-1] == '/':
             app_dir = app_dir[:-1]
-        files1=glob.glob(os.path.join(app_dir,'*/plugin_%s.*' % plugin_name))
-        files2=glob.glob(os.path.join(app_dir,'*/plugin_%s/*' % plugin_name))
-        for file in files1+files2:
-            plugin_tarball.add(file, arcname=file[len(app_dir)+1:])
+        files1 = glob.glob(
+            os.path.join(app_dir, '*/plugin_%s.*' % plugin_name))
+        files2 = glob.glob(
+            os.path.join(app_dir, '*/plugin_%s/*' % plugin_name))
+        for file in files1 + files2:
+            plugin_tarball.add(file, arcname=file[len(app_dir) + 1:])
     finally:
         plugin_tarball.close()
 
@@ -279,8 +289,8 @@ def w2p_unpack_plugin(filename, path, delete_tar=True):
     filename = abspath(filename)
     path = abspath(path)
     if not os.path.basename(filename).startswith('web2py.plugin.'):
-        raise Exception, "Not a web2py plugin"
-    w2p_unpack(filename,path,delete_tar)
+        raise Exception("Not a web2py plugin")
+    w2p_unpack(filename, path, delete_tar)
 
 
 def tar_compiled(file, dir, expression='^.+$'):
@@ -306,6 +316,7 @@ def tar_compiled(file, dir, expression='^.+$'):
         tar.add(filename, file, False)
     tar.close()
 
+
 def up(path):
     return os.path.dirname(os.path.normpath(path))
 
@@ -317,13 +328,13 @@ def get_session(request, other_application='admin'):
     try:
         session_id = request.cookies['session_id_' + other_application].value
         osession = storage.load_storage(os.path.join(
-                up(request.folder), other_application, 'sessions', session_id))
+            up(request.folder), other_application, 'sessions', session_id))
     except Exception, e:
         osession = storage.Storage()
     return osession
 
 
-def check_credentials(request, other_application='admin', expiration = 60*60):
+def check_credentials(request, other_application='admin', expiration=60 * 60):
     """ checks that user is authorized to access other_application"""
     if request.env.web2py_runtime_gae:
         from google.appengine.api import users
@@ -338,6 +349,7 @@ def check_credentials(request, other_application='admin', expiration = 60*60):
         s = get_session(request, other_application)
         return (s.authorized and s.last_time and s.last_time > dt)
 
+
 def fix_newlines(path):
     regex = re.compile(r'''(\r
 |\r|
@@ -348,12 +360,13 @@ def fix_newlines(path):
         if wdata != rdata:
             write_file(filename, wdata, 'wb')
 
+
 def copystream(
     src,
     dest,
     size,
     chunk_size=10 ** 5,
-    ):
+):
     """
     this is here because I think there is a bug in shutil.copyfileobj
     """
@@ -379,13 +392,16 @@ def make_fake_file_like_object():
     class LogFile(object):
         def write(self, value):
             pass
+
         def close(self):
             pass
     return LogFile()
 
 
-from settings import global_settings # we need to import settings here because
+from settings import global_settings  # we need to import settings here because
                                      # settings imports fileutils too
+
+
 def abspath(*relpath, **base):
     "convert relative path to absolute path based (by default) on applications_parent"
     path = os.path.join(*relpath)
diff --git a/gluon/globals.py b/gluon/globals.py
index f9c85926..597eb650 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -61,6 +61,7 @@ less_template = '<link href="%s" rel="stylesheet/less" type="text/css" />'
 css_inline = '<style type="text/css">\n%s\n</style>'
 js_inline = '<script type="text/javascript">\n%s\n</script>'
 
+
 class Request(Storage):
 
     """
@@ -82,7 +83,7 @@ class Request(Storage):
 
     def __init__(self):
         Storage.__init__(self)
-        self.wsgi = Storage() # hooks to environ and start_response
+        self.wsgi = Storage()  # hooks to environ and start_response
         self.env = Storage()
         self.cookies = Cookie.SimpleCookie()
         self.get_vars = Storage()
@@ -116,8 +117,8 @@ class Request(Storage):
         if session:
             session._user_agent = user_agent
         user_agent = Storage(user_agent)
-        for key,value in user_agent.items():
-            if isinstance(value,dict):
+        for key, value in user_agent.items():
+            if isinstance(value, dict):
                 user_agent[key] = Storage(value)
         return user_agent
 
@@ -133,25 +134,26 @@ class Request(Storage):
         current.session.secure()
 
     def restful(self):
-        def wrapper(action,self=self):
-            def f(_action=action,_self=self,*a,**b):
+        def wrapper(action, self=self):
+            def f(_action=action, _self=self, *a, **b):
                 self.is_restful = True
                 method = _self.env.request_method
                 if len(_self.args) and '.' in _self.args[-1]:
-                    _self.args[-1],_self.extension = _self.args[-1].rsplit('.',1)
+                    _self.args[-
+                               1], _self.extension = _self.args[-1].rsplit('.', 1)
                     current.response.headers['Content-Type'] = \
                         contenttype(_self.extension.lower())
-                if not method in ['GET','POST','DELETE','PUT']:
-                    raise HTTP(400,"invalid method")
-                rest_action = _action().get(method,None)
+                if not method in ['GET', 'POST', 'DELETE', 'PUT']:
+                    raise HTTP(400, "invalid method")
+                rest_action = _action().get(method, None)
                 if not rest_action:
-                    raise HTTP(400,"method not supported")
+                    raise HTTP(400, "method not supported")
                 try:
-                    return rest_action(*_self.args,**_self.vars)
+                    return rest_action(*_self.args, **_self.vars)
                 except TypeError, e:
                     exc_type, exc_value, exc_traceback = sys.exc_info()
-                    if len(traceback.extract_tb(exc_traceback))==1:
-                        raise HTTP(400,"invalid arguments")
+                    if len(traceback.extract_tb(exc_traceback)) == 1:
+                        raise HTTP(400, "invalid arguments")
                     else:
                         raise e
             f.__doc__ = action.__doc__
@@ -180,8 +182,8 @@ class Response(Storage):
         self.meta = Storage()      # used by web2py_ajax.html
         self.menu = []             # used by the default view layout
         self.files = []            # used by web2py_ajax.html
-        self.generic_patterns = [] # patterns to allow generic views
-        self.delimiters = ('{{','}}')
+        self.generic_patterns = []  # patterns to allow generic views
+        self.delimiters = ('{{', '}}')
         self._vars = None
         self._caller = lambda f: f()
         self._view_environment = None
@@ -197,7 +199,8 @@ class Response(Storage):
     def render(self, *a, **b):
         from compileapp import run_view_in
         if len(a) > 2:
-            raise SyntaxError, 'Response.render can be called with two arguments, at most'
+            raise SyntaxError(
+                'Response.render can be called with two arguments, at most')
         elif len(a) == 2:
             (view, self._vars) = (a[0], a[1])
         elif len(a) == 1 and isinstance(a[0], str):
@@ -225,9 +228,9 @@ class Response(Storage):
 
     def include_meta(self):
         s = '\n'.join(
-            '<meta name="%s" content="%s" />\n' % (k,xmlescape(v))
-            for k,v in (self.meta or {}).iteritems())
-        self.write(s,escape=False)
+            '<meta name="%s" content="%s" />\n' % (k, xmlescape(v))
+            for k, v in (self.meta or {}).iteritems())
+        self.write(s, escape=False)
 
     def include_files(self, extensions=None):
 
@@ -256,44 +259,52 @@ class Response(Storage):
             # cache for 5 minutes by default
             key = hashlib.md5(repr(files)).hexdigest()
 
-            cache = self.cache_includes or (current.cache.ram, 60*5)
+            cache = self.cache_includes or (current.cache.ram, 60 * 5)
+
             def call_minify(files=files):
                 return minify.minify(files,
-                                     URL('static','temp'),
+                                     URL('static', 'temp'),
                                      current.request.folder,
                                      self.optimize_css,
                                      self.optimize_js)
             if cache:
                 cache_model, time_expire = cache
-                files = cache_model('response.files.minified/'+key,
+                files = cache_model('response.files.minified/' + key,
                                     call_minify,
                                     time_expire)
             else:
                 files = call_minify()
         s = ''
         for item in files:
-            if isinstance(item,str):
+            if isinstance(item, str):
                 f = item.lower().split('?')[0]
                 if self.static_version:
-                    item = item.replace('/static/', '/static/_%s/' % self.static_version, 1)
-                if f.endswith('.css'):  s += css_template % item
-                elif f.endswith('.js'): s += js_template % item
-                elif f.endswith('.coffee'): s += coffee_template % item
-                elif f.endswith('.less'): s += less_template % item
-            elif isinstance(item,(list,tuple)):
+                    item = item.replace(
+                        '/static/', '/static/_%s/' % self.static_version, 1)
+                if f.endswith('.css'):
+                    s += css_template % item
+                elif f.endswith('.js'):
+                    s += js_template % item
+                elif f.endswith('.coffee'):
+                    s += coffee_template % item
+                elif f.endswith('.less'):
+                    s += less_template % item
+            elif isinstance(item, (list, tuple)):
                 f = item[0]
-                if f=='css:inline':     s += css_inline % item[1]
-                elif f=='js:inline':    s += js_inline % item[1]
+                if f == 'css:inline':
+                    s += css_inline % item[1]
+                elif f == 'js:inline':
+                    s += js_inline % item[1]
         self.write(s, escape=False)
 
     def stream(
         self,
         stream,
-        chunk_size = DEFAULT_CHUNK_SIZE,
+        chunk_size=DEFAULT_CHUNK_SIZE,
         request=None,
         attachment=False,
         filename=None,
-        ):
+    ):
         """
         if a controller function::
 
@@ -347,7 +358,7 @@ class Response(Storage):
 
         env = request.env
         # Internet Explorer < 9.0 will not allow downloads over SSL unless caching is enabled
-        if request.is_https and isinstance(env.http_user_agent,str) and \
+        if request.is_https and isinstance(env.http_user_agent, str) and \
                 not re.search(r'Opera', env.http_user_agent) and \
                 re.search(r'MSIE [5-8][^0-9]', env.http_user_agent):
             headers['Pragma'] = 'cache'
@@ -359,7 +370,7 @@ class Response(Storage):
             wrapped = streamer(stream, chunk_size=chunk_size)
         return wrapped
 
-    def download(self, request, db, chunk_size = DEFAULT_CHUNK_SIZE, attachment=True):
+    def download(self, request, db, chunk_size=DEFAULT_CHUNK_SIZE, attachment=True):
         """
         example of usage in controller::
 
@@ -373,7 +384,7 @@ class Response(Storage):
             raise HTTP(404)
         name = request.args[-1]
         items = re.compile('(?P<table>.*?)\.(?P<field>.*?)\..*')\
-                           .match(name)
+            .match(name)
         if not items:
             raise HTTP(404)
         (t, f) = (items.group('table'), items.group('field'))
@@ -389,9 +400,8 @@ class Response(Storage):
                 'attachment; filename=%s' % filename
         return self.stream(stream, chunk_size=chunk_size, request=request)
 
-
     def json(self, data, default=None):
-        return json(data, default = default or custom_json)
+        return json(data, default=default or custom_json)
 
     def xmlrpc(self, request, methods):
         """
@@ -408,7 +418,8 @@ class Response(Storage):
         the add function. Example::
 
             import xmlrpclib
-            connection = xmlrpclib.ServerProxy('http://hostname/app/contr/func')
+            connection = xmlrpclib.ServerProxy(
+                'http://hostname/app/contr/func')
             print connection.add(3, 4)
 
         """
@@ -418,14 +429,14 @@ class Response(Storage):
     def toolbar(self):
         from html import DIV, SCRIPT, BEAUTIFY, TAG, URL, A
         BUTTON = TAG.button
-        admin = URL("admin","default","design",
+        admin = URL("admin", "default", "design",
                     args=current.request.application)
         from gluon.dal import THREAD_LOCAL
-        if hasattr(THREAD_LOCAL,'instances'):
-            dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \
-                                   for row in i.db._timings]) \
-                           for i in THREAD_LOCAL.instances]
-            dbtables = dict([(regex_nopasswd.sub('******',i.uri),
+        if hasattr(THREAD_LOCAL, 'instances'):
+            dbstats = [TABLE(*[TR(PRE(row[0]), '%.2fms' % (row[1] * 1000))
+                               for row in i.db._timings])
+                       for i in THREAD_LOCAL.instances]
+            dbtables = dict([(regex_nopasswd.sub('******', i.uri),
                               {'defined':
                                sorted(list(set(i.db.tables) -
                                            set(i.db._LAZY_TABLES.keys()))) or
@@ -434,25 +445,35 @@ class Response(Storage):
                                '[no lazy tables]'})
                              for i in THREAD_LOCAL.instances])
         else:
-            dbstats = [] # if no db or on GAE
+            dbstats = []  # if no db or on GAE
             dbtables = {}
         u = web2py_uuid()
         backtotop = A('Back to top', _href="#totop-%s" % u)
         return DIV(
-            BUTTON('design',_onclick="document.location='%s'" % admin),
-            BUTTON('request',_onclick="jQuery('#request-%s').slideToggle()"%u),
-            BUTTON('response',_onclick="jQuery('#response-%s').slideToggle()"%u),
-            BUTTON('session',_onclick="jQuery('#session-%s').slideToggle()"%u),
-            BUTTON('db tables',_onclick="jQuery('#db-tables-%s').slideToggle()"%u),
-            BUTTON('db stats',_onclick="jQuery('#db-stats-%s').slideToggle()"%u),
-            DIV(BEAUTIFY(current.request), backtotop,_class="hidden",_id="request-%s"%u),
-            DIV(BEAUTIFY(current.session), backtotop, _class="hidden",_id="session-%s"%u),
-            DIV(BEAUTIFY(current.response), backtotop, _class="hidden",_id="response-%s"%u),
-            DIV(BEAUTIFY(dbtables), backtotop, _class="hidden",_id="db-tables-%s"%u),
-            DIV(BEAUTIFY(dbstats), backtotop, _class="hidden",_id="db-stats-%s"%u),
-            SCRIPT("jQuery('.hidden').hide()")
-            ,_id="totop-%s" % u
-            )
+            BUTTON('design', _onclick="document.location='%s'" % admin),
+            BUTTON('request',
+                   _onclick="jQuery('#request-%s').slideToggle()" % u),
+            BUTTON('response',
+                   _onclick="jQuery('#response-%s').slideToggle()" % u),
+            BUTTON('session',
+                   _onclick="jQuery('#session-%s').slideToggle()" % u),
+            BUTTON('db tables',
+                   _onclick="jQuery('#db-tables-%s').slideToggle()" % u),
+            BUTTON('db stats',
+                   _onclick="jQuery('#db-stats-%s').slideToggle()" % u),
+            DIV(BEAUTIFY(current.request), backtotop,
+                _class="hidden", _id="request-%s" % u),
+            DIV(BEAUTIFY(current.session), backtotop,
+                _class="hidden", _id="session-%s" % u),
+            DIV(BEAUTIFY(current.response), backtotop,
+                _class="hidden", _id="response-%s" % u),
+            DIV(BEAUTIFY(dbtables), backtotop, _class="hidden",
+                _id="db-tables-%s" % u),
+            DIV(BEAUTIFY(
+                dbstats), backtotop, _class="hidden", _id="db-stats-%s" % u),
+            SCRIPT("jQuery('.hidden').hide()"), _id="totop-%s" % u
+        )
+
 
 class Session(Storage):
 
@@ -468,19 +489,21 @@ class Session(Storage):
         tablename='web2py_session',
         masterapp=None,
         migrate=True,
-        separate = None,
+        separate=None,
         check_client=False,
         cookie_key=None,
         cookie_expires=None,
         compression_level=None
-        ):
+    ):
         """
         separate can be separate=lambda(session_name): session_name[-2:]
         and it is used to determine a session prefix.
         separate can be True and it is set to session_name[-2:]
         """
-        if request is None: request = current.request
-        if response is None: response = current.response
+        if request is None:
+            request = current.request
+        if response is None:
+            response = current.response
         if separate == True:
             separate = lambda session_name: session_name[-2:]
         self._unlock(response)
@@ -512,7 +535,8 @@ class Session(Storage):
             response.session_cookie_key = cookie_key
             response.session_cookie_compression_level = compression_level
             if session_cookie_data:
-                data = secure_loads(session_cookie_data,cookie_key,compression_level=compression_level)
+                data = secure_loads(session_cookie_data, cookie_key,
+                                    compression_level=compression_level)
                 if data:
                     self.update(data)
         # else if we are supposed to use file based sessions
@@ -527,7 +551,7 @@ class Session(Storage):
                 if regex_session_id.match(response.session_id):
                     response.session_filename = \
                         os.path.join(up(request.folder), masterapp,
-                            'sessions', response.session_id)
+                                     'sessions', response.session_id)
                 else:
                     response.session_id = None
             # do not try load the data from file is these was data in cookie
@@ -543,8 +567,8 @@ class Session(Storage):
                         response.session_file.seek(0)
                         oc = response.session_filename.split('/')[-1]\
                             .split('-')[0]
-                        if check_client and client!=oc:
-                            raise Exception, "cookie attack"
+                        if check_client and client != oc:
+                            raise Exception("cookie attack")
                     finally:
                         pass
                         #This causes admin login to break. Must find out why.
@@ -557,7 +581,7 @@ class Session(Storage):
                 if separate:
                     prefix = separate(response.session_id)
                     response.session_id = '%s/%s' % \
-                        (prefix,response.session_id)
+                        (prefix, response.session_id)
                 response.session_filename = \
                     os.path.join(up(request.folder), masterapp,
                                  'sessions', response.session_id)
@@ -585,25 +609,25 @@ class Session(Storage):
                     Field('locked', 'boolean', default=False),
                     Field('client_ip', length=64),
                     Field('created_datetime', 'datetime',
-                             default=request.now),
+                          default=request.now),
                     Field('modified_datetime', 'datetime'),
                     Field('unique_key', length=64),
                     Field('session_data', 'blob'),
                     migrate=table_migrate,
-                    )
-                table = db[tname] # to allow for lazy table
+                )
+                table = db[tname]  # to allow for lazy table
             try:
 
                 # Get session data out of the database
                 (record_id, unique_key) = response.session_id.split(':')
                 if record_id == '0':
-                    raise Exception, 'record_id == 0'
+                    raise Exception('record_id == 0')
                         # Select from database
                 if not session_cookie_data:
                     rows = db(table.id == record_id).select()
                     # Make sure the session data exists in the database
                     if len(rows) == 0 or rows[0].unique_key != unique_key:
-                        raise Exception, 'No record'
+                        raise Exception('No record')
                     # rows[0].update_record(locked=True)
                     # Unpickle the data
                     session_data = cPickle.loads(rows[0].session_data)
@@ -620,7 +644,8 @@ class Session(Storage):
         rcookies[response.session_id_name] = response.session_id
         rcookies[response.session_id_name]['path'] = '/'
         if cookie_expires:
-            rcookies[response.session_id_name]['expires'] = cookie_expires.strftime(FMT)
+            rcookies[response.session_id_name][
+                'expires'] = cookie_expires.strftime(FMT)
         # if not cookie_key, but session_data_name in cookies
         # expire session_data_name from cookies
         if session_cookie_data:
@@ -637,10 +662,10 @@ class Session(Storage):
             self._start_timestamp = datetime.datetime.today()
             return True
 
-    def is_expired(self, seconds = 3600):
+    def is_expired(self, seconds=3600):
         now = datetime.datetime.today()
         if not self._last_timestamp or \
-                self._last_timestamp + datetime.timedelta(seconds = seconds) > now:
+                self._last_timestamp + datetime.timedelta(seconds=seconds) > now:
             self._last_timestamp = now
             return False
         else:
@@ -654,12 +679,13 @@ class Session(Storage):
         self._forget = True
 
     def _try_store_in_cookie(self, request, response):
-        if response.session_storage_type!='cookie': return False
+        if response.session_storage_type != 'cookie':
+            return False
         name = response.session_data_name
-        value = secure_dumps(dict(self),response.session_cookie_key, compression_level=response.session_cookie_compression_level)
+        value = secure_dumps(dict(self), response.session_cookie_key, compression_level=response.session_cookie_compression_level)
         expires = response.session_cookie_expires
         rcookies = response.cookies
-        rcookies.pop(name,None)
+        rcookies.pop(name, None)
         rcookies[name] = value
         rcookies[name]['path'] = '/'
         if expires:
@@ -667,7 +693,7 @@ class Session(Storage):
         return True
 
     def _unchanged(self):
-        previous_session_hash = self.pop('_session_hash',None)
+        previous_session_hash = self.pop('_session_hash', None)
         if not previous_session_hash and not \
                 any(value is not None for value in self.itervalues()):
             return True
@@ -683,7 +709,7 @@ class Session(Storage):
         # don't save if file-based sessions,
         # no session id, or session being forgotten
         # or no changes to session
-        if response.session_storage_type!='db' or not response.session_id \
+        if response.session_storage_type != 'db' or not response.session_id \
                 or self._forget or self._unchanged():
             return False
 
@@ -692,7 +718,7 @@ class Session(Storage):
         unique_key = response.session_db_unique_key
 
         dd = dict(locked=False,
-                  client_ip=request.client.replace(':','.'),
+                  client_ip=request.client.replace(':', '.'),
                   modified_datetime=request.now,
                   session_data=cPickle.dumps(dict(self)),
                   unique_key=unique_key)
@@ -708,11 +734,11 @@ class Session(Storage):
 
     def _try_store_in_cookie_or_file(self, request, response):
         return \
-            self._try_store_in_cookie(request,response) or \
-            self._try_store_in_file(request,response)
+            self._try_store_in_cookie(request, response) or \
+            self._try_store_in_file(request, response)
 
     def _try_store_in_file(self, request, response):
-        if response.session_storage_type!='file':
+        if response.session_storage_type != 'file':
             return False
 
         try:
@@ -740,7 +766,7 @@ class Session(Storage):
             try:
                 portalocker.unlock(response.session_file)
                 response.session_locked = False
-            except: ### this should never happen but happens in Windows
+            except:  # this should never happen but happens in Windows
                 pass
 
     def _close(self, response):
diff --git a/gluon/highlight.py b/gluon/highlight.py
index 7fb45af2..28e3e0de 100644
--- a/gluon/highlight.py
+++ b/gluon/highlight.py
@@ -24,7 +24,7 @@ class Highlighter(object):
         mode,
         link=None,
         styles=None,
-        ):
+    ):
         """
         Initialise highlighter:
             mode = language (PYTHON, WEB2PY,C, CPP, HTML, HTML_PLAIN)
@@ -50,7 +50,7 @@ class Highlighter(object):
         elif mode == 'HTML':
             self.suppress_tokens = []
         else:
-            raise SyntaxError, 'Unknown mode: %s' % mode
+            raise SyntaxError('Unknown mode: %s' % mode)
         self.mode = mode
 
     def c_tokenizer(
@@ -58,7 +58,7 @@ class Highlighter(object):
         token,
         match,
         style,
-        ):
+    ):
         """
         Callback for C specific highlighting.
         """
@@ -72,7 +72,7 @@ class Highlighter(object):
         token,
         match,
         style,
-        ):
+    ):
         """
         Callback for python specific highlighting.
         """
@@ -93,10 +93,10 @@ class Highlighter(object):
             (url, style) = style[5:].split(';', 1)
             if url == 'None' or url == '':
                 self.output.append('<span style="%s">%s</span>'
-                                    % (style, value))
+                                   % (style, value))
             else:
                 self.output.append('<a href="%s%s" style="%s">%s</a>'
-                                    % (url, value, style, value))
+                                   % (url, value, style, value))
         else:
             self.change_style(token, style)
             self.output.append(value)
@@ -109,7 +109,7 @@ class Highlighter(object):
         token,
         match,
         style,
-        ):
+    ):
         """
         Callback for HTML specific highlighting.
         """
@@ -135,51 +135,51 @@ class Highlighter(object):
              re.compile(r'0x[0-9a-fA-F]+|[+-]?\d+(\.\d+)?([eE][+-]\d+)?|\d+'),
              'color: red'),
             ('KEYWORD', re.compile(r'(sizeof|int|long|short|char|void|'
-              + r'signed|unsigned|float|double|'
-              + r'goto|break|return|continue|asm|'
-              + r'case|default|if|else|switch|while|for|do|'
-              + r'struct|union|enum|typedef|'
-              + r'static|register|auto|volatile|extern|const)(?![a-zA-Z0-9_])'),
+                                   + r'signed|unsigned|float|double|'
+                                   + r'goto|break|return|continue|asm|'
+                                   + r'case|default|if|else|switch|while|for|do|'
+                                   + r'struct|union|enum|typedef|'
+                                   + r'static|register|auto|volatile|extern|const)(?![a-zA-Z0-9_])'),
              'color:#185369; font-weight: bold'),
             ('CPPKEYWORD',
              re.compile(r'(class|private|protected|public|template|new|delete|'
-              + r'this|friend|using|inline|export|bool|throw|try|catch|'
-              + r'operator|typeid|virtual)(?![a-zA-Z0-9_])'),
+                        + r'this|friend|using|inline|export|bool|throw|try|catch|'
+                        + r'operator|typeid|virtual)(?![a-zA-Z0-9_])'),
              'color: blue; font-weight: bold'),
             ('STRING', re.compile(r'r?u?\'(.*?)(?<!\\)\'|"(.*?)(?<!\\)"'),
              'color: #FF9966'),
             ('IDENTIFIER', re.compile(r'[a-zA-Z_][a-zA-Z0-9_]*'),
              None),
             ('WHITESPACE', re.compile(r'[   \r\n]+'), 'Keep'),
-            )),
+        )),
         'PYTHON': (python_tokenizer, (
             ('GOTOHTML', re.compile(r'\}\}'), 'color: red'),
             ('PUNC', re.compile(r'[-+*!|&^~/%\=<>\[\]{}(),.:]'),
              'font-weight: bold'),
             ('NUMBER',
              re.compile(r'0x[0-9a-fA-F]+|[+-]?\d+(\.\d+)?([eE][+-]\d+)?|\d+'
-             ), 'color: red'),
+                        ), 'color: red'),
             ('KEYWORD',
              re.compile(r'(def|class|break|continue|del|exec|finally|pass|'
-              + r'print|raise|return|try|except|global|assert|lambda|'
-              + r'yield|for|while|if|elif|else|and|in|is|not|or|import|'
-              + r'from|True|False)(?![a-zA-Z0-9_])'),
+                        + r'print|raise|return|try|except|global|assert|lambda|'
+                        + r'yield|for|while|if|elif|else|and|in|is|not|or|import|'
+                        + r'from|True|False)(?![a-zA-Z0-9_])'),
              'color:#185369; font-weight: bold'),
             ('WEB2PY',
              re.compile(r'(request|response|session|cache|redirect|local_import|HTTP|TR|XML|URL|BEAUTIFY|A|BODY|BR|B|CAT|CENTER|CODE|COL|COLGROUP|DIV|EM|EMBED|FIELDSET|LEGEND|FORM|H1|H2|H3|H4|H5|H6|IFRAME|HEAD|HR|HTML|I|IMG|INPUT|LABEL|LI|LINK|MARKMIN|MENU|META|OBJECT|OL|ON|OPTION|P|PRE|SCRIPT|SELECT|SPAN|STYLE|TABLE|THEAD|TBODY|TFOOT|TAG|TD|TEXTAREA|TH|TITLE|TT|T|UL|XHTML|IS_SLUG|IS_STRONG|IS_LOWER|IS_UPPER|IS_ALPHANUMERIC|IS_DATETIME|IS_DATETIME_IN_RANGE|IS_DATE|IS_DATE_IN_RANGE|IS_DECIMAL_IN_RANGE|IS_EMAIL|IS_EXPR|IS_FLOAT_IN_RANGE|IS_IMAGE|IS_INT_IN_RANGE|IS_IN_SET|IS_IPV4|IS_LIST_OF|IS_LENGTH|IS_MATCH|IS_EQUAL_TO|IS_EMPTY_OR|IS_NULL_OR|IS_NOT_EMPTY|IS_TIME|IS_UPLOAD_FILENAME|IS_URL|CLEANUP|CRYPT|IS_IN_DB|IS_NOT_IN_DB|DAL|Field|SQLFORM|SQLTABLE|xmlescape|embed64)(?![a-zA-Z0-9_])'
-             ), 'link:%(link)s;text-decoration:None;color:#FF5C1F;'),
+                        ), 'link:%(link)s;text-decoration:None;color:#FF5C1F;'),
             ('MAGIC', re.compile(r'self|None'),
              'color:#185369; font-weight: bold'),
             ('MULTILINESTRING', re.compile(r'r?u?(\'\'\'|""")'),
              'color: #FF9966'),
             ('STRING', re.compile(r'r?u?\'(.*?)(?<!\\)\'|"(.*?)(?<!\\)"'
-             ), 'color: #FF9966'),
+                                  ), 'color: #FF9966'),
             ('IDENTIFIER', re.compile(r'[a-zA-Z_][a-zA-Z0-9_]*'),
              None),
             ('COMMENT', re.compile(r'\#.*\r?\n'),
              'color: green; font-style: italic'),
             ('WHITESPACE', re.compile(r'[   \r\n]+'), 'Keep'),
-            )),
+        )),
         'PYTHONMultilineString': (python_tokenizer,
                                   (('ENDMULTILINESTRING',
                                   re.compile(r'.*?("""|\'\'\')',
@@ -191,13 +191,13 @@ class Highlighter(object):
             ('XMLCRAP', re.compile(r'<![^>]*>'),
              'color: blue; font-style: italic'),
             ('SCRIPT', re.compile(r'<script .*?</script>', re.IGNORECASE
-              + re.DOTALL), 'color: black'),
+                                  + re.DOTALL), 'color: black'),
             ('TAG', re.compile(r'</?\s*[a-zA-Z0-9]+'),
              'color: darkred; font-weight: bold'),
             ('ENDTAG', re.compile(r'/?>'),
              'color: darkred; font-weight: bold'),
-            )),
-        }
+        )),
+    }
 
     def highlight(self, data):
         """
@@ -215,12 +215,12 @@ class Highlighter(object):
                         if style:
                             new_mode = \
                                 Highlighter.all_styles[mode][0](self,
-                                    token, match, style
-                                     % dict(link=self.link))
+                                                                token, match, style
+                                                                % dict(link=self.link))
                         else:
                             new_mode = \
                                 Highlighter.all_styles[mode][0](self,
-                                    token, match, style)
+                                                                token, match, style)
                         if not new_mode is None:
                             mode = new_mode
                         i += max(1, len(match.group()))
@@ -257,7 +257,7 @@ def highlight(
     highlight_line=None,
     context_lines=None,
     attributes=None,
-    ):
+):
     styles = styles or {}
     attributes = attributes or {}
     if not 'CODE' in styles:
@@ -289,7 +289,7 @@ def highlight(
         linehighlight_style = styles['LINEHIGHLIGHT']
 
     if language and language.upper() in ['PYTHON', 'C', 'CPP', 'HTML',
-            'WEB2PY']:
+                                         'WEB2PY']:
         code = Highlighter(language, link, styles).highlight(code)
     else:
         code = cgi.escape(code)
@@ -301,22 +301,24 @@ def highlight(
         linenumbers = [cgi.escape(counter)] * len(lines)
     else:
         linenumbers = [str(i + counter) + '.' for i in
-                               xrange(len(lines))]
+                       xrange(len(lines))]
 
     if highlight_line:
         if counter and not isinstance(counter, str):
             lineno = highlight_line - counter
         else:
             lineno = highlight_line
-        if lineno<len(lines):
-            lines[lineno] = '<div style="%s">%s</div>' % (linehighlight_style, lines[lineno])
-            linenumbers[lineno] = '<div style="%s">%s</div>' % (linehighlight_style, linenumbers[lineno])
+        if lineno < len(lines):
+            lines[lineno] = '<div style="%s">%s</div>' % (
+                linehighlight_style, lines[lineno])
+            linenumbers[lineno] = '<div style="%s">%s</div>' % (
+                linehighlight_style, linenumbers[lineno])
 
         if context_lines:
             if lineno + context_lines < len(lines):
                 del lines[lineno + context_lines:]
                 del linenumbers[lineno + context_lines:]
-            if lineno -context_lines > 0:
+            if lineno - context_lines > 0:
                 del lines[0:lineno - context_lines]
                 del linenumbers[0:lineno - context_lines]
 
@@ -326,13 +328,13 @@ def highlight(
     items = attributes.items()
     fa = ' '.join([key[1:].lower() for (key, value) in items if key[:1]
                    == '_' and value is None] + ['%s="%s"'
-                   % (key[1:].lower(), str(value).replace('"', "'"))
+                                                % (key[1:].lower(), str(value).replace('"', "'"))
                   for (key, value) in attributes.items() if key[:1]
-                   == '_' and value])
+                  == '_' and value])
     if fa:
         fa = ' ' + fa
     return '<table%s><tr valign="top"><td style="width:40px; text-align: right;"><pre style="%s">%s</pre></td><td><pre style="%s">%s</pre></td></tr></table>'\
-         % (fa, linenumbers_style, numbers, code_style, code)
+        % (fa, linenumbers_style, numbers, code_style, code)
 
 
 if __name__ == '__main__':
@@ -341,4 +343,4 @@ if __name__ == '__main__':
     data = argfp.read()
     argfp.close()
     print '<html><body>' + highlight(data, sys.argv[2])\
-         + '</body></html>'
+        + '</body></html>'
diff --git a/gluon/html.py b/gluon/html.py
index c7cd0686..643d4f1a 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -33,7 +33,8 @@ regex_crlf = re.compile('\r|\n')
 join = ''.join
 
 # name2codepoint is incomplete respect to xhtml (and xml): 'apos' is missing.
-entitydefs = dict(map(lambda (k,v): (k, unichr(v).encode('utf-8')), name2codepoint.iteritems()))
+entitydefs = dict(map(lambda (
+    k, v): (k, unichr(v).encode('utf-8')), name2codepoint.iteritems()))
 entitydefs.setdefault('apos', u"'".encode('utf-8'))
 
 
@@ -103,10 +104,10 @@ __all__ = [
     'XML',
     'xmlescape',
     'embed64',
-    ]
+]
 
 
-def xmlescape(data, quote = True):
+def xmlescape(data, quote=True):
     """
     returns an escaped string of the provided data
 
@@ -115,7 +116,7 @@ def xmlescape(data, quote = True):
     """
 
     # first try the xml function
-    if hasattr(data,'xml') and callable(data.xml):
+    if hasattr(data, 'xml') and callable(data.xml):
         return data.xml()
 
     # otherwise, make it a string
@@ -125,16 +126,17 @@ def xmlescape(data, quote = True):
         data = data.encode('utf8', 'xmlcharrefreplace')
 
     # ... and do the escaping
-    data = cgi.escape(data, quote).replace("'","&#x27;")
+    data = cgi.escape(data, quote).replace("'", "&#x27;")
     return data
 
 
 def truncate_string(text, length, dots='...'):
     text = text.decode('utf-8')
-    if len(text)>length:
-        text = text[:length-len(dots)].encode('utf-8')+dots
+    if len(text) > length:
+        text = text[:length - len(dots)].encode('utf-8') + dots
     return text
 
+
 def URL(
     a=None,
     c=None,
@@ -154,7 +156,7 @@ def URL(
     port=None,
     encode_embedded_slash=False,
     url_encode=True
-    ):
+):
     """
     generate a URL
 
@@ -232,9 +234,10 @@ def URL(
     :raises SyntaxError: when a CRLF is found in the generated url
     """
 
-    from rewrite import url_out # done here in case used not-in web2py
+    from rewrite import url_out  # done here in case used not-in web2py
 
-    if args in (None,[]): args = []
+    if args in (None, []):
+        args = []
     vars = vars or {}
     application = None
     controller = None
@@ -244,10 +247,12 @@ def URL(
         args = [args]
 
     if not r:
-        if a and not c and not f: (f,a,c)=(a,c,f)
-        elif a and c and not f: (c,f,a)=(a,c,f)
+        if a and not c and not f:
+            (f, a, c) = (a, c, f)
+        elif a and c and not f:
+            (c, f, a) = (a, c, f)
         from globals import current
-        if hasattr(current,'request'):
+        if hasattr(current, 'request'):
             r = current.request
 
     if r:
@@ -263,10 +268,11 @@ def URL(
         controller = c
     if f:
         if not isinstance(f, str):
-            if hasattr(f,'__name__'):
+            if hasattr(f, '__name__'):
                 function = f.__name__
             else:
-                raise SyntaxError, 'when calling URL, function or function name required'
+                raise SyntaxError(
+                    'when calling URL, function or function name required')
         elif '/' in f:
             if f.startswith("/"):
                 f = f[1:]
@@ -283,17 +289,19 @@ def URL(
         if '.' in function:
             function, extension = function.rsplit('.', 1)
 
-    function2 = '%s.%s' % (function,extension or 'html')
+    function2 = '%s.%s' % (function, extension or 'html')
 
     if not (application and controller and function):
-        raise SyntaxError, 'not enough information to build the url (%s %s %s)' % (application, controller, function)
+        raise SyntaxError('not enough information to build the url (%s %s %s)' % (application, controller, function))
 
     if args:
         if url_encode:
             if encode_embedded_slash:
-                other = '/' + '/'.join([urllib.quote(str(x), '') for x in args])
+                other = '/' + '/'.join([urllib.quote(str(
+                    x), '') for x in args])
             else:
-                other = args and urllib.quote('/' + '/'.join([str(x) for x in args]))
+                other = args and urllib.quote(
+                    '/' + '/'.join([str(x) for x in args]))
         else:
             other = args and ('/' + '/'.join([str(x) for x in args]))
     else:
@@ -334,7 +342,8 @@ def URL(
 
         # re-assembling the same way during hash authentication
         message = h_args + '?' + urllib.urlencode(sorted(h_vars))
-        sig = simple_hash(message, hmac_key or '',salt or '',digest_alg='sha1')
+        sig = simple_hash(
+            message, hmac_key or '', salt or '', digest_alg='sha1')
         # add the signature into vars
         list_vars.append(('_signature', sig))
 
@@ -352,9 +361,9 @@ def URL(
         function += '.' + extension
 
     if regex_crlf.search(join([application, controller, function, other])):
-        raise SyntaxError, 'CRLF Injection Detected'
+        raise SyntaxError('CRLF Injection Detected')
 
-    url = url_out(r,env, application, controller, function,
+    url = url_out(r, env, application, controller, function,
                   args, other, scheme, host, port)
     return url
 
@@ -396,7 +405,7 @@ def verifyURL(request, hmac_key=None, hash_vars=True, salt=None, user_signature=
     """
 
     if not '_signature' in request.get_vars:
-        return False # no signature in the request URL
+        return False  # no signature in the request URL
 
     # check if user_signature requires
     if user_signature:
@@ -479,14 +488,16 @@ class XmlComponent(object):
 
     def xml(self):
         raise NotImplementedError
-    def __mul__(self,n):
+
+    def __mul__(self, n):
         return CAT(*[self for i in range(n)])
-    def __add__(self,other):
-        if isinstance(self,CAT):
+
+    def __add__(self, other):
+        if isinstance(self, CAT):
             components = self.components
         else:
             components = [self]
-        if isinstance(other,CAT):
+        if isinstance(other, CAT):
             components += other.components
         else:
             components += [other]
@@ -495,14 +506,14 @@ class XmlComponent(object):
     def add_class(self, name):
         """ add a class to _class attribute """
         c = self['_class']
-        classes = (set(c.split()) if c else set())|set(name.split())
+        classes = (set(c.split()) if c else set()) | set(name.split())
         self['_class'] = ' '.join(classes) if classes else None
         return self
 
     def remove_class(self, name):
         """ remove a class from _class attribute """
         c = self['_class']
-        classes = (set(c.split()) if c else set())-set(name.split())
+        classes = (set(c.split()) if c else set()) - set(name.split())
         self['_class'] = ' '.join(classes) if classes else None
         return self
 
@@ -521,8 +532,8 @@ class XML(XmlComponent):
     def __init__(
         self,
         text,
-        sanitize = False,
-        permitted_tags = [
+        sanitize=False,
+        permitted_tags=[
             'a',
             'b',
             'blockquote',
@@ -536,17 +547,17 @@ class XML(XmlComponent):
             'code',
             'pre',
             'img/',
-            'h1','h2','h3','h4','h5','h6',
-            'table','tr','td','div',
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+            'table', 'tr', 'td', 'div',
             'strong',
-            ],
-        allowed_attributes = {
+        ],
+        allowed_attributes={
             'a': ['href', 'title', 'target'],
             'img': ['src', 'alt'],
             'blockquote': ['type'],
             'td': ['colspan'],
-            },
-        ):
+        },
+    ):
         """
         :param text: the XML text
         :param sanitize: sanitize text using the permitted tags and allowed
@@ -560,7 +571,7 @@ class XML(XmlComponent):
 
         if sanitize:
             text = sanitizer.sanitize(text, permitted_tags,
-                    allowed_attributes)
+                                      allowed_attributes)
         if isinstance(text, unicode):
             text = text.encode('utf8', 'xmlcharrefreplace')
         elif not isinstance(text, str):
@@ -573,39 +584,40 @@ class XML(XmlComponent):
     def __str__(self):
         return self.xml()
 
-    def __add__(self,other):
-        return '%s%s' % (self,other)
+    def __add__(self, other):
+        return '%s%s' % (self, other)
 
-    def __radd__(self,other):
-        return '%s%s' % (other,self)
+    def __radd__(self, other):
+        return '%s%s' % (other, self)
 
-    def __cmp__(self,other):
-        return cmp(str(self),str(other))
+    def __cmp__(self, other):
+        return cmp(str(self), str(other))
 
     def __hash__(self):
         return hash(str(self))
 
-    def __getattr__(self,name):
-        return getattr(str(self),name)
+    def __getattr__(self, name):
+        return getattr(str(self), name)
 
-    def __getitem__(self,i):
+    def __getitem__(self, i):
         return str(self)[i]
 
-    def __getslice__(self,i,j):
+    def __getslice__(self, i, j):
         return str(self)[i:j]
 
     def __iter__(self):
-        for c in str(self): yield c
+        for c in str(self):
+            yield c
 
     def __len__(self):
         return len(str(self))
 
-    def flatten(self,render=None):
+    def flatten(self, render=None):
         """
         return the text stored by the XML object rendered by the render function
         """
         if render:
-            return render(self.text,None,{})
+            return render(self.text, None, {})
         return self.text
 
     def elements(self, *args, **kargs):
@@ -616,14 +628,17 @@ class XML(XmlComponent):
         return []
 
 ### important to allow safe session.flash=T(....)
+
+
 def XML_unpickle(data):
     return marshal.loads(data)
+
+
 def XML_pickle(data):
     return XML_unpickle, (marshal.dumps(str(data)),)
 copy_reg.pickle(XML, XML_pickle, XML_unpickle)
 
 
-
 class DIV(XmlComponent):
     """
     HTML helper, for easy generating and manipulating a DOM structure.
@@ -657,9 +672,9 @@ class DIV(XmlComponent):
         """
 
         if self.tag[-1:] == '/' and components:
-            raise SyntaxError, '<%s> tags cannot have components'\
-                 % self.tag
-        if len(components) == 1 and isinstance(components[0], (list,tuple)):
+            raise SyntaxError('<%s> tags cannot have components'
+                              % self.tag)
+        if len(components) == 1 and isinstance(components[0], (list, tuple)):
             self.components = list(components[0])
         else:
             self.components = list(components)
@@ -777,8 +792,8 @@ class DIV(XmlComponent):
         return
 
     def _wrap_components(self, allowed_parents,
-                         wrap_parent = None,
-                         wrap_lambda = None):
+                         wrap_parent=None,
+                         wrap_lambda=None):
         """
         helper for _fixup. Checks if a component is in allowed_parents,
         otherwise wraps it in wrap_parent
@@ -797,7 +812,7 @@ class DIV(XmlComponent):
                 c = wrap_lambda(c)
             else:
                 c = wrap_parent(c)
-            if isinstance(c,DIV):
+            if isinstance(c, DIV):
                 c.parent = self
             components.append(c)
         self.components = components
@@ -822,9 +837,9 @@ class DIV(XmlComponent):
                 c.session = self.session
                 c.formname = self.formname
                 if hideerror and not \
-                        self.attributes.get('hideerror',False):
+                        self.attributes.get('hideerror', False):
                     c['hideerror'] = hideerror
-                newstatus = c._traverse(status,hideerror) and newstatus
+                newstatus = c._traverse(status, hideerror) and newstatus
 
         # for input, textarea, select, option
         # deal with 'value' and 'validation'
@@ -849,8 +864,8 @@ class DIV(XmlComponent):
         """
         return True
 
-    def _setnode(self,value):
-        if isinstance(value,DIV):
+    def _setnode(self, value):
+        if isinstance(value, DIV):
             value.parent = self
 
     def _xml(self):
@@ -927,22 +942,21 @@ class DIV(XmlComponent):
 
         text = ''
         for c in self.components:
-            if isinstance(c,XmlComponent):
-                s=c.flatten(render)
+            if isinstance(c, XmlComponent):
+                s = c.flatten(render)
             elif render:
-                s=render(str(c))
+                s = render(str(c))
             else:
-                s=str(c)
-            text+=s
+                s = str(c)
+            text += s
         if render:
-            text = render(text,self.tag,self.attributes)
+            text = render(text, self.tag, self.attributes)
         return text
 
-    regex_tag=re.compile('^[\w\-\:]+')
-    regex_id=re.compile('#([\w\-]+)')
-    regex_class=re.compile('\.([\w\-]+)')
-    regex_attr=re.compile('\[([\w\-\:]+)=(.*?)\]')
-
+    regex_tag = re.compile('^[\w\-\:]+')
+    regex_id = re.compile('#([\w\-]+)')
+    regex_class = re.compile('\.([\w\-]+)')
+    regex_attr = re.compile('\[([\w\-\:]+)=(.*?)\]')
 
     def elements(self, *args, **kargs):
         """
@@ -1017,37 +1031,41 @@ class DIV(XmlComponent):
         >>> print a
         <div><div><span class="abc">x</span><div><span class="efg">hello</span><span class="abc">z</span></div></div></div>
         """
-        if len(args)==1:
+        if len(args) == 1:
             args = [a.strip() for a in args[0].split(',')]
-        if len(args)>1:
-            subset = [self.elements(a,**kargs) for a in args]
-            return reduce(lambda a,b:a+b,subset,[])
-        elif len(args)==1:
+        if len(args) > 1:
+            subset = [self.elements(a, **kargs) for a in args]
+            return reduce(lambda a, b: a + b, subset, [])
+        elif len(args) == 1:
             items = args[0].split()
-            if len(items)>1:
-                subset=[a.elements(' '.join(items[1:]),**kargs) for a in self.elements(items[0])]
-                return reduce(lambda a,b:a+b,subset,[])
+            if len(items) > 1:
+                subset = [a.elements(' '.join(
+                    items[1:]), **kargs) for a in self.elements(items[0])]
+                return reduce(lambda a, b: a + b, subset, [])
             else:
-                item=items[0]
+                item = items[0]
                 if '#' in item or '.' in item or '[' in item:
                     match_tag = self.regex_tag.search(item)
                     match_id = self.regex_id.search(item)
                     match_class = self.regex_class.search(item)
                     match_attr = self.regex_attr.finditer(item)
                     args = []
-                    if match_tag: args = [match_tag.group()]
-                    if match_id: kargs['_id'] = match_id.group(1)
-                    if match_class: kargs['_class'] = re.compile('(?<!\w)%s(?!\w)' % \
-                       match_class.group(1).replace('-','\\-').replace(':','\\:'))
+                    if match_tag:
+                        args = [match_tag.group()]
+                    if match_id:
+                        kargs['_id'] = match_id.group(1)
+                    if match_class:
+                        kargs['_class'] = re.compile('(?<!\w)%s(?!\w)' %
+                                                     match_class.group(1).replace('-', '\\-').replace(':', '\\:'))
                     for item in match_attr:
-                        kargs['_'+item.group(1)]=item.group(2)
-                    return self.elements(*args,**kargs)
+                        kargs['_' + item.group(1)] = item.group(2)
+                    return self.elements(*args, **kargs)
         # make a copy of the components
         matches = []
         # check if the component has an attribute with the same
         # value as provided
         check = True
-        tag = getattr(self,'tag').replace('/', '')
+        tag = getattr(self, 'tag').replace('/', '')
         if args and tag not in args:
             check = False
         for (key, value) in kargs.iteritems():
@@ -1076,6 +1094,7 @@ class DIV(XmlComponent):
         find_text = replace is not False and kargs.get('find_text', False)
         is_regex = not isinstance(find_text, (str, int, bool))
         find_components = not (check and first_only)
+
         def replace_component(i):
             if replace is None:
                 del self[i]
@@ -1087,7 +1106,7 @@ class DIV(XmlComponent):
         if find_text or find_components:
             for i, c in enumerate(self.components):
                 if check and find_text and isinstance(c, str) and \
-                   ((is_regex and find_text.search(c)) or (str(find_text) in c)):
+                        ((is_regex and find_text.search(c)) or (str(find_text) in c)):
                     replace_component(i)
                 if find_components and isinstance(c, XmlComponent):
                     child_matches = c.elements(*args, **kargs)
@@ -1113,7 +1132,7 @@ class DIV(XmlComponent):
             return None
         return elements[0]
 
-    def siblings(self,*args,**kargs):
+    def siblings(self, *args, **kargs):
         """
         find all sibling components that match the supplied argument list
         and attribute dictionary, or None if nothing could be found
@@ -1126,7 +1145,7 @@ class DIV(XmlComponent):
         for c in sibs:
             try:
                 check = True
-                tag = getattr(c,'tag').replace("/","")
+                tag = getattr(c, 'tag').replace("/", "")
                 if args and tag not in args:
                         check = False
                 for (key, value) in kargs.iteritems():
@@ -1134,12 +1153,13 @@ class DIV(XmlComponent):
                             check = False
                 if check:
                     matches.append(c)
-                    if first_only: break
+                    if first_only:
+                        break
             except:
                 pass
         return matches
 
-    def sibling(self,*args,**kargs):
+    def sibling(self, *args, **kargs):
         """
         find the first sibling component that match the supplied argument list
         and attribute dictionary, or None if nothing could be found
@@ -1150,19 +1170,23 @@ class DIV(XmlComponent):
             return None
         return sibs[0]
 
+
 class CAT(DIV):
 
     tag = ''
 
+
 def TAG_unpickler(data):
     return cPickle.loads(data)
 
+
 def TAG_pickler(data):
     d = DIV()
     d.__dict__ = data.__dict__
     marshal_dump = cPickle.dumps(d)
     return (TAG_unpickler, (marshal_dump,))
 
+
 class __TAG__(XmlComponent):
 
     """
@@ -1179,14 +1203,15 @@ class __TAG__(XmlComponent):
     def __getattr__(self, name):
         if name[-1:] == '_':
             name = name[:-1] + '/'
-        if isinstance(name,unicode):
+        if isinstance(name, unicode):
             name = name.encode('utf-8')
+
         class __tag__(DIV):
             tag = name
         copy_reg.pickle(__tag__, TAG_pickler, TAG_unpickler)
         return lambda *a, **b: __tag__(*a, **b)
 
-    def __call__(self,html):
+    def __call__(self, html):
         return web2pyHTMLParser(decoder.decoder(html)).tree
 
 TAG = __TAG__()
@@ -1238,6 +1263,7 @@ class HTML(DIV):
         (fa, co) = self._xml()
         return '%s<%s%s>%s</%s>' % (doctype, self.tag, fa, co, self.tag)
 
+
 class XHTML(DIV):
     """
     This is XHTML version of the HTML helper.
@@ -1297,6 +1323,7 @@ class HEAD(DIV):
 
     tag = 'head'
 
+
 class TITLE(DIV):
 
     tag = 'title'
@@ -1442,21 +1469,21 @@ class A(DIV):
         else:
             d = ''
         if self['component']:
-            self['_onclick']="web2py_component('%s','%s');%sreturn false;" % \
-                (self['component'],self['target'] or '',d)
+            self['_onclick'] = "web2py_component('%s','%s');%sreturn false;" % \
+                (self['component'], self['target'] or '', d)
             self['_href'] = self['_href'] or '#null'
         elif self['callback']:
-            returnfalse="var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();"
+            returnfalse = "var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();"
             if d:
-                self['_onclick']="if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};%s" % \
-                    (self['callback'],self['target'] or '',d, returnfalse)
+                self['_onclick'] = "if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};%s" % \
+                    (self['callback'], self['target'] or '', d, returnfalse)
             else:
-                self['_onclick']="ajax('%s',[],'%s');%sreturn false" % \
-                    (self['callback'],self['target'] or '',d)
+                self['_onclick'] = "ajax('%s',[],'%s');%sreturn false" % \
+                    (self['callback'], self['target'] or '', d)
             self['_href'] = self['_href'] or '#null'
         elif self['cid']:
-            self['_onclick']='web2py_component("%s","%s");%sreturn false;' % \
-                (self['_href'],self['cid'],d)
+            self['_onclick'] = 'web2py_component("%s","%s");%sreturn false;' % \
+                (self['_href'], self['cid'], d)
         return DIV.xml(self)
 
 
@@ -1535,7 +1562,7 @@ class CODE(DIV):
             attributes=self.attributes,
             highlight_line=highlight_line,
             context_lines=context_lines,
-            )
+        )
 
 
 class LABEL(DIV):
@@ -1592,6 +1619,7 @@ class TR(DIV):
     def _fixup(self):
         self._wrap_components((TD, TH), TD)
 
+
 class THEAD(DIV):
 
     tag = 'thead'
@@ -1641,10 +1669,12 @@ class TABLE(DIV):
     def _fixup(self):
         self._wrap_components((TR, TBODY, THEAD, TFOOT, COL, COLGROUP), TR)
 
+
 class I(DIV):
 
     tag = 'i'
 
+
 class IFRAME(DIV):
 
     tag = 'iframe'
@@ -1739,7 +1769,7 @@ class INPUT(DIV):
                 value = []
             elif value is True:
                 value = [_value]
-            elif not isinstance(value,(list,tuple)):
+            elif not isinstance(value, (list, tuple)):
                 value = str(value).split('|')
             self['_checked'] = _value in value and 'checked' or None
         elif t == 'radio':
@@ -1750,7 +1780,7 @@ class INPUT(DIV):
         elif not t == 'submit':
             if value is None:
                 self['value'] = _value
-            elif not isinstance(value,list):
+            elif not isinstance(value, list):
                 self['_value'] = value
 
     def xml(self):
@@ -1758,7 +1788,8 @@ class INPUT(DIV):
         if name and hasattr(self, 'errors') \
                 and self.errors.get(name, None) \
                 and self['hideerror'] != True:
-            self['_class'] = (self['_class'] and self['_class']+' ' or '')+'invalidinput'
+            self['_class'] = (self['_class'] and self['_class']
+                              + ' ' or '') + 'invalidinput'
             return DIV.xml(self) + DIV(
                 DIV(
                     self.errors[name], _class='error',
@@ -1808,6 +1839,7 @@ class OBJECT(DIV):
 
     tag = 'object'
 
+
 class OPTGROUP(DIV):
 
     tag = 'optgroup'
@@ -1857,17 +1889,17 @@ class SELECT(INPUT):
         value = self['value']
         if not value is None:
             if not self['_multiple']:
-                for c in options: # my patch
-                    if value and str(c['_value'])==str(value):
+                for c in options:  # my patch
+                    if value and str(c['_value']) == str(value):
                         c['_selected'] = 'selected'
                     else:
                         c['_selected'] = None
             else:
-                if isinstance(value,(list,tuple)):
+                if isinstance(value, (list, tuple)):
                     values = [str(item) for item in value]
                 else:
                     values = [str(value)]
-                for c in options: # my patch
+                for c in options:  # my patch
                     if value and str(c['_value']) in values:
                         c['_selected'] = 'selected'
                     else:
@@ -1908,11 +1940,11 @@ class FORM(DIV):
     tag = 'form'
 
     def __init__(self, *components, **attributes):
-        DIV.__init__(self, *components,  **attributes)
+        DIV.__init__(self, *components, **attributes)
         self.vars = Storage()
         self.errors = Storage()
         self.latest = Storage()
-        self.accepted = None # none for not submitted
+        self.accepted = None  # none for not submitted
 
     def assert_status(self, status, request_vars):
         return status
@@ -1926,12 +1958,12 @@ class FORM(DIV):
         onvalidation=None,
         hideerror=False,
         **kwargs
-        ):
+    ):
         """
         kwargs is not used but allows to specify the same interface for FROM and SQLFORM
         """
         if request_vars.__class__.__name__ == 'Request':
-            request_vars=request_vars.post_vars
+            request_vars = request_vars.post_vars
         self.errors.clear()
         self.request_vars = Storage()
         self.request_vars.update(request_vars)
@@ -1954,10 +1986,10 @@ class FORM(DIV):
             status = False
         if status and session:
             # check if editing a record that has been modified by the server
-            if hasattr(self,'record_hash') and self.record_hash != formkey:
+            if hasattr(self, 'record_hash') and self.record_hash != formkey:
                 status = False
                 self.record_changed = changed = True
-        status = self._traverse(status,hideerror)
+        status = self._traverse(status, hideerror)
         status = self.assert_status(status, request_vars)
         if onvalidation:
             if isinstance(onvalidation, dict):
@@ -1971,7 +2003,7 @@ class FORM(DIV):
                     status = len(self.errors) == 0
                 if changed:
                     if onchange and self.record_changed and \
-                        self.detect_record_change:
+                            self.detect_record_change:
                         onchange(self)
             elif status:
                 if isinstance(onvalidation, (list, tuple)):
@@ -1981,13 +2013,13 @@ class FORM(DIV):
         if self.errors:
             status = False
         if not session is None:
-            if hasattr(self,'record_hash'):
+            if hasattr(self, 'record_hash'):
                 formkey = self.record_hash
             else:
                 formkey = web2py_uuid()
             self.formkey = session['_formkey[%s]' % formname] = formkey
         if status and not keepvalues:
-            self._traverse(False,hideerror)
+            self._traverse(False, hideerror)
         self.accepted = status
         return status
 
@@ -2001,7 +2033,7 @@ class FORM(DIV):
 
     def hidden_fields(self):
         c = []
-        attr = self.attributes.get('hidden',{})
+        attr = self.attributes.get('hidden', {})
         if 'hidden' in self.attributes:
             c = [INPUT(_type='hidden', _name=key, _value=value)
                  for (key, value) in attr.iteritems()]
@@ -2020,7 +2052,7 @@ class FORM(DIV):
             newform.append(hidden_fields)
         return DIV.xml(newform)
 
-    def validate(self,**kwargs):
+    def validate(self, **kwargs):
         """
         This function validates the form,
         you can use it instead of directly form.accepts.
@@ -2052,23 +2084,25 @@ class FORM(DIV):
         any other kwargs will be passed for form.accepts(...)
         """
         from gluon import current, redirect
-        kwargs['request_vars'] = kwargs.get('request_vars',current.request.post_vars)
-        kwargs['session'] = kwargs.get('session',current.session)
-        kwargs['dbio'] = kwargs.get('dbio',False) # necessary for SQLHTML forms
+        kwargs['request_vars'] = kwargs.get(
+            'request_vars', current.request.post_vars)
+        kwargs['session'] = kwargs.get('session', current.session)
+        kwargs['dbio'] = kwargs.get('dbio', False)
+                                    # necessary for SQLHTML forms
 
-        onsuccess = kwargs.get('onsuccess','flash')
-        onfailure = kwargs.get('onfailure','flash')
+        onsuccess = kwargs.get('onsuccess', 'flash')
+        onfailure = kwargs.get('onfailure', 'flash')
         onchange = kwargs.get('onchange', 'flash')
         message_onsuccess = kwargs.get('message_onsuccess',
                                        current.T("Success!"))
         message_onfailure = kwargs.get('message_onfailure',
                                        current.T("Errors in form, please check it out."))
         message_onchange = kwargs.get('message_onchange',
-                                       current.T("Form consecutive submissions not allowed. " +
-                                                 "Try re-submitting or refreshing the form page."))
-        next = kwargs.get('next',None)
-        for key in ('message_onsuccess','message_onfailure','onsuccess',
-                    'onfailure','next', 'message_onchange', 'onchange'):
+                                      current.T("Form consecutive submissions not allowed. " +
+                                                "Try re-submitting or refreshing the form page."))
+        next = kwargs.get('next', None)
+        for key in ('message_onsuccess', 'message_onfailure', 'onsuccess',
+                    'onfailure', 'next', 'message_onchange', 'onchange'):
             if key in kwargs:
                 del kwargs[key]
 
@@ -2082,7 +2116,7 @@ class FORM(DIV):
                 onsuccess(self)
             if next:
                 if self.vars:
-                    for key,value in self.vars.iteritems():
+                    for key, value in self.vars.iteritems():
                         next = next.replace('[%s]' % key,
                                             urllib.quote(str(value)))
                     if not next.startswith('/'):
@@ -2131,36 +2165,38 @@ class FORM(DIV):
         def action():
             return dict(form=SQLFORM(db.table).process(onsuccess=my_callback)
         """
-        kwargs['dbio'] = kwargs.get('dbio',True) # necessary for SQLHTML forms
+        kwargs['dbio'] = kwargs.get('dbio', True)
+                                    # necessary for SQLHTML forms
         self.validate(**kwargs)
         return self
 
     REDIRECT_JS = "window.location='%s';return false"
 
-    def add_button(self,value,url,_class=None):
+    def add_button(self, value, url, _class=None):
         submit = self.element('input[type=submit]')
         submit.parent.append(
-            INPUT(_type="button",_value=value,_class=_class,
+            INPUT(_type="button", _value=value, _class=_class,
                   _onclick=self.REDIRECT_JS % url))
 
-
-
     @staticmethod
-    def confirm(text='OK',buttons=None,hidden=None):
-        if not buttons: buttons = {}
-        if not hidden: hidden={}
+    def confirm(text='OK', buttons=None, hidden=None):
+        if not buttons:
+            buttons = {}
+        if not hidden:
+            hidden = {}
         inputs = [INPUT(_type='button',
                         _value=name,
-                        _onclick=FORM.REDIRECT_JS % link) \
-                      for name,link in buttons.iteritems()]
+                        _onclick=FORM.REDIRECT_JS % link)
+                  for name, link in buttons.iteritems()]
         inputs += [INPUT(_type='hidden',
                          _name=name,
                          _value=value)
-                   for name,value in hidden.iteritems()]
-        form = FORM(INPUT(_type='submit',_value=text),*inputs)
+                   for name, value in hidden.iteritems()]
+        form = FORM(INPUT(_type='submit', _value=text), *inputs)
         form.process()
         return form
 
+
 class BEAUTIFY(DIV):
 
     """
@@ -2180,46 +2216,48 @@ class BEAUTIFY(DIV):
 
     @staticmethod
     def no_underscore(key):
-        if key[:1]=='_':
+        if key[:1] == '_':
             return None
         return key
 
     def __init__(self, component, **attributes):
         self.components = [component]
         self.attributes = attributes
-        sorter = attributes.get('sorted',sorted)
-        keyfilter = attributes.get('keyfilter',BEAUTIFY.no_underscore)
+        sorter = attributes.get('sorted', sorted)
+        keyfilter = attributes.get('keyfilter', BEAUTIFY.no_underscore)
         components = []
         attributes = copy.copy(self.attributes)
-        level = attributes['level'] = attributes.get('level',6) - 1
+        level = attributes['level'] = attributes.get('level', 6) - 1
         if '_class' in attributes:
             attributes['_class'] += 'i'
         if level == 0:
             return
         for c in self.components:
-            if hasattr(c,'value') and not callable(c.value):
+            if hasattr(c, 'value') and not callable(c.value):
                 if c.value:
                     components.append(c.value)
-            if hasattr(c,'xml') and callable(c.xml):
+            if hasattr(c, 'xml') and callable(c.xml):
                 components.append(c)
                 continue
-            elif hasattr(c,'keys') and callable(c.keys):
+            elif hasattr(c, 'keys') and callable(c.keys):
                 rows = []
                 try:
                     keys = (sorter and sorter(c)) or c
                     for key in keys:
-                        if isinstance(key,(str,unicode)) and keyfilter:
+                        if isinstance(key, (str, unicode)) and keyfilter:
                             filtered_key = keyfilter(key)
                         else:
                             filtered_key = str(key)
                         if filtered_key is None:
                             continue
                         value = c[key]
-                        if type(value) == types.LambdaType:
+                        if isinstance(value, types.LambdaType):
                             continue
-                        rows.append(TR(TD(filtered_key, _style='font-weight:bold;vertical-align:top'),
-                                       TD(':',_valign='top'),
-                                       TD(BEAUTIFY(value, **attributes))))
+                        rows.append(
+                            TR(
+                                TD(filtered_key, _style='font-weight:bold;vertical-align:top'),
+                                TD(':', _valign='top'),
+                                TD(BEAUTIFY(value, **attributes))))
                     components.append(TABLE(*rows, **attributes))
                     continue
                 except:
@@ -2277,23 +2315,23 @@ class MENU(DIV):
             ul = UL(_class=self['ul_class'])
         for item in data:
             (name, active, link) = item[:3]
-            if isinstance(link,DIV):
+            if isinstance(link, DIV):
                 li = LI(link)
-            elif 'no_link_url' in self.attributes and self['no_link_url']==link:
+            elif 'no_link_url' in self.attributes and self['no_link_url'] == link:
                 li = LI(DIV(name))
             elif link:
                 li = LI(A(name, _href=link))
-            elif not link and isinstance(name,A):
+            elif not link and isinstance(name, A):
                 li = LI(name)
             else:
                 li = LI(A(name, _href='#',
                           _onclick='javascript:void(0);return false;'))
             if len(item) > 3 and item[3]:
                 li['_class'] = self['li_class']
-                li.append(self.serialize(item[3], level+1))
-            if active or ('active_url' in self.attributes and self['active_url']==link):
+                li.append(self.serialize(item[3], level + 1))
+            if active or ('active_url' in self.attributes and self['active_url'] == link):
                 if li['_class']:
-                    li['_class'] = li['_class']+' '+self['li_active']
+                    li['_class'] = li['_class'] + ' ' + self['li_active']
                 else:
                     li['_class'] = self['li_active']
             if len(item) <= 4 or item[4] == True:
@@ -2307,9 +2345,9 @@ class MENU(DIV):
             if len(item) <= 4 or item[4] == True:
                 select.append(OPTION(CAT(prefix, item[0]),
                                      _value=item[2], _selected=item[1]))
-                if len(item)>3 and len(item[3]):
+                if len(item) > 3 and len(item[3]):
                     self.serialize_mobile(
-                        item[3], select, prefix = CAT(prefix, item[0], '/'))
+                        item[3], select, prefix=CAT(prefix, item[0], '/'))
         select['_onchange'] = 'window.location=this.value'
         return select
 
@@ -2321,11 +2359,11 @@ class MENU(DIV):
 
 
 def embed64(
-    filename = None,
-    file = None,
-    data = None,
-    extension = 'image/gif',
-    ):
+    filename=None,
+    file=None,
+    data=None,
+    extension='image/gif',
+):
     """
     helper to encode the provided (binary) data into base64.
 
@@ -2398,87 +2436,124 @@ class web2pyHTMLParser(HTMLParser):
     >>> str(tree)
     'hello<div a="b" c="5">world</div>'
     """
-    def __init__(self,text,closed=('input','link')):
+    def __init__(self, text, closed=('input', 'link')):
         HTMLParser.__init__(self)
         self.tree = self.parent = TAG['']()
         self.closed = closed
-        self.tags = [x for x in __all__ if isinstance(eval(x),DIV)]
+        self.tags = [x for x in __all__ if isinstance(eval(x), DIV)]
         self.last = None
         self.feed(text)
+
     def handle_starttag(self, tagname, attrs):
         if tagname.upper() in self.tags:
-            tag=eval(tagname.upper())
+            tag = eval(tagname.upper())
         else:
-            if tagname in self.closed: tagname+='/'
+            if tagname in self.closed:
+                tagname += '/'
             tag = TAG[tagname]()
-        for key,value in attrs: tag['_'+key]=value
+        for key, value in attrs:
+            tag['_' + key] = value
         tag.parent = self.parent
         self.parent.append(tag)
         if not tag.tag.endswith('/'):
-            self.parent=tag
+            self.parent = tag
         else:
             self.last = tag.tag[:-1]
-    def handle_data(self,data):
-        if not isinstance(data,unicode):
+
+    def handle_data(self, data):
+        if not isinstance(data, unicode):
             try:
                 data = data.decode('utf8')
             except:
                 data = data.decode('latin1')
-        self.parent.append(data.encode('utf8','xmlcharref'))
-    def handle_charref(self,name):
+        self.parent.append(data.encode('utf8', 'xmlcharref'))
+
+    def handle_charref(self, name):
         if name.startswith('x'):
             self.parent.append(unichr(int(name[1:], 16)).encode('utf8'))
         else:
             self.parent.append(unichr(int(name)).encode('utf8'))
-    def handle_entityref(self,name):
+
+    def handle_entityref(self, name):
         self.parent.append(entitydefs[name])
+
     def handle_endtag(self, tagname):
         # this deals with unbalanced tags
-        if tagname==self.last:
+        if tagname == self.last:
             return
         while True:
             try:
-                parent_tagname=self.parent.tag
+                parent_tagname = self.parent.tag
                 self.parent = self.parent.parent
             except:
-                raise RuntimeError, "unable to balance tag %s" % tagname
-            if parent_tagname[:len(tagname)]==tagname: break
+                raise RuntimeError("unable to balance tag %s" % tagname)
+            if parent_tagname[:len(tagname)] == tagname: break
 
-def markdown_serializer(text,tag=None,attr=None):
+
+def markdown_serializer(text, tag=None, attr=None):
     attr = attr or {}
-    if tag is None: return re.sub('\s+',' ',text)
-    if tag=='br': return '\n\n'
-    if tag=='h1': return '#'+text+'\n\n'
-    if tag=='h2': return '#'*2+text+'\n\n'
-    if tag=='h3': return '#'*3+text+'\n\n'
-    if tag=='h4': return '#'*4+text+'\n\n'
-    if tag=='p': return text+'\n\n'
-    if tag=='b' or tag=='strong': return '**%s**' % text
-    if tag=='em' or tag=='i': return '*%s*' % text
-    if tag=='tt' or tag=='code': return '`%s`' % text
-    if tag=='a': return '[%s](%s)' % (text,attr.get('_href',''))
-    if tag=='img': return '![%s](%s)' % (attr.get('_alt',''),attr.get('_src',''))
+    if tag is None:
+        return re.sub('\s+', ' ', text)
+    if tag == 'br':
+        return '\n\n'
+    if tag == 'h1':
+        return '#' + text + '\n\n'
+    if tag == 'h2':
+        return '#' * 2 + text + '\n\n'
+    if tag == 'h3':
+        return '#' * 3 + text + '\n\n'
+    if tag == 'h4':
+        return '#' * 4 + text + '\n\n'
+    if tag == 'p':
+        return text + '\n\n'
+    if tag == 'b' or tag == 'strong':
+        return '**%s**' % text
+    if tag == 'em' or tag == 'i':
+        return '*%s*' % text
+    if tag == 'tt' or tag == 'code':
+        return '`%s`' % text
+    if tag == 'a':
+        return '[%s](%s)' % (text, attr.get('_href', ''))
+    if tag == 'img':
+        return '![%s](%s)' % (attr.get('_alt', ''), attr.get('_src', ''))
     return text
 
-def markmin_serializer(text,tag=None,attr=None):
+
+def markmin_serializer(text, tag=None, attr=None):
     attr = attr or {}
     # if tag is None: return re.sub('\s+',' ',text)
-    if tag=='br': return '\n\n'
-    if tag=='h1': return '# '+text+'\n\n'
-    if tag=='h2': return '#'*2+' '+text+'\n\n'
-    if tag=='h3': return '#'*3+' '+text+'\n\n'
-    if tag=='h4': return '#'*4+' '+text+'\n\n'
-    if tag=='p': return text+'\n\n'
-    if tag=='li': return '\n- '+text.replace('\n',' ')
-    if tag=='tr': return text[3:].replace('\n',' ')+'\n'
-    if tag in ['table','blockquote']: return '\n-----\n'+text+'\n------\n'
-    if tag in ['td','th']: return ' | '+text
-    if tag in ['b','strong','label']: return '**%s**' % text
-    if tag in ['em','i']: return "''%s''" % text
-    if tag in ['tt']: return '``%s``' % text.strip()
-    if tag in ['code']: return '``\n%s``' % text
-    if tag=='a': return '[[%s %s]]' % (text,attr.get('_href',''))
-    if tag=='img': return '[[%s %s left]]' % (attr.get('_alt','no title'),attr.get('_src',''))
+    if tag == 'br':
+        return '\n\n'
+    if tag == 'h1':
+        return '# ' + text + '\n\n'
+    if tag == 'h2':
+        return '#' * 2 + ' ' + text + '\n\n'
+    if tag == 'h3':
+        return '#' * 3 + ' ' + text + '\n\n'
+    if tag == 'h4':
+        return '#' * 4 + ' ' + text + '\n\n'
+    if tag == 'p':
+        return text + '\n\n'
+    if tag == 'li':
+        return '\n- ' + text.replace('\n', ' ')
+    if tag == 'tr':
+        return text[3:].replace('\n', ' ') + '\n'
+    if tag in ['table', 'blockquote']:
+        return '\n-----\n' + text + '\n------\n'
+    if tag in ['td', 'th']:
+        return ' | ' + text
+    if tag in ['b', 'strong', 'label']:
+        return '**%s**' % text
+    if tag in ['em', 'i']:
+        return "''%s''" % text
+    if tag in ['tt']:
+        return '``%s``' % text.strip()
+    if tag in ['code']:
+        return '``\n%s``' % text
+    if tag == 'a':
+        return '[[%s %s]]' % (text, attr.get('_href', ''))
+    if tag == 'img':
+        return '[[%s %s left]]' % (attr.get('_alt', 'no title'), attr.get('_src', ''))
     return text
 
 
@@ -2496,7 +2571,7 @@ class MARKMIN(XmlComponent):
         self.extra = extra or {}
         self.allowed = allowed or {}
         self.sep = sep
-        self.url = URL if url==True else url
+        self.url = URL if url == True else url
         self.environment = environment
         self.latex = latex
         self.autolinks = autolinks
@@ -2509,16 +2584,16 @@ class MARKMIN(XmlComponent):
         calls the gluon.contrib.markmin render function to convert the wiki syntax
         """
         from contrib.markmin.markmin2html import render
-        return render(self.text,extra=self.extra,
-                      allowed=self.allowed,sep=self.sep,latex=self.latex,
+        return render(self.text, extra=self.extra,
+                      allowed=self.allowed, sep=self.sep, latex=self.latex,
                       URL=self.url, environment=self.environment,
-                      autolinks=self.autolinks,protolinks=self.protolinks,
-                      class_prefix=self.class_prefix,id_prefix=self.id_prefix)
+                      autolinks=self.autolinks, protolinks=self.protolinks,
+                      class_prefix=self.class_prefix, id_prefix=self.id_prefix)
 
     def __str__(self):
         return self.xml()
 
-    def flatten(self,render=None):
+    def flatten(self, render=None):
         """
         return the text stored by the MARKMIN object rendered by the render function
         """
diff --git a/gluon/http.py b/gluon/http.py
index 4dd08333..831c04d6 100644
--- a/gluon/http.py
+++ b/gluon/http.py
@@ -49,7 +49,7 @@ defined_status = {
     503: 'SERVICE UNAVAILABLE',
     504: 'GATEWAY TIMEOUT',
     505: 'HTTP VERSION NOT SUPPORTED',
-    }
+}
 
 # If web2py is executed with python2.4 we need
 # to use Exception instead of BaseException
@@ -61,6 +61,7 @@ except NameError:
 
 regex_status = re.compile('^\d{3} \w+$')
 
+
 class HTTP(BaseException):
 
     def __init__(
@@ -69,14 +70,14 @@ class HTTP(BaseException):
         body='',
         cookies=None,
         **headers
-        ):
+    ):
         self.status = status
         self.body = body
         self.headers = headers
         self.cookies2headers(cookies)
 
-    def cookies2headers(self,cookies):
-        if cookies and len(cookies)>0:
+    def cookies2headers(self, cookies):
+        if cookies and len(cookies) > 0:
             self.headers['Set-Cookie'] = [
                 str(cookie)[11:] for cookie in cookies.values()]
 
@@ -90,15 +91,15 @@ class HTTP(BaseException):
             status = str(status)
             if not regex_status.match(status):
                 status = '500 %s' % (defined_status[500])
-        headers.setdefault('Content-Type','text/html; charset=UTF-8')
+        headers.setdefault('Content-Type', 'text/html; charset=UTF-8')
         body = self.body
         if status[:1] == '4':
             if not body:
                 body = status
             if isinstance(body, str):
-                if len(body)<512 and \
+                if len(body) < 512 and \
                         headers['Content-Type'].startswith('text/html'):
-                    body += '<!-- %s //-->' % ('x'*512) ### trick IE
+                    body += '<!-- %s //-->' % ('x' * 512)  # trick IE
                 headers['Content-Length'] = len(body)
         rheaders = []
         for k, v in headers.iteritems():
@@ -107,9 +108,9 @@ class HTTP(BaseException):
             elif not v is None:
                 rheaders.append((k, str(v)))
         responder(status, rheaders)
-        if env.get('request_method','')=='HEAD':
+        if env.get('request_method', '') == 'HEAD':
             return ['']
-        elif isinstance(body,str):
+        elif isinstance(body, str):
             return [body]
         elif hasattr(body, '__iter__'):
             return body
diff --git a/gluon/import_all.py b/gluon/import_all.py
index 35d09744..4f2ab8e1 100644
--- a/gluon/import_all.py
+++ b/gluon/import_all.py
@@ -69,10 +69,10 @@ base_modules = ['aifc', 'anydbm', 'array', 'asynchat', 'asyncore', 'atexit',
 contributed_modules = []
 for root, dirs, files in os.walk('gluon'):
     for candidate in ['.'.join(
-      os.path.join(root, os.path.splitext(name)[0]).split(os.sep))
-      for name in files if name.endswith('.py')
-        and root.split(os.sep) != ['gluon', 'tests']
-      ]:
+                      os.path.join(root, os.path.splitext(name)[0]).split(os.sep))
+                      for name in files if name.endswith('.py')
+                      and root.split(os.sep) != ['gluon', 'tests']
+                      ]:
         contributed_modules.append(candidate)
 
 # Python base version
@@ -86,7 +86,7 @@ alert_dependency = ['hashlib', 'uuid']
 #
 # List of modules deprecated in Python 2.6 or 2.7 that are in the above set
 py26_deprecated = ['mhlib', 'multifile', 'mimify', 'sets', 'MimeWriter']
-py27_deprecated = [] # ['optparse'] but we need it for now
+py27_deprecated = []  # ['optparse'] but we need it for now
 
 if python_version >= '2.6':
     base_modules += ['json', 'multiprocessing']
@@ -99,11 +99,11 @@ if python_version >= '2.7':
 # Now iterate in the base_modules, trying to do the import
 for module in base_modules + contributed_modules:
     try:
-         __import__(module, globals(), locals(), [])
+        __import__(module, globals(), locals(), [])
     except:
         # Raise an exception if the current module is a dependency
         if module in alert_dependency:
             msg = "Missing dependency: %(module)s\n" % locals()
             msg += "Try the following command: "
             msg += "easy_install-%(python_version)s -U %(module)s" % locals()
-            raise ImportError, msg
+            raise ImportError(msg)
diff --git a/gluon/languages.py b/gluon/languages.py
index 9a7617a7..7f25c5d8 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -48,16 +48,16 @@ DEFAULT_GET_PLURAL_ID = lambda n: 0
 # word is unchangeable
 DEFAULT_CONSTRUCT_PLURAL_FORM = lambda word, plural_id: word
 
-NUMBERS = (int,long,float)
+NUMBERS = (int, long, float)
 
 # pattern to find T(blah blah blah) expressions
 PY_STRING_LITERAL_RE = r'(?<=[^\w]T\()(?P<name>'\
-     + r"[uU]?[rR]?(?:'''(?:[^']|'{1,2}(?!'))*''')|"\
-     + r"(?:'(?:[^'\\]|\\.)*')|" + r'(?:"""(?:[^"]|"{1,2}(?!"))*""")|'\
-     + r'(?:"(?:[^"\\]|\\.)*"))'
+    + r"[uU]?[rR]?(?:'''(?:[^']|'{1,2}(?!'))*''')|"\
+    + r"(?:'(?:[^'\\]|\\.)*')|" + r'(?:"""(?:[^"]|"{1,2}(?!"))*""")|'\
+    + r'(?:"(?:[^"\\]|\\.)*"))'
 
 regex_translate = re.compile(PY_STRING_LITERAL_RE, re.DOTALL)
-regex_param=re.compile(r'{(?P<s>.+?)}')
+regex_param = re.compile(r'{(?P<s>.+?)}')
 
 # pattern for a valid accept_language
 regex_language = \
@@ -66,33 +66,43 @@ regex_langfile = re.compile('^[a-z]{2}(-[a-z]{2})?\.py$')
 regex_backslash = re.compile(r"\\([\\{}%])")
 regex_plural = re.compile('%({.+?})')
 regex_plural_dict = re.compile('^{(?P<w>[^()[\]][^()[\]]*?)\((?P<n>[^()\[\]]+)\)}$')  # %%{word(varname or number)}
-regex_plural_tuple = re.compile('^{(?P<w>[^[\]()]+)(?:\[(?P<i>\d+)\])?}$') # %%{word[index]} or %%{word}
+regex_plural_tuple = re.compile(
+    '^{(?P<w>[^[\]()]+)(?:\[(?P<i>\d+)\])?}$')  # %%{word[index]} or %%{word}
 regex_plural_file = re.compile('^plural-[a-zA-Z]{2}(-[a-zA-Z]{2})?\.py$')
 
+
 def safe_eval(text):
     if text.strip():
         try:
             import ast
             return ast.literal_eval(text)
         except ImportError:
-            return eval(text,{},{})
+            return eval(text, {}, {})
     return None
 
 # used as default filter in translator.M()
+
+
 def markmin(s):
     def markmin_aux(m):
         return '{%s}' % markmin_escape(m.group('s'))
-    return render(regex_param.sub(markmin_aux,s),
+    return render(regex_param.sub(markmin_aux, s),
                   sep='br', autolinks=None, id_prefix='')
 
 # UTF8 helper functions
+
+
 def upper_fun(s):
-    return unicode(s,'utf-8').upper().encode('utf-8')
+    return unicode(s, 'utf-8').upper().encode('utf-8')
+
+
 def title_fun(s):
-    return unicode(s,'utf-8').title().encode('utf-8')
+    return unicode(s, 'utf-8').title().encode('utf-8')
+
+
 def cap_fun(s):
-    return unicode(s,'utf-8').capitalize().encode('utf-8')
-ttab_in  = maketrans("\\%{}", '\x1c\x1d\x1e\x1f')
+    return unicode(s, 'utf-8').capitalize().encode('utf-8')
+ttab_in = maketrans("\\%{}", '\x1c\x1d\x1e\x1f')
 ttab_out = maketrans('\x1c\x1d\x1e\x1f', "\\%{}")
 
 # cache of translated messages:
@@ -105,13 +115,14 @@ ttab_out = maketrans('\x1c\x1d\x1e\x1f', "\\%{}")
 #  ...
 # }
 
-global_language_cache={}
+global_language_cache = {}
+
 
 def get_from_cache(cache, val, fun):
     lang_dict, lock = cache
     lock.acquire()
     try:
-        result = lang_dict.get(val);
+        result = lang_dict.get(val)
     finally:
         lock.release()
     if result:
@@ -123,16 +134,18 @@ def get_from_cache(cache, val, fun):
         lock.release()
     return result
 
+
 def clear_cache(filename):
     cache = global_language_cache.setdefault(
         filename, ({}, allocate_lock()))
     lang_dict, lock = cache
     lock.acquire()
     try:
-        lang_dict.clear();
+        lang_dict.clear()
     finally:
         lock.release()
 
+
 def read_dict_aux(filename):
     lang_text = portalocker.read_locked(filename).replace('\r\n', '\n')
     clear_cache(filename)
@@ -141,13 +154,14 @@ def read_dict_aux(filename):
     except Exception, e:
         status = 'Syntax error in %s (%s)' % (filename, e)
         logging.error(status)
-        return {'__corrupted__':status}
+        return {'__corrupted__': status}
+
 
 def read_dict(filename):
     """ return dictionary with translation messages
     """
-    return getcfs('lang:'+filename, filename,
-                lambda: read_dict_aux(filename))
+    return getcfs('lang:' + filename, filename,
+                  lambda: read_dict_aux(filename))
 
 
 def read_possible_plural_rules():
@@ -159,17 +173,17 @@ def read_possible_plural_rules():
     try:
         import contrib.plural_rules as package
         for importer, modname, ispkg in pkgutil.iter_modules(package.__path__):
-            if len(modname)==2:
-                module = __import__(package.__name__+'.'+modname,
+            if len(modname) == 2:
+                module = __import__(package.__name__ + '.' + modname,
                                     fromlist=[modname])
                 lang = modname
-                pname = modname+'.py'
-                nplurals = getattr(module,'nplurals', DEFAULT_NPLURALS)
+                pname = modname + '.py'
+                nplurals = getattr(module, 'nplurals', DEFAULT_NPLURALS)
                 get_plural_id = getattr(
-                    module,'get_plural_id',
+                    module, 'get_plural_id',
                     DEFAULT_GET_PLURAL_ID)
                 construct_plural_form = getattr(
-                    module,'construct_plural_form',
+                    module, 'construct_plural_form',
                     DEFAULT_CONSTRUCT_PLURAL_FORM)
                 plurals[lang] = (lang, nplurals, get_plural_id,
                                  construct_plural_form)
@@ -179,6 +193,7 @@ def read_possible_plural_rules():
 
 PLURAL_RULES = read_possible_plural_rules()
 
+
 def read_possible_languages_aux(langdir):
     def get_lang_struct(lang, langcode, langname, langfile_mtime):
         if lang == 'default':
@@ -189,27 +204,28 @@ def read_possible_languages_aux(langdir):
          nplurals,
          get_plural_id,
          construct_plural_form
-        ) = PLURAL_RULES.get(real_lang[:2],('default',
-                                            DEFAULT_NPLURALS,
-                                            DEFAULT_GET_PLURAL_ID,
-                                            DEFAULT_CONSTRUCT_PLURAL_FORM))
+         ) = PLURAL_RULES.get(real_lang[:2], ('default',
+                                              DEFAULT_NPLURALS,
+                                              DEFAULT_GET_PLURAL_ID,
+                                              DEFAULT_CONSTRUCT_PLURAL_FORM))
         if prules_langcode != 'default':
             (pluraldict_fname,
              pluraldict_mtime) = plurals.get(real_lang,
-                                    plurals.get(real_lang[:2],
-                                        ('plural-%s.py'%real_lang,0)))
+                                             plurals.get(real_lang[:2],
+                                                         ('plural-%s.py' % real_lang, 0)))
         else:
             pluraldict_fname = None
             pluraldict_mtime = 0
         return (langcode,        # language code from !langcode!
-                langname,        # language name in national spelling from !langname!
+                langname,
+                # language name in national spelling from !langname!
                 langfile_mtime,  # m_time of language file
-                pluraldict_fname,# name of plural dictionary file or None (when default.py is not exist)
-                pluraldict_mtime,# m_time of plural dictionary file or 0 if file is not exist
-                prules_langcode, # code of plural rules language or 'default'
+                pluraldict_fname,  # name of plural dictionary file or None (when default.py is not exist)
+                pluraldict_mtime,  # m_time of plural dictionary file or 0 if file is not exist
+                prules_langcode,  # code of plural rules language or 'default'
                 nplurals,        # nplurals for current language
                 get_plural_id,   # get_plural_id() for current language
-                construct_plural_form) # construct_plural_form() for current language
+                construct_plural_form)  # construct_plural_form() for current language
 
     plurals = {}
     flist = oslistdir(langdir)
@@ -217,17 +233,17 @@ def read_possible_languages_aux(langdir):
     for pname in flist:
         if regex_plural_file.match(pname):
             plurals[pname[7:-3]] = (pname,
-                ostat(pjoin(langdir,pname)).st_mtime)
+                                    ostat(pjoin(langdir, pname)).st_mtime)
     langs = {}
     # scan languages directory for langfiles:
     for fname in flist:
         if regex_langfile.match(fname) or fname == 'default.py':
-            fname_with_path = pjoin(langdir,fname)
+            fname_with_path = pjoin(langdir, fname)
             d = read_dict(fname_with_path)
             lang = fname[:-3]
             langcode = d.get('!langcode!', lang if lang != 'default'
-                                              else DEFAULT_LANGUAGE)
-            langname = d.get('!langname!',langcode)
+                             else DEFAULT_LANGUAGE)
+            langname = d.get('!langname!', langcode)
             langfile_mtime = ostat(fname_with_path).st_mtime
             langs[lang] = get_lang_struct(lang, langcode,
                                           langname, langfile_mtime)
@@ -240,27 +256,31 @@ def read_possible_languages_aux(langdir):
     deflangcode = deflang[0]
     if deflangcode not in langs:
         # create language from default.py:
-        langs[deflangcode] = deflang[:2]+(0,)+deflang[3:]
+        langs[deflangcode] = deflang[:2] + (0,) + deflang[3:]
 
     return langs
 
+
 def read_possible_languages(appdir):
-    langdir = pjoin(appdir,'languages')
-    return getcfs('langs:'+langdir, langdir,
-                   lambda: read_possible_languages_aux(langdir))
+    langdir = pjoin(appdir, 'languages')
+    return getcfs('langs:' + langdir, langdir,
+                  lambda: read_possible_languages_aux(langdir))
+
 
 def read_plural_dict_aux(filename):
     lang_text = portalocker.read_locked(filename).replace('\r\n', '\n')
     try:
         return eval(lang_text) or {}
     except Exception, e:
-        status='Syntax error in %s (%s)' % (filename, e)
+        status = 'Syntax error in %s (%s)' % (filename, e)
         logging.error(status)
-        return {'__corrupted__':status}
+        return {'__corrupted__': status}
+
 
 def read_plural_dict(filename):
-    return getcfs('plurals:'+filename, filename,
-                      lambda: read_plural_dict_aux(filename))
+    return getcfs('plurals:' + filename, filename,
+                  lambda: read_plural_dict_aux(filename))
+
 
 def write_plural_dict(filename, contents):
     if '__corrupted__' in contents:
@@ -269,8 +289,9 @@ def write_plural_dict(filename, contents):
         fp = portalocker.LockedFile(filename, 'w')
         fp.write('#!/usr/bin/env python\n{\n# "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],\n')
         # coding: utf8\n{\n')
-        for key in sorted(contents,lambda x,y: cmp(unicode(x,'utf-8').lower(), unicode(y,'utf-8').lower())):
-            forms = '['+','.join([repr(Utf8(form)) for form in contents[key]])+']'
+        for key in sorted(contents, lambda x, y: cmp(unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower())):
+            forms = '[' + ','.join([repr(Utf8(form))
+                                   for form in contents[key]]) + ']'
             fp.write('%s: %s,\n' % (repr(Utf8(key)), forms))
         fp.write('}\n')
     except (IOError, OSError):
@@ -291,13 +312,12 @@ def write_dict(filename, contents):
             logging.warning('Unable to write to file %s' % filename)
         return
     fp.write('# coding: utf8\n{\n')
-    for key in sorted(contents,lambda x,y: cmp(unicode(x,'utf-8').lower(), unicode(y,'utf-8').lower())):
+    for key in sorted(contents, lambda x, y: cmp(unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower())):
         fp.write('%s: %s,\n' % (repr(Utf8(key)), repr(Utf8(contents[key]))))
     fp.write('}\n')
     fp.close()
 
 
-
 class lazyT(object):
     """
     never to be called explicitly, returned by
@@ -309,12 +329,12 @@ class lazyT(object):
     def __init__(
         self,
         message,
-        symbols = {},
-        T = None,
-        filter = None,
-        ftag = None,
-        M = False
-        ):
+        symbols={},
+        T=None,
+        filter=None,
+        ftag=None,
+        M=False
+    ):
         if isinstance(message, lazyT):
             self.m = message.m
             self.s = message.s
@@ -354,7 +374,7 @@ class lazyT(object):
     def __mul__(self, other):
         return str(self) * other
 
-    def __cmp__(self,other):
+    def __cmp__(self, other):
         return cmp(str(self), str(other))
 
     def __hash__(self):
@@ -370,7 +390,8 @@ class lazyT(object):
         return str(self)[i:j]
 
     def __iter__(self):
-        for c in str(self): yield c
+        for c in str(self):
+            yield c
 
     def __len__(self):
         return len(str(self))
@@ -388,9 +409,11 @@ class lazyT(object):
         return str(self)
 
     def __mod__(self, symbols):
-        if self.is_copy: return lazyT(self)
+        if self.is_copy:
+            return lazyT(self)
         return lazyT(self.m, symbols, self.T, self.f, self.t, self.M)
 
+
 class translator(object):
     """
     this class is instantiated by gluon.compileapp.build_environment
@@ -459,7 +482,8 @@ class translator(object):
                returns dictionary with all possible languages:
             { langcode(from filename):
                 ( langcode,        # language code from !langcode!
-                  langname,        # language name in national spelling from !langname!
+                  langname,
+                      # language name in national spelling from !langname!
                   langfile_mtime,  # m_time of language file
                   pluraldict_fname,# name of plural dictionary file or None (when default.py is not exist)
                   pluraldict_mtime,# m_time of plural dictionary file or 0 if file is not exist
@@ -470,14 +494,15 @@ class translator(object):
             }
         """
         info = read_possible_languages(self.folder)
-        if lang: info = info.get(lang)
+        if lang:
+            info = info.get(lang)
         return info
 
     def get_possible_languages(self):
         """ get list of all possible languages for current applications """
         return list(set(self.current_languages +
-            [lang for lang in read_possible_languages(self.folder).iterkeys()
-                 if lang != 'default']))
+                        [lang for lang in read_possible_languages(self.folder).iterkeys()
+                         if lang != 'default']))
 
     def set_current_languages(self, *languages):
         """
@@ -486,12 +511,12 @@ class translator(object):
         turn translation off to use default language
         """
         if len(languages) == 1 and isinstance(
-            languages[0], (tuple, list)):
+                languages[0], (tuple, list)):
             languages = languages[0]
         if not languages or languages[0] is None:
             # set default language from default.py/DEFAULT_LANGUAGE
             pl_info = self.get_possible_languages_info('default')
-            if pl_info[2]==0: # langfile_mtime
+            if pl_info[2] == 0:  # langfile_mtime
                 # if languages/default.py is not found
                 self.default_language_file = self.langpath
                 self.default_t = {}
@@ -500,12 +525,11 @@ class translator(object):
                 self.default_language_file = pjoin(self.langpath,
                                                    'default.py')
                 self.default_t = read_dict(self.default_language_file)
-                self.current_languages = [pl_info[0]] # !langcode!
+                self.current_languages = [pl_info[0]]  # !langcode!
         else:
             self.current_languages = list(languages)
         self.force(self.http_accept_language)
 
-
     def plural(self, word, n):
         """ get plural form of word for number *n*
             NOTE: *word" MUST be defined in current language
@@ -529,14 +553,14 @@ class translator(object):
             # etc.
             if id != 0:
                 forms = self.plural_dict.get(word, [])
-                if len(forms)>=id:
+                if len(forms) >= id:
                     # have this plural form:
-                    return forms[id-1]
+                    return forms[id - 1]
                 else:
                     # guessing this plural form
-                    forms += ['']*(self.nplurals-len(forms)-1)
+                    forms += [''] * (self.nplurals - len(forms) - 1)
                     form = self.construct_plural_form(word, id)
-                    forms[id-1] = form
+                    forms[id - 1] = form
                     self.plural_dict[word] = forms
                     if self.is_writable and self.plural_file:
                         write_plural_dict(self.plural_file,
@@ -558,6 +582,7 @@ class translator(object):
         of them matches possible_languages.
         """
         pl_info = read_possible_languages(self.folder)
+
         def set_plural(language):
             """
             initialize plural forms subsystem
@@ -570,7 +595,7 @@ class translator(object):
                  self.nplurals,
                  self.get_plural_id,
                  self.construct_plural_form
-                ) = lang_info[3:]
+                 ) = lang_info[3:]
                 pdict = {}
                 if pname:
                     pname = pjoin(self.langpath, pname)
@@ -586,7 +611,7 @@ class translator(object):
                 self.plural_file = None
                 self.plural_dict = {}
         language = ''
-        if len(languages)==1 and isinstance(languages[0],str):
+        if len(languages) == 1 and isinstance(languages[0], str):
             languages = regex_language.findall(languages[0].lower())
         elif not languages or languages[0] is None:
             languages = []
@@ -594,7 +619,7 @@ class translator(object):
         if languages:
             all_languages = set(lang for lang in pl_info.iterkeys()
                                 if lang != 'default') \
-                                | set(self.current_languages)
+                | set(self.current_languages)
             for lang in languages:
                 # compare "aa-bb" | "aa" from *language* parameter
                 # with strings from langlist using such alghorythm:
@@ -604,20 +629,20 @@ class translator(object):
                     language = lang5
                 else:
                     lang2 = lang[:2]
-                    if len(lang5)>2 and lang2 in all_languages:
+                    if len(lang5) > 2 and lang2 in all_languages:
                         language = lang2
                     else:
                         for l in all_languages:
-                            if l[:2]==lang2:
+                            if l[:2] == lang2:
                                 language = l
                 if language:
                     if language in self.current_languages:
                         break
-                    self.language_file = pjoin(self.langpath, language+'.py')
+                    self.language_file = pjoin(self.langpath, language + '.py')
                     self.t = read_dict(self.language_file)
                     self.cache = global_language_cache.setdefault(
-                                         self.language_file,
-                                         ({},allocate_lock()))
+                        self.language_file,
+                        ({}, allocate_lock()))
                     set_plural(language)
                     self.accepted_language = language
                     return languages
@@ -637,7 +662,7 @@ class translator(object):
         if lazy is None:
             lazy = self.lazy
         if not language:
-            if lazy :
+            if lazy:
                 return lazyT(message, symbols, self)
             else:
                 return self.translate(message, symbols)
@@ -654,18 +679,18 @@ class translator(object):
             s = self.get_t(message, prefix)
             return filter(s) if filter else self.filter(s)
         if filter:
-            prefix = '@'+(ftag or 'userdef')+'\x01'
+            prefix = '@' + (ftag or 'userdef') + '\x01'
         else:
-            prefix = '@'+self.ftag+'\x01'
+            prefix = '@' + self.ftag + '\x01'
         message = get_from_cache(
-            self.cache, prefix+message,
+            self.cache, prefix + message,
             lambda: get_tr(message, prefix, filter))
         if symbols or symbols == 0 or symbols == "":
             if isinstance(symbols, dict):
                 symbols.update(
                     (key, xmlescape(value).translate(ttab_in))
                     for key, value in symbols.iteritems()
-                    if not isinstance(value, NUMBERS) )
+                    if not isinstance(value, NUMBERS))
             else:
                 if not isinstance(symbols, tuple):
                     symbols = (symbols,)
@@ -686,7 +711,7 @@ class translator(object):
             lazy = self.lazy
         if not language:
             if lazy:
-                return lazyT(message, symbols, self, filter, ftag,  True)
+                return lazyT(message, symbols, self, filter, ftag, True)
             else:
                 return self.apply_filter(message, symbols, filter, ftag)
         else:
@@ -714,11 +739,12 @@ class translator(object):
             message = message.encode('utf8')
         if isinstance(prefix, unicode):
             prefix = prefix.encode('utf8')
-        key = prefix+message
+        key = prefix + message
         mt = self.t.get(key, None)
-        if mt is not None: return mt
+        if mt is not None:
+            return mt
         # we did not find a translation
-        if message.find('##')>0 and not '\n' in message:
+        if message.find('##') > 0 and not '\n' in message:
             # remove comments
             message = message.rsplit('##', 1)[0]
         # guess translation same as original
@@ -756,7 +782,7 @@ class translator(object):
                     word, !word, !!word, !!!word, ?word?number, ??number, ?number
                     ?word?word[number], ?word?[number], ??word[number]
                 """
-                w,i = m.group('w','i')
+                w, i = m.group('w', 'i')
                 c = w[0]
                 if c not in '!?':
                     return self.plural(w, symbols[int(i or 0)])
@@ -764,15 +790,17 @@ class translator(object):
                     (p1, sep, p2) = w[1:].partition("?")
                     part1 = p1 if sep else ""
                     (part2, sep, part3) = (p2 if sep else p1).partition("?")
-                    if not sep: part3 = part2
+                    if not sep:
+                        part3 = part2
                     if i is None:
-                       # ?[word]?number[?number] or ?number
-                       if not part2: return m.group(0)
-                       num = int(part2)
+                        # ?[word]?number[?number] or ?number
+                        if not part2:
+                            return m.group(0)
+                        num = int(part2)
                     else:
-                       # ?[word]?word2[?word3][number]
-                       num = int(symbols[int(i or 0)])
-                    return part1 if num==1 else part3 if num==0 else part2
+                        # ?[word]?word2[?word3][number]
+                        num = int(symbols[int(i or 0)])
+                    return part1 if num == 1 else part3 if num == 0 else part2
                 elif w.startswith('!!!'):
                     word = w[3:]
                     fun = upper_fun
@@ -783,7 +811,7 @@ class translator(object):
                     word = w[1:]
                     fun = cap_fun
                 if i is not None:
-                   return fun(self.plural(word, symbols[int(i)]))
+                    return fun(self.plural(word, symbols[int(i)]))
                 return fun(word)
 
             def sub_dict(m):
@@ -792,7 +820,7 @@ class translator(object):
                     ?word2(var), ?word1?word2(var), ?word1?word2?word0(var)
                     ?word2(num), ?word1?word2(num), ?word1?word2?word0(num)
                 """
-                w,n = m.group('w','n')
+                w, n = m.group('w', 'n')
                 c = w[0]
                 n = int(n) if n.isdigit() else symbols[n]
                 if c not in '!?':
@@ -802,9 +830,10 @@ class translator(object):
                     (p1, sep, p2) = w[1:].partition("?")
                     part1 = p1 if sep else ""
                     (part2, sep, part3) = (p2 if sep else p1).partition("?")
-                    if not sep: part3 = part2
+                    if not sep:
+                        part3 = part2
                     num = int(n)
-                    return part1 if num==1 else part3 if num==0 else part2
+                    return part1 if num == 1 else part3 if num == 0 else part2
                 elif w.startswith('!!!'):
                     word = w[3:]
                     fun = upper_fun
@@ -824,7 +853,7 @@ class translator(object):
                     return m.group(0)
             return part
         message = message % symbols
-        message = regex_plural.sub(sub_plural, message )
+        message = regex_plural.sub(sub_plural, message)
         return message
 
     def translate(self, message, symbols):
@@ -838,7 +867,7 @@ class translator(object):
                 symbols.update(
                     (key, str(value).translate(ttab_in))
                     for key, value in symbols.iteritems()
-                    if not isinstance(value, NUMBERS) )
+                    if not isinstance(value, NUMBERS))
             else:
                 if not isinstance(symbols, tuple):
                     symbols = (symbols,)
@@ -849,6 +878,7 @@ class translator(object):
             message = self.params_substitution(message, symbols)
         return message.translate(ttab_out)
 
+
 def findT(path, language=DEFAULT_LANGUAGE):
     """
     must be run by the admin app
@@ -860,22 +890,22 @@ def findT(path, language=DEFAULT_LANGUAGE):
     vp = pjoin(path, 'views')
     mop = pjoin(path, 'modules')
     for filename in \
-            listdir(mp, '^.+\.py$', 0)+listdir(cp, '^.+\.py$', 0)\
-            +listdir(vp, '^.+\.html$', 0)+listdir(mop, '^.+\.py$', 0):
+            listdir(mp, '^.+\.py$', 0) + listdir(cp, '^.+\.py$', 0)\
+            + listdir(vp, '^.+\.html$', 0) + listdir(mop, '^.+\.py$', 0):
         data = portalocker.read_locked(filename)
         items = regex_translate.findall(data)
         for item in items:
             try:
                 message = safe_eval(item)
             except:
-                continue # silently ignore inproperly formatted strings
+                continue  # silently ignore inproperly formatted strings
             if not message.startswith('#') and not '\n' in message:
                 tokens = message.rsplit('##', 1)
             else:
                 # this allows markmin syntax in translations
                 tokens = [message]
             if len(tokens) == 2:
-                message = tokens[0].strip()+'##'+tokens[1].strip()
+                message = tokens[0].strip() + '##' + tokens[1].strip()
             if message and not message in sentences:
                 sentences[message] = message
     if not '!langcode!' in sentences:
@@ -888,8 +918,12 @@ def findT(path, language=DEFAULT_LANGUAGE):
     write_dict(lang_file, sentences)
 
 ### important to allow safe session.flash=T(....)
+
+
 def lazyT_unpickle(data):
     return marshal.loads(data)
+
+
 def lazyT_pickle(data):
     return lazyT_unpickle, (marshal.dumps(str(data)),)
 copy_reg.pickle(lazyT, lazyT_pickle, lazyT_unpickle)
diff --git a/gluon/main.py b/gluon/main.py
index 2aaaa5e3..4cc0f84f 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -51,7 +51,7 @@ from globals import current
 #  The two are identical unless web2py_path is changed via the web2py.py -f folder option
 #  main.web2py_path is the same as applications_parent (for backward compatibility)
 
-web2py_path = global_settings.applications_parent # backward compatibility
+web2py_path = global_settings.applications_parent  # backward compatibility
 
 create_missing_folders()
 
@@ -107,7 +107,7 @@ try:
     version_info.close()
     global_settings.web2py_version = parse_version(raw_version_string)
 except:
-    raise RuntimeError, "Cannot determine web2py version"
+    raise RuntimeError("Cannot determine web2py version")
 
 web2py_version = global_settings.web2py_version
 
@@ -119,7 +119,8 @@ except:
 
 load()
 
-HTTPS_SCHEMES = set(('https','HTTPS'))
+HTTPS_SCHEMES = set(('https', 'HTTPS'))
+
 
 def get_client(env):
     """
@@ -138,10 +139,11 @@ def get_client(env):
         else:
             client = '127.0.0.1'
     if not is_valid_ip_address(client):
-        raise HTTP(400,"Bad Request (request.client=%s)" % client)
+        raise HTTP(400, "Bad Request (request.client=%s)" % client)
     return client
 
-def copystream_progress(request, chunk_size= 10**5):
+
+def copystream_progress(request, chunk_size=10 ** 5):
     """
     copies request.env.wsgi_input into request.body
     and stores progress upload status in cache_ram
@@ -154,22 +156,22 @@ def copystream_progress(request, chunk_size= 10**5):
     try:
         size = int(env.content_length)
     except ValueError:
-        raise HTTP(400,"Invalid Content-Length header")
+        raise HTTP(400, "Invalid Content-Length header")
     dest = tempfile.TemporaryFile()
     if not 'X-Progress-ID' in request.vars:
         copystream(source, dest, size, chunk_size)
         return dest
-    cache_key = 'X-Progress-ID:'+request.vars['X-Progress-ID']
+    cache_key = 'X-Progress-ID:' + request.vars['X-Progress-ID']
     cache_ram = CacheInRam(request)  # same as cache.ram because meta_storage
-    cache_ram(cache_key+':length', lambda: size, 0)
-    cache_ram(cache_key+':uploaded', lambda: 0, 0)
+    cache_ram(cache_key + ':length', lambda: size, 0)
+    cache_ram(cache_key + ':uploaded', lambda: 0, 0)
     while size > 0:
         if size < chunk_size:
             data = source.read(size)
-            cache_ram.increment(cache_key+':uploaded', size)
+            cache_ram.increment(cache_key + ':uploaded', size)
         else:
             data = source.read(chunk_size)
-            cache_ram.increment(cache_key+':uploaded', chunk_size)
+            cache_ram.increment(cache_key + ':uploaded', chunk_size)
         length = len(data)
         if length > size:
             (data, length) = (data[:size], size)
@@ -180,8 +182,8 @@ def copystream_progress(request, chunk_size= 10**5):
         if length < chunk_size:
             break
     dest.seek(0)
-    cache_ram(cache_key+':length', None)
-    cache_ram(cache_key+':uploaded', None)
+    cache_ram(cache_key + ':length', None)
+    cache_ram(cache_key + ':uploaded', None)
     return dest
 
 
@@ -224,8 +226,9 @@ def serve_controller(request, response, session):
         page = response.body.getvalue()
     # logic to garbage collect after exec, not always, once every 100 requests
     global requests
-    requests = ('requests' in globals()) and (requests+1) % 100 or 0
-    if not requests: gc.collect()
+    requests = ('requests' in globals()) and (requests + 1) % 100 or 0
+    if not requests:
+        gc.collect()
     # end garbage collection logic
 
     # ##################################################
@@ -233,13 +236,14 @@ def serve_controller(request, response, session):
     # ##################################################
 
     default_headers = [
-        ('Content-Type', contenttype('.'+request.extension)),
-        ('Cache-Control','no-store, no-cache, must-revalidate, post-check=0, pre-check=0'),
+        ('Content-Type', contenttype('.' + request.extension)),
+        ('Cache-Control',
+         'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'),
         ('Expires', time.strftime('%a, %d %b %Y %H:%M:%S GMT',
                                   time.gmtime())),
         ('Pragma', 'no-cache')]
-    for key,value in default_headers:
-        response.headers.setdefault(key,value)
+    for key, value in default_headers:
+        response.headers.setdefault(key, value)
 
     raise HTTP(response.status, page, **response.headers)
 
@@ -253,9 +257,9 @@ def start_response_aux(status, headers, exc_info, response=None):
 
     to call third party WSGI applications
     """
-    response.status = str(status).split(' ',1)[0]
+    response.status = str(status).split(' ', 1)[0]
     response.headers = dict(headers)
-    return lambda *args, **kargs: response.write(escape=False,*args,**kargs)
+    return lambda *args, **kargs: response.write(escape=False, *args, **kargs)
 
 
 def middleware_aux(request, response, *middleware_apps):
@@ -270,24 +274,27 @@ def middleware_aux(request, response, *middleware_apps):
     def middleware(f):
         def app(environ, start_response):
             data = f()
-            start_response(response.status,response.headers.items())
-            if isinstance(data,list):
+            start_response(response.status, response.headers.items())
+            if isinstance(data, list):
                 return data
             return [data]
         for item in middleware_apps:
-            app=item(app)
+            app = item(app)
+
         def caller(app):
             wsgi = request.wsgi
             return app(wsgi.environ, wsgi.start_response)
         return lambda caller=caller, app=app: caller(app)
     return middleware
 
-def environ_aux(environ,request):
+
+def environ_aux(environ, request):
     new_environ = copy.copy(environ)
     new_environ['wsgi.input'] = request.body
     new_environ['wsgi.version'] = 1
     return new_environ
 
+
 def parse_get_post_vars(request, environ):
 
     # always parse variables in URL for GET, POST, PUT, DELETE, etc. in get_vars
@@ -307,22 +314,23 @@ def parse_get_post_vars(request, environ):
     try:
         request.body = body = copystream_progress(request)
     except IOError:
-        raise HTTP(400,"Bad Request - HTTP body is incomplete")
+        raise HTTP(400, "Bad Request - HTTP body is incomplete")
     if (body and env.request_method in ('POST', 'PUT', 'BOTH')):
-        dpost = cgi.FieldStorage(fp=body,environ=environ,keep_blank_values=1)
+        dpost = cgi.FieldStorage(fp=body, environ=environ, keep_blank_values=1)
         # The same detection used by FieldStorage to detect multipart POSTs
         is_multipart = dpost.type[:10] == 'multipart/'
         body.seek(0)
         isle25 = sys.version_info[1] <= 5
 
         def listify(a):
-            return (not isinstance(a,list) and [a]) or a
+            return (not isinstance(a, list) and [a]) or a
         try:
             keys = sorted(dpost)
         except TypeError:
             keys = []
         for key in keys:
-            if key is None: continue # not sure why cgi.FieldStorage returns None key
+            if key is None:
+                continue  # not sure why cgi.FieldStorage returns None key
             dpk = dpost[key]
             # if en element is not a file replace it with its value else leave it alone
             if isinstance(dpk, list):
@@ -347,7 +355,8 @@ def parse_get_post_vars(request, environ):
                     pvalue = pvalue[:-len(gvalue)]
             request.vars[key] = value
             if len(pvalue):
-                request.post_vars[key] = (len(pvalue)>1 and pvalue) or pvalue[0]
+                request.post_vars[key] = (len(pvalue) >
+                                          1 and pvalue) or pvalue[0]
 
 
 def wsgibase(environ, responder):
@@ -407,22 +416,23 @@ def wsgibase(environ, responder):
                 response.status = env.web2py_status_code or response.status
 
                 if static_file:
-                    if environ.get('QUERY_STRING','').startswith(
-                        'attachment'):
+                    if environ.get('QUERY_STRING', '').startswith(
+                            'attachment'):
                         response.headers['Content-Disposition'] \
                             = 'attachment'
                     if version:
                         response.headers['Cache-Control'] = 'max-age=315360000'
-                        response.headers['Expires'] = 'Thu, 31 Dec 2037 23:59:59 GMT'
+                        response.headers[
+                            'Expires'] = 'Thu, 31 Dec 2037 23:59:59 GMT'
                     response.stream(static_file, request=request)
 
                 # ##################################################
                 # fill in request items
                 # ##################################################
-                app = request.application ## must go after url_in!
+                app = request.application  # must go after url_in!
 
                 if not global_settings.local_hosts:
-                    local_hosts = ['127.0.0.1','::ffff:127.0.0.1']
+                    local_hosts = ['127.0.0.1', '::ffff:127.0.0.1']
                     if not global_settings.web2py_runtime_gae:
                         try:
                             local_hosts.append(socket.gethostname())
@@ -433,7 +443,7 @@ def wsgibase(environ, responder):
                                 local_hosts += [
                                     env.server_name,
                                     socket.gethostbyname(env.server_name)]
-                        except (socket.gaierror,TypeError):
+                        except (socket.gaierror, TypeError):
                             pass
                     global_settings.local_hosts = local_hosts
                 else:
@@ -442,15 +452,15 @@ def wsgibase(environ, responder):
                 x_req_with = str(env.http_x_requested_with).lower()
 
                 request.update(
-                    client = client,
-                    folder = abspath('applications',app) + os.sep,
-                    ajax = x_req_with == 'xmlhttprequest',
-                    cid = env.http_web2py_component_element,
-                    is_local = env.remote_addr in local_hosts,
-                    is_https = env.wsgi_url_scheme in HTTPS_SCHEMES \
-                        or request.env.http_x_forwarded_proto in HTTPS_SCHEMES \
-                        or env.https=='on')
-                request.uuid = request.compute_uuid() # requires client
+                    client=client,
+                    folder=abspath('applications', app) + os.sep,
+                    ajax=x_req_with == 'xmlhttprequest',
+                    cid=env.http_web2py_component_element,
+                    is_local=env.remote_addr in local_hosts,
+                    is_https=env.wsgi_url_scheme in HTTPS_SCHEMES
+                    or request.env.http_x_forwarded_proto in HTTPS_SCHEMES
+                    or env.https == 'on')
+                request.uuid = request.compute_uuid()  # requires client
                 request.url = environ['PATH_INFO']
 
                 # ##################################################
@@ -460,7 +470,7 @@ def wsgibase(environ, responder):
                 if not exists(request.folder):
                     if app == rwthread.routes.default_application \
                             and app != 'welcome':
-                        redirect(URL('welcome','default','index'))
+                        redirect(URL('welcome', 'default', 'index'))
                     elif rwthread.routes.error_handler:
                         _handler = rwthread.routes.error_handler
                         redirect(URL(_handler['application'],
@@ -468,11 +478,11 @@ def wsgibase(environ, responder):
                                      _handler['function'],
                                      args=app))
                     else:
-                        raise HTTP(404, rwthread.routes.error_message \
-                                       % 'invalid request',
+                        raise HTTP(404, rwthread.routes.error_message
+                                   % 'invalid request',
                                    web2py_error='invalid application')
                 elif not request.is_local and \
-                        exists(pjoin(request.folder,'DISABLED')):
+                        exists(pjoin(request.folder, 'DISABLED')):
                     raise HTTP(503, "<html><body><h1>Temporarily down for maintenance</h1></body></html>")
 
                 # ##################################################
@@ -491,13 +501,13 @@ def wsgibase(environ, responder):
                 # expose wsgi hooks for convenience
                 # ##################################################
 
-                request.wsgi.environ = environ_aux(environ,request)
+                request.wsgi.environ = environ_aux(environ, request)
                 request.wsgi.start_response = \
                     lambda status='200', headers=[], \
                     exec_info=None, response=response: \
                     start_response_aux(status, headers, exec_info, response)
                 request.wsgi.middleware = \
-                    lambda *a: middleware_aux(request,response,*a)
+                    lambda *a: middleware_aux(request, response, *a)
 
                 # ##################################################
                 # load cookies
@@ -507,7 +517,7 @@ def wsgibase(environ, responder):
                     try:
                         request.cookies.load(env.http_cookie)
                     except Cookie.CookieError, e:
-                        pass # invalid cookies
+                        pass  # invalid cookies
 
                 # ##################################################
                 # try load session or create new session file
@@ -530,7 +540,7 @@ def wsgibase(environ, responder):
             except HTTP, http_response:
 
                 if static_file:
-                    return http_response.to(responder,env=env)
+                    return http_response.to(responder, env=env)
 
                 if request.body:
                     request.body.close()
@@ -562,9 +572,9 @@ def wsgibase(environ, responder):
 
                 if request.cid:
                     if response.flash:
-                        http_response.headers['web2py-component-flash'] = urllib2.quote(xmlescape(response.flash).replace('\n',''))
+                        http_response.headers['web2py-component-flash'] = urllib2.quote(xmlescape(response.flash).replace('\n', ''))
                     if response.js:
-                        http_response.headers['web2py-component-command'] = response.js.replace('\n','')
+                        http_response.headers['web2py-component-command'] = response.js.replace('\n', '')
 
                 # ##################################################
                 # store cookies in headers
@@ -576,7 +586,7 @@ def wsgibase(environ, responder):
                 elif session._secure:
                     rcookies[response.session_id_name]['secure'] = True
                 http_response.cookies2headers(rcookies)
-                ticket=None
+                ticket = None
 
             except RestrictedError, e:
 
@@ -594,8 +604,8 @@ def wsgibase(environ, responder):
                     BaseAdapter.close_all_instances('rollback')
 
                 http_response = \
-                    HTTP(500, rwthread.routes.error_message_ticket % \
-                             dict(ticket=ticket),
+                    HTTP(500, rwthread.routes.error_message_ticket %
+                         dict(ticket=ticket),
                          web2py_error='ticket %s' % ticket)
 
         except:
@@ -617,8 +627,8 @@ def wsgibase(environ, responder):
             e = RestrictedError('Framework', '', '', locals())
             ticket = e.log(request) or 'unrecoverable'
             http_response = \
-                HTTP(500, rwthread.routes.error_message_ticket \
-                         % dict(ticket=ticket),
+                HTTP(500, rwthread.routes.error_message_ticket
+                     % dict(ticket=ticket),
                      web2py_error='ticket %s' % ticket)
 
     finally:
@@ -630,10 +640,10 @@ def wsgibase(environ, responder):
     http_response, new_environ = try_rewrite_on_error(
         http_response, request, environ, ticket)
     if not http_response:
-        return wsgibase(new_environ,responder)
+        return wsgibase(new_environ, responder)
     if global_settings.web2py_crontype == 'soft':
         newcron.softcron(global_settings.applications_parent).start()
-    return http_response.to(responder,env=env)
+    return http_response.to(responder, env=env)
 
 
 def save_password(password, port):
@@ -712,14 +722,14 @@ def appfactory(wsgiapp=wsgibase,
 
             locker.acquire()
             cProfile.runctx('ret[0] = wsgiapp(environ, responder2)',
-                            globals(), locals(), profilerfilename+'.tmp')
-            stat = pstats.Stats(profilerfilename+'.tmp')
+                            globals(), locals(), profilerfilename + '.tmp')
+            stat = pstats.Stats(profilerfilename + '.tmp')
             stat.stream = cStringIO.StringIO()
             stat.strip_dirs().sort_stats("time").print_stats(80)
             profile_out = stat.stream.getvalue()
             profile_file = open(profilerfilename, 'a')
-            profile_file.write('%s\n%s\n%s\n%s\n\n' % \
-               ('='*60, environ['PATH_INFO'], '='*60, profile_out))
+            profile_file.write('%s\n%s\n%s\n%s\n\n' %
+                               ('=' * 60, environ['PATH_INFO'], '=' * 60, profile_out))
             profile_file.close()
             locker.release()
         try:
@@ -731,7 +741,7 @@ def appfactory(wsgiapp=wsgibase,
                 environ['SERVER_PROTOCOL'],
                 (status_headers[0])[:3],
                 time.time() - time_in,
-                )
+            )
             if not logfilename:
                 sys.stdout.write(line)
             elif isinstance(logfilename, str):
@@ -766,11 +776,11 @@ class HttpServer(object):
         server_name=None,
         request_queue_size=5,
         timeout=10,
-        socket_timeout = 1,
-        shutdown_timeout=None, # Rocket does not use a shutdown timeout
+        socket_timeout=1,
+        shutdown_timeout=None,  # Rocket does not use a shutdown timeout
         path=None,
-        interfaces=None # Rocket is able to use several interfaces - must be list of socket-tuples as string
-        ):
+        interfaces=None  # Rocket is able to use several interfaces - must be list of socket-tuples as string
+    ):
         """
         starts the web server.
         """
@@ -779,9 +789,9 @@ class HttpServer(object):
             # if interfaces is specified, it must be tested for rocket parameter correctness
             # not necessarily completely tested (e.g. content of tuples or ip-format)
             import types
-            if isinstance(interfaces,types.ListType):
+            if isinstance(interfaces, types.ListType):
                 for i in interfaces:
-                    if not isinstance(i,types.TupleType):
+                    if not isinstance(i, types.TupleType):
                         raise "Wrong format for rocket interfaces parameter - see http://packages.python.org/rocket/"
             else:
                 raise "Wrong format for rocket interfaces parameter - see http://packages.python.org/rocket/"
@@ -822,7 +832,7 @@ class HttpServer(object):
             logger.info('SSL is ON')
         app_info = {'wsgi_app': appfactory(wsgibase,
                                            log_filename,
-                                           profiler_filename) }
+                                           profiler_filename)}
 
         self.server = rocket.Rocket(interfaces or tuple(sock_list),
                                     method='wsgi',
@@ -834,7 +844,6 @@ class HttpServer(object):
                                     handle_signals=False,
                                     )
 
-
     def start(self):
         """
         start the web server
diff --git a/gluon/messageboxhandler.py b/gluon/messageboxhandler.py
index 33cd59b4..3b5a916c 100644
--- a/gluon/messageboxhandler.py
+++ b/gluon/messageboxhandler.py
@@ -5,6 +5,7 @@ try:
 except:
     tkMessageBox = None
 
+
 class MessageBoxHandler(logging.Handler):
     def __init__(self):
         logging.Handler.__init__(self)
diff --git a/gluon/myregex.py b/gluon/myregex.py
index 3661abfa..f53943ca 100644
--- a/gluon/myregex.py
+++ b/gluon/myregex.py
@@ -11,18 +11,18 @@ import re
 
 # pattern to find defined tables
 
-regex_tables = re.compile(\
+regex_tables = re.compile(
     """^[\w]+\.define_table\(\s*[\'\"](?P<name>\w+)[\'\"]""",
     flags=re.M)
 
 # pattern to find exposed functions in controller
 
-regex_expose = re.compile(\
+regex_expose = re.compile(
     '^def\s+(?P<name>(?:[a-zA-Z0-9]\w*)|(?:_[a-zA-Z0-9]\w*))\(\)\s*:',
     flags=re.M)
 
-regex_include = re.compile(\
+regex_include = re.compile(
     '(?P<all>\{\{\s*include\s+[\'"](?P<name>[^\'"]*)[\'"]\s*\}\})')
 
-regex_extend = re.compile(\
-    '^\s*(?P<all>\{\{\s*extend\s+[\'"](?P<name>[^\'"]+)[\'"]\s*\}\})',re.MULTILINE)
+regex_extend = re.compile(
+    '^\s*(?P<all>\{\{\s*extend\s+[\'"](?P<name>[^\'"]+)[\'"]\s*\}\})', re.MULTILINE)
diff --git a/gluon/newcron.py b/gluon/newcron.py
index c6b3026b..aa3bcd9f 100644
--- a/gluon/newcron.py
+++ b/gluon/newcron.py
@@ -23,6 +23,7 @@ from settings import global_settings
 logger = logging.getLogger("web2py.cron")
 _cron_stopping = False
 
+
 def absolute_path_link(path):
     """
     Return an absolute path for the destination of a symlink
@@ -36,11 +37,13 @@ def absolute_path_link(path):
         link = os.path.abspath(path)
     return link
 
+
 def stopcron():
     "graceful shutdown of cron"
     global _cron_stopping
     _cron_stopping = True
 
+
 class extcron(threading.Thread):
 
     def __init__(self, applications_parent, apps=None):
@@ -55,6 +58,7 @@ class extcron(threading.Thread):
             logger.debug('external cron invocation')
             crondance(self.path, 'external', startup=False, apps=self.apps)
 
+
 class hardcron(threading.Thread):
 
     def __init__(self, applications_parent):
@@ -66,7 +70,7 @@ class hardcron(threading.Thread):
     def launch(self):
         if not _cron_stopping:
             logger.debug('hard cron invocation')
-            crondance(self.path, 'hard', startup = False)
+            crondance(self.path, 'hard', startup=False)
 
     def run(self):
         s = sched.scheduler(time.time, time.sleep)
@@ -76,6 +80,7 @@ class hardcron(threading.Thread):
             s.enter(60 - now % 60, 1, self.launch, ())
             s.run()
 
+
 class softcron(threading.Thread):
 
     def __init__(self, applications_parent):
@@ -88,16 +93,17 @@ class softcron(threading.Thread):
             logger.debug('soft cron invocation')
             crondance(self.path, 'soft', startup=False)
 
+
 class Token(object):
 
-    def __init__(self,path):
+    def __init__(self, path):
         self.path = os.path.join(path, 'cron.master')
         if not os.path.exists(self.path):
             fileutils.write_file(self.path, '', 'wb')
         self.master = None
         self.now = time.time()
 
-    def acquire(self,startup=False):
+    def acquire(self, startup=False):
         """
         returns the time when the lock is acquired or
         None if cron already running
@@ -112,12 +118,12 @@ class Token(object):
         if portalocker.LOCK_EX is None:
             logger.warning('WEB2PY CRON: Disabled because no file locking')
             return None
-        self.master = open(self.path,'rb+')
+        self.master = open(self.path, 'rb+')
         try:
             ret = None
-            portalocker.lock(self.master,portalocker.LOCK_EX)
+            portalocker.lock(self.master, portalocker.LOCK_EX)
             try:
-                (start, stop) =  cPickle.load(self.master)
+                (start, stop) = cPickle.load(self.master)
             except:
                 (start, stop) = (0, 1)
             if startup or self.now - start > 59.99:
@@ -127,7 +133,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)
+                cPickle.dump((self.now, 0), self.master)
         finally:
             portalocker.unlock(self.master)
         if not ret:
@@ -141,13 +147,13 @@ class Token(object):
         was completed
         """
         if not self.master.closed:
-            portalocker.lock(self.master,portalocker.LOCK_EX)
+            portalocker.lock(self.master, portalocker.LOCK_EX)
             logger.debug('WEB2PY CRON: Releasing cron lock')
             self.master.seek(0)
-            (start, stop) =  cPickle.load(self.master)
-            if start == self.now: # if this is my lock
+            (start, stop) = cPickle.load(self.master)
+            if start == self.now:  # if this is my lock
                 self.master.seek(0)
-                cPickle.dump((self.now,time.time()),self.master)
+                cPickle.dump((self.now, time.time()), self.master)
             portalocker.unlock(self.master)
             self.master.close()
 
@@ -177,25 +183,26 @@ def rangetolist(s, period='min'):
 def parsecronline(line):
     task = {}
     if line.startswith('@reboot'):
-        line=line.replace('@reboot', '-1 * * * *')
+        line = line.replace('@reboot', '-1 * * * *')
     elif line.startswith('@yearly'):
-        line=line.replace('@yearly', '0 0 1 1 *')
+        line = line.replace('@yearly', '0 0 1 1 *')
     elif line.startswith('@annually'):
-        line=line.replace('@annually', '0 0 1 1 *')
+        line = line.replace('@annually', '0 0 1 1 *')
     elif line.startswith('@monthly'):
-        line=line.replace('@monthly', '0 0 1 * *')
+        line = line.replace('@monthly', '0 0 1 * *')
     elif line.startswith('@weekly'):
-        line=line.replace('@weekly', '0 0 * * 0')
+        line = line.replace('@weekly', '0 0 * * 0')
     elif line.startswith('@daily'):
-        line=line.replace('@daily', '0 0 * * *')
+        line = line.replace('@daily', '0 0 * * *')
     elif line.startswith('@midnight'):
-        line=line.replace('@midnight', '0 0 * * *')
+        line = line.replace('@midnight', '0 0 * * *')
     elif line.startswith('@hourly'):
-        line=line.replace('@hourly', '0 * * * *')
+        line = line.replace('@hourly', '0 * * * *')
     params = line.strip().split(None, 6)
     if len(params) < 7:
         return None
-    daysofweek={'sun':0,'mon':1,'tue':2,'wed':3,'thu':4,'fri':5,'sat':6}
+    daysofweek = {'sun': 0, 'mon': 1, 'tue': 2, 'wed': 3, 'thu': 4,
+                  'fri': 5, 'sat': 6}
     for (s, id) in zip(params[:5], ['min', 'hr', 'dom', 'mon', 'dow']):
         if not s in [None, '*']:
             task[id] = []
@@ -205,9 +212,9 @@ def parsecronline(line):
                     val = '%s/1' % val
                 if '/' in val:
                     task[id] += rangetolist(val, id)
-                elif val.isdigit() or val=='-1':
+                elif val.isdigit() or val == '-1':
                     task[id].append(int(val))
-                elif id=='dow' and val[:3].lower() in daysofweek:
+                elif id == 'dow' and val[:3].lower() in daysofweek:
                     task[id].append(daysofweek(val[:3].lower()))
     task['user'] = params[5]
     task['cmd'] = params[6]
@@ -225,7 +232,7 @@ class cronlauncher(threading.Thread):
 
     def run(self):
         import subprocess
-        if isinstance(self.cmd, (list,tuple)):
+        if isinstance(self.cmd, (list, tuple)):
             cmd = self.cmd
         else:
             cmd = self.cmd.split()
@@ -234,28 +241,29 @@ class cronlauncher(threading.Thread):
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,
                                 shell=self.shell)
-        (stdoutdata,stderrdata) = proc.communicate()
+        (stdoutdata, stderrdata) = proc.communicate()
         if proc.returncode != 0:
             logger.warning(
-                'WEB2PY CRON Call returned code %s:\n%s' % \
-                    (proc.returncode, stdoutdata+stderrdata))
+                'WEB2PY CRON Call returned code %s:\n%s' %
+                (proc.returncode, stdoutdata + stderrdata))
         else:
-            logger.debug('WEB2PY CRON Call returned success:\n%s' \
-                              % stdoutdata)
+            logger.debug('WEB2PY CRON Call returned success:\n%s'
+                         % stdoutdata)
+
 
 def crondance(applications_parent, ctype='soft', startup=False, apps=None):
-    apppath = os.path.join(applications_parent,'applications')
+    apppath = os.path.join(applications_parent, 'applications')
     cron_path = os.path.join(applications_parent)
     token = Token(cron_path)
     cronmaster = token.acquire(startup=startup)
     if not cronmaster:
         return
     now_s = time.localtime()
-    checks=(('min',now_s.tm_min),
-            ('hr',now_s.tm_hour),
-            ('mon',now_s.tm_mon),
-            ('dom',now_s.tm_mday),
-            ('dow',(now_s.tm_wday+1)%7))
+    checks = (('min', now_s.tm_min),
+              ('hr', now_s.tm_hour),
+              ('mon', now_s.tm_mon),
+              ('dom', now_s.tm_mday),
+              ('dow', (now_s.tm_wday + 1) % 7))
 
     if apps is None:
         apps = [x for x in os.listdir(apppath)
@@ -265,8 +273,8 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
 
     for app in apps:
         if _cron_stopping:
-            break;
-        apath = os.path.join(apppath,app)
+            break
+        apath = os.path.join(apppath, app)
 
         # if app is a symbolic link to other app, skip it
         full_apath_link = absolute_path_link(apath)
@@ -281,7 +289,8 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
             continue
         try:
             cronlines = fileutils.readlines_file(crontab, 'rt')
-            lines = [x.strip() for x in cronlines if x.strip() and not x.strip().startswith('#')]
+            lines = [x.strip() for x in cronlines if x.strip(
+            ) and not x.strip().startswith('#')]
             tasks = [parsecronline(cline) for cline in lines]
         except Exception, e:
             logger.error('WEB2PY CRON: crontab read error %s' % e)
@@ -289,42 +298,42 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
 
         for task in tasks:
             if _cron_stopping:
-                break;
+                break
             commands = [sys.executable]
             w2p_path = fileutils.abspath('web2py.py', gluon=True)
             if os.path.exists(w2p_path):
                 commands.append(w2p_path)
             if global_settings.applications_parent != global_settings.gluon_parent:
                 commands.extend(('-f', global_settings.applications_parent))
-            citems = [(k in task and not v in task[k]) for k,v in checks]
-            task_min= task.get('min',[])
+            citems = [(k in task and not v in task[k]) for k, v in checks]
+            task_min = task.get('min', [])
             if not task:
                 continue
             elif not startup and task_min == [-1]:
                 continue
-            elif task_min != [-1] and reduce(lambda a,b: a or b, citems):
+            elif task_min != [-1] and reduce(lambda a, b: a or b, citems):
                 continue
-            logger.info('WEB2PY CRON (%s): %s executing %s in %s at %s' \
-                             % (ctype, app, task.get('cmd'),
-                                os.getcwd(), datetime.datetime.now()))
+            logger.info('WEB2PY CRON (%s): %s executing %s in %s at %s'
+                        % (ctype, app, task.get('cmd'),
+                           os.getcwd(), datetime.datetime.now()))
             action, command, models = False, task['cmd'], ''
             if command.startswith('**'):
-                (action,models,command) = (True,'',command[2:])
+                (action, models, command) = (True, '', command[2:])
             elif command.startswith('*'):
-                (action,models,command) = (True,'-M',command[1:])
+                (action, models, command) = (True, '-M', command[1:])
             else:
-                action=False
+                action = False
 
             if action and command.endswith('.py'):
                 commands.extend(('-J',                # cron job
                                  models,              # import models?
                                  '-S', app,           # app name
-                                 '-a', '"<recycle>"', # password
+                                 '-a', '"<recycle>"',  # password
                                  '-R', command))      # command
             elif action:
                 commands.extend(('-J',                  # cron job
                                  models,                # import models?
-                                 '-S', app+'/'+command, # app name
+                                 '-S', app + '/' + command,  # app name
                                  '-a', '"<recycle>"'))  # password
             else:
                 commands = command
@@ -338,6 +347,6 @@ def crondance(applications_parent, ctype='soft', startup=False, apps=None):
                 cronlauncher(commands, shell=shell).start()
             except Exception, e:
                 logger.warning(
-                    'WEB2PY CRON: Execution error for %s: %s' \
-                        % (task.get('cmd'), e))
+                    'WEB2PY CRON: Execution error for %s: %s'
+                    % (task.get('cmd'), e))
     token.release()
diff --git a/gluon/portalocker.py b/gluon/portalocker.py
index 2766032d..37e5ffe3 100644
--- a/gluon/portalocker.py
+++ b/gluon/portalocker.py
@@ -110,54 +110,62 @@ else:
 
 
 class LockedFile(object):
-    def __init__(self,filename, mode='rb'):
+    def __init__(self, filename, mode='rb'):
         self.filename = filename
         self.mode = mode
         self.file = None
         if 'r' in mode:
-            self.file = open(filename,mode)
-            lock(self.file,LOCK_SH)
+            self.file = open(filename, mode)
+            lock(self.file, LOCK_SH)
         elif 'w' in mode or 'a' in mode:
-            self.file = open(filename,mode.replace('w','a'))
-            lock(self.file,LOCK_EX)
+            self.file = open(filename, mode.replace('w', 'a'))
+            lock(self.file, LOCK_EX)
             if not 'a' in mode:
                 self.file.seek(0)
                 self.file.truncate()
         else:
-            raise RuntimeError, "invalid LockedFile(...,mode)"
-    def read(self,size=None):
+            raise RuntimeError("invalid LockedFile(...,mode)")
+
+    def read(self, size=None):
         return self.file.read() if size is None else self.file.read(size)
+
     def readline(self):
         return self.file.readline()
+
     def readlines(self):
         return self.file.readlines()
-    def write(self,data):
+
+    def write(self, data):
         self.file.write(data)
         self.file.flush()
+
     def close(self):
         if not self.file is None:
             unlock(self.file)
             self.file.close()
             self.file = None
+
     def __del__(self):
         if not self.file is None:
             self.close()
 
+
 def read_locked(filename):
     fp = LockedFile(filename, 'r')
     data = fp.read()
     fp.close()
     return data
 
-def write_locked(filename,data):
+
+def write_locked(filename, data):
     fp = LockedFile(filename, 'w')
     data = fp.write(data)
     fp.close()
 
-if __name__=='__main__':
-    f = LockedFile('test.txt',mode='wb')
+if __name__ == '__main__':
+    f = LockedFile('test.txt', mode='wb')
     f.write('test ok')
     f.close()
-    f = LockedFile('test.txt',mode='rb')
+    f = LockedFile('test.txt', mode='rb')
     print f.read()
     f.close()
diff --git a/gluon/reserved_sql_keywords.py b/gluon/reserved_sql_keywords.py
index cd3c4b55..e5b0fd14 100644
--- a/gluon/reserved_sql_keywords.py
+++ b/gluon/reserved_sql_keywords.py
@@ -419,7 +419,7 @@ POSTGRESQL_NONRESERVED = set((
     'HOLD',
     'HOST',
     'HOUR',
-#    'ID',
+                             #    'ID',
     'IDENTITY',
     'IF',
     'IGNORE',
@@ -501,7 +501,7 @@ POSTGRESQL_NONRESERVED = set((
     'MOVE',
     'MULTISET',
     'MUMPS',
-#    'NAME',
+                             #    'NAME',
     'NAMES',
     'NAMESPACE',
     'NCLOB',
@@ -563,7 +563,7 @@ POSTGRESQL_NONRESERVED = set((
     'PARTITION',
     'PASCAL',
     'PASSING',
-#    'PASSWORD',
+                             #    'PASSWORD',
     'PATH',
     'PERCENT_RANK',
     'PERCENTILE_CONT',
@@ -622,7 +622,7 @@ POSTGRESQL_NONRESERVED = set((
     'RETURNED_SQLSTATE',
     'RETURNS',
     'REVOKE',
-#    'ROLE',
+                             #    'ROLE',
     'ROLLBACK',
     'ROLLUP',
     'ROUTINE',
@@ -697,7 +697,7 @@ POSTGRESQL_NONRESERVED = set((
     'SYSTEM',
     'SYSTEM_USER',
     'T',
-#    'TABLE_NAME',
+                             #    'TABLE_NAME',
     'TABLESAMPLE',
     'TABLESPACE',
     'TEMP',
@@ -785,7 +785,7 @@ POSTGRESQL_NONRESERVED = set((
     'YEAR',
     'YES',
     'ZONE',
-))
+                             ))
 
 #Thanks villas
 FIREBIRD = set((
@@ -887,7 +887,7 @@ FIREBIRD = set((
     'PAGES',
     'PAGE_SIZE',
     'PARAMETER',
-#    'PASSWORD',
+               #    'PASSWORD',
     'PLAN',
     'POST_EVENT',
     'QUIT',
@@ -903,7 +903,7 @@ FIREBIRD = set((
     'RETURN',
     'RETURNING_VALUES',
     'RETURNS',
-#    'ROLE',
+               #    'ROLE',
     'ROW_COUNT',
     'ROWS',
     'RUNTIME',
@@ -941,7 +941,7 @@ FIREBIRD = set((
     'WEEKDAY',
     'WHILE',
     'YEARDAY',
-))
+               ))
 FIREBIRD_NONRESERVED = set((
     'BACKUP',
     'BLOCK',
@@ -1710,4 +1710,5 @@ ADAPTERS = {
     'common': COMMON,
 }
 
-ADAPTERS['all'] = reduce(lambda a,b:a.union(b),(x for x in ADAPTERS.values()))
+ADAPTERS['all'] = reduce(lambda a, b: a.union(b), (
+    x for x in ADAPTERS.values()))
diff --git a/gluon/restricted.py b/gluon/restricted.py
index 6533af47..0416dea2 100644
--- a/gluon/restricted.py
+++ b/gluon/restricted.py
@@ -22,6 +22,7 @@ logger = logging.getLogger("web2py")
 
 __all__ = ['RestrictedError', 'restricted', 'TicketStorage', 'compile2']
 
+
 class TicketStorage(Storage):
 
     """
@@ -32,7 +33,7 @@ class TicketStorage(Storage):
         self,
         db=None,
         tablename='web2py_ticket'
-        ):
+    ):
         Storage.__init__(self)
         self.db = db
         self.tablename = tablename
@@ -64,7 +65,8 @@ class TicketStorage(Storage):
         root = request.folder
         if app:
             root = os.path.join(os.path.join(root, '..'), app)
-        errors_folder = os.path.abspath(os.path.join(root, 'errors'))#.replace('\\', '/')
+        errors_folder = os.path.abspath(
+            os.path.join(root, 'errors'))  # .replace('\\', '/')
         return open(os.path.join(errors_folder, ticket_id), mode)
 
     def _get_table(self, db, tablename, app):
@@ -78,7 +80,7 @@ class TicketStorage(Storage):
                 db.Field('ticket_id', length=100),
                 db.Field('ticket_data', 'text'),
                 db.Field('created_datetime', 'datetime'),
-                )
+            )
         return table
 
     def load(
@@ -86,7 +88,7 @@ class TicketStorage(Storage):
         request,
         app,
         ticket_id,
-        ):
+    ):
         if not self.db:
             try:
                 ef = self._error_file(request, ticket_id, 'rb', app)
@@ -102,7 +104,6 @@ class TicketStorage(Storage):
             return cPickle.loads(rows[0].ticket_data) if rows else {}
 
 
-
 class RestrictedError(Exception):
     """
     class used to wrap an exception that occurs in the restricted environment
@@ -115,12 +116,13 @@ class RestrictedError(Exception):
         code='',
         output='',
         environment=None,
-        ):
+    ):
         """
         layer here is some description of where in the system the exception
         occurred.
         """
-        if environment is None: environment = {}
+        if environment is None:
+            environment = {}
         self.layer = layer
         self.code = code
         self.output = output
@@ -131,7 +133,7 @@ class RestrictedError(Exception):
             except:
                 self.traceback = 'no traceback because template parting error'
             try:
-                self.snapshot = snapshot(context=10,code=code,
+                self.snapshot = snapshot(context=10, code=code,
                                          environment=self.environment)
             except:
                 self.snapshot = {}
@@ -151,15 +153,14 @@ class RestrictedError(Exception):
                 'output': str(self.output),
                 'traceback': str(self.traceback),
                 'snapshot': self.snapshot,
-                }
+            }
             ticket_storage = TicketStorage(db=request.tickets_db)
-            ticket_storage.store(request, request.uuid.split('/',1)[1], d)
+            ticket_storage.store(request, request.uuid.split('/', 1)[1], d)
             return request.uuid
         except:
             logger.error(self.traceback)
             return None
 
-
     def load(self, request, app, ticket_id):
         """
         loads a logged exception.
@@ -186,11 +187,12 @@ class RestrictedError(Exception):
         return output
 
 
-def compile2(code,layer):
+def compile2(code, layer):
     """
     The +'\n' is necessary else compile fails when code ends in a comment.
     """
-    return compile(code.rstrip().replace('\r\n','\n')+'\n', layer, 'exec')
+    return compile(code.rstrip().replace('\r\n', '\n') + '\n', layer, 'exec')
+
 
 def restricted(code, environment=None, layer='Unknown'):
     """
@@ -198,14 +200,15 @@ def restricted(code, environment=None, layer='Unknown'):
     in code it raises a RestrictedError containing the traceback. layer is
     passed to RestrictedError to identify where the error occurred.
     """
-    if environment is None: environment = {}
+    if environment is None:
+        environment = {}
     environment['__file__'] = layer
     environment['__name__'] = '__restricted__'
     try:
-        if type(code) == types.CodeType:
+        if isinstance(code, types.CodeType):
             ccode = code
         else:
-            ccode = compile2(code,layer)
+            ccode = compile2(code, layer)
         exec ccode in environment
     except HTTP:
         raise
@@ -221,14 +224,21 @@ def restricted(code, environment=None, layer='Unknown'):
         output = "%s %s" % (etype, evalue)
         raise RestrictedError(layer, code, output, environment)
 
+
 def snapshot(info=None, context=5, code=None, environment=None):
     """Return a dict describing a given traceback (based on cgitb.text)."""
-    import os, types, time, linecache, inspect, pydoc, cgitb
+    import os
+    import types
+    import time
+    import linecache
+    import inspect
+    import pydoc
+    import cgitb
 
     # if no exception info given, get current:
     etype, evalue, etb = info or sys.exc_info()
 
-    if type(etype) is types.ClassType:
+    if isinstance(etype, types.ClassType):
         etype = etype.__name__
 
     # create a snapshot dict with some basic information
@@ -245,22 +255,26 @@ def snapshot(info=None, context=5, code=None, environment=None):
         call = ''
         if func != '?':
             call = inspect.formatargvalues(args, varargs, varkw, locals,
-                    formatvalue=lambda value: '=' + pydoc.text.repr(value))
+                                           formatvalue=lambda value: '=' + pydoc.text.repr(value))
 
         # basic frame information
-        f = {'file': file, 'func': func, 'call': call, 'lines': {}, 'lnum': lnum}
+        f = {'file': file, 'func': func, 'call': call, 'lines': {},
+             'lnum': lnum}
 
         highlight = {}
+
         def reader(lnum=[lnum]):
             highlight[lnum[0]] = 1
-            try: return linecache.getline(file, lnum[0])
-            finally: lnum[0] += 1
+            try:
+                return linecache.getline(file, lnum[0])
+            finally:
+                lnum[0] += 1
         vars = cgitb.scanvars(reader, frame, locals)
 
         # if it is a view, replace with generated code
         if file.endswith('html'):
-            lmin = lnum>context and (lnum-context) or 0
-            lmax = lnum+context
+            lmin = lnum > context and (lnum - context) or 0
+            lmax = lnum + context
             lines = code.split("\n")[lmin:lmax]
             index = min(context, lnum) - 1
 
@@ -273,10 +287,13 @@ def snapshot(info=None, context=5, code=None, environment=None):
         # dump local variables (referenced in current line only)
         f['dump'] = {}
         for name, where, value in vars:
-            if name in f['dump']: continue
+            if name in f['dump']:
+                continue
             if value is not cgitb.__UNDEF__:
-                if where == 'global': name = 'global ' + name
-                elif where != 'local': name = where + name.split('.')[-1]
+                if where == 'global':
+                    name = 'global ' + name
+                elif where != 'local':
+                    name = where + name.split('.')[-1]
                 f['dump'][name] = pydoc.text.repr(value)
             else:
                 f['dump'][name] = 'undefined'
@@ -290,7 +307,7 @@ def snapshot(info=None, context=5, code=None, environment=None):
     if isinstance(evalue, BaseException):
         for name in dir(evalue):
             # prevent py26 DeprecatedWarning:
-            if name!='message' or sys.version_info<(2.6):
+            if name != 'message' or sys.version_info < (2.6):
                 value = pydoc.text.repr(getattr(evalue, name))
                 s['exception'][name] = value
 
@@ -300,7 +317,7 @@ def snapshot(info=None, context=5, code=None, environment=None):
         s['locals'][name] = pydoc.text.repr(value)
 
     # add web2py environment variables
-    for k,v in environment.items():
+    for k, v in environment.items():
         if k in ('request', 'response', 'session'):
             s[k] = BEAUTIFY(v)
 
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 10227cde..c18035d9 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -38,7 +38,8 @@ THREAD_LOCAL = threading.local()  # thread-local storage for routing params
 regex_at = re.compile(r'(?<!\\)\$[a-zA-Z]\w*')
 regex_anything = re.compile(r'(?<!\\)\$anything')
 regex_redirect = re.compile(r'(\d+)->(.*)')
-regex_full_url = re.compile(r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)')
+regex_full_url = re.compile(
+    r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)')
 regex_version = re.compile(r'^(_[\d]+\.[\d]+\.[\d]+)$')
 # pattern to replace spaces with underscore in URL
 #   also the html escaped variants '+' and '%20' are covered
@@ -60,25 +61,26 @@ regex_url = re.compile('^/((?P<a>\w+)(/(?P<c>\w+)(/(?P<z>(?P<f>\w+)(\.(?P<e>[\w.
 def _router_default():
     "return new copy of default base router"
     router = Storage(
-        default_application = 'init',
-            applications = 'ALL',
-        default_controller = 'default',
-            controllers = 'DEFAULT',
-        default_function = 'index',
-            functions = dict(),
-        default_language = None,
-            languages = None,
-        root_static = ['favicon.ico', 'robots.txt'],
-        map_static = None,
-        domains = None,
-        exclusive_domain = False,
-        map_hyphen = False,
-        acfe_match = r'\w+$',                   # legal app/ctlr/fcn/ext
-        file_match = r'([-+=@$%\w]+[./]?)+$',   # legal static subpath
-        args_match = r'([\w@ -]+[=.]?)*$',      # legal arg in args
+        default_application='init',
+        applications='ALL',
+        default_controller='default',
+        controllers='DEFAULT',
+        default_function='index',
+        functions=dict(),
+        default_language=None,
+        languages=None,
+        root_static=['favicon.ico', 'robots.txt'],
+        map_static=None,
+        domains=None,
+        exclusive_domain=False,
+        map_hyphen=False,
+        acfe_match=r'\w+$',                   # legal app/ctlr/fcn/ext
+        file_match=r'([-+=@$%\w]+[./]?)+$',   # legal static subpath
+        args_match=r'([\w@ -]+[=.]?)*$',      # legal arg in args
     )
     return router
 
+
 def _params_default(app=None):
     "return new copy of default parameters"
     p = Storage()
@@ -94,7 +96,7 @@ def _params_default(app=None):
     p.error_handler = None
     p.error_message = '<html><body><h1>%s</h1></body></html>'
     p.error_message_ticket = \
-        '<html><body><h1>Internal error</h1>Ticket issued: <a href="/admin/default/ticket/%(ticket)s" target="_blank">%(ticket)s</a></body><!-- this is junk text else IE does not display the page: '+('x'*512)+' //--></html>'
+        '<html><body><h1>Internal error</h1>Ticket issued: <a href="/admin/default/ticket/%(ticket)s" target="_blank">%(ticket)s</a></body><!-- this is junk text else IE does not display the page: ' + ('x' * 512) + ' //--></html>'
     p.routers = None
     p.logging = 'off'
     return p
@@ -104,6 +106,7 @@ params = _params_default(app=None)  # regex rewrite parameters
 THREAD_LOCAL.routes = params  # default to base regex rewrite parameters
 routers = None
 
+
 def log_rewrite(string):
     "Log rewrite activity under control of routes.py"
     if params.logging == 'debug':   # catch common cases first
@@ -152,6 +155,7 @@ ROUTER_BASE_KEYS = set(
 #  filter_err: helper for doctest & unittest
 #  regex_filter_out: doctest
 
+
 def fixup_missing_path_info(environ):
     eget = environ.get
     path_info = eget('PATH_INFO')
@@ -165,12 +169,12 @@ def fixup_missing_path_info(environ):
     elif not request_uri:
         query_string = eget('QUERY_STRING')
         if query_string:
-            environ['REQUEST_URI'] = '%s?%s' % (path_info,query_string)
+            environ['REQUEST_URI'] = '%s?%s' % (path_info, query_string)
         else:
             environ['REQUEST_URI'] = path_info
     if not eget('HTTP_HOST'):
         environ['HTTP_HOST'] = \
-            '%s:%s' % (eget('SERVER_NAME'),eget('SERVER_PORT'))
+            '%s:%s' % (eget('SERVER_NAME'), eget('SERVER_PORT'))
 
 
 def url_in(request, environ):
@@ -179,6 +183,7 @@ def url_in(request, environ):
         return map_url_in(request, environ)
     return regex_url_in(request, environ)
 
+
 def url_out(request, environ, application, controller, function,
             args, other, scheme, host, port):
     "assemble and rewrite outgoing URL"
@@ -193,48 +198,51 @@ def url_out(request, environ, application, controller, function,
     #  fill in scheme and host if absolute URL is requested
     #  scheme can be a string, eg 'http', 'https', 'ws', 'wss'
     #
-    if host is True or (host is None and (scheme or port!=None)):
+    if host is True or (host is None and (scheme or port is not None)):
         host = request.env.http_host
     if not scheme or scheme is True:
         scheme = request.env.get('wsgi_url_scheme', 'http').lower() \
             if request else 'http'
     if host:
-        host_port = host if not port else host.split(':',1)[0]+':%s'%port
+        host_port = host if not port else host.split(':', 1)[0] + ':%s' % port
         url = '%s://%s%s' % (scheme, host_port, url)
     return url
 
+
 def try_rewrite_on_error(http_response, request, environ, ticket=None):
     """
     called from main.wsgibase to rewrite the http response.
     """
     status = int(str(http_response.status).split()[0])
-    if status>=399 and THREAD_LOCAL.routes.routes_onerror:
-        keys=set(('%s/%s' % (request.application, status),
-                  '%s/*' % (request.application),
-                  '*/%s' % (status),
-                  '*/*'))
-        for (key,uri) in THREAD_LOCAL.routes.routes_onerror:
+    if status >= 399 and THREAD_LOCAL.routes.routes_onerror:
+        keys = set(('%s/%s' % (request.application, status),
+                    '%s/*' % (request.application),
+                    '*/%s' % (status),
+                    '*/*'))
+        for (key, uri) in THREAD_LOCAL.routes.routes_onerror:
             if key in keys:
                 if uri == '!':
                     # do nothing!
                     return http_response, environ
                 elif '?' in uri:
-                    path_info, query_string = uri.split('?',1)
+                    path_info, query_string = uri.split('?', 1)
                     query_string += '&'
                 else:
                     path_info, query_string = uri, ''
                 query_string += \
                     'code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \
-                    (status,ticket,urllib.quote_plus(request.env.request_uri),request.url)
+                    (status, ticket, urllib.quote_plus(
+                        request.env.request_uri), request.url)
                 if uri.startswith('http://') or uri.startswith('https://'):
                     # make up a response
-                    url = path_info+'?'+query_string
+                    url = path_info + '?' + query_string
                     message = 'You are being redirected <a href="%s">here</a>'
                     return HTTP(303, message % url, Location=url), environ
                 else:
                     error_raising_path = environ['PATH_INFO']
                     # Rewrite routes_onerror path.
-                    path_info = '/' + path_info.lstrip('/') # add leading '/' if missing
+                    path_info = '/' + path_info.lstrip(
+                        '/')  # add leading '/' if missing
                     environ['PATH_INFO'] = path_info
                     error_handling_path = \
                         url_in(request, environ)[2]['PATH_INFO']
@@ -248,29 +256,30 @@ def try_rewrite_on_error(http_response, request, environ, ticket=None):
     # do nothing!
     return http_response, environ
 
+
 def try_redirect_on_error(http_object, request, ticket=None):
     "called from main.wsgibase to rewrite the http response"
     status = int(str(http_object.status).split()[0])
-    if status>399 and THREAD_LOCAL.routes.routes_onerror:
-        keys=set(('%s/%s' % (request.application, status),
-                  '%s/*' % (request.application),
-                  '*/%s' % (status),
-                  '*/*'))
-        for (key,redir) in THREAD_LOCAL.routes.routes_onerror:
+    if status > 399 and THREAD_LOCAL.routes.routes_onerror:
+        keys = set(('%s/%s' % (request.application, status),
+                    '%s/*' % (request.application),
+                    '*/%s' % (status),
+                    '*/*'))
+        for (key, redir) in THREAD_LOCAL.routes.routes_onerror:
             if key in keys:
                 if redir == '!':
                     break
                 elif '?' in redir:
                     url = '%s&code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \
-                        (redir,status,ticket,
+                        (redir, status, ticket,
                          urllib.quote_plus(request.env.request_uri),
                          request.url)
                 else:
                     url = '%s?code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \
-                        (redir,status,ticket,
+                        (redir, status, ticket,
                          urllib.quote_plus(request.env.request_uri),
                          request.url)
-                return HTTP(303,'You are being redirected <a href="%s">here</a>' % url,Location=url)
+                return HTTP(303, 'You are being redirected <a href="%s">here</a>' % url, Location=url)
     return http_object
 
 
@@ -305,7 +314,7 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
                 path = abspath('applications', app, routes)
             if not exists(path):
                 return
-            data = read_file(path).replace('\r\n','\n')
+            data = read_file(path).replace('\r\n', '\n')
 
         symbols = dict(app=app)
         try:
@@ -323,8 +332,8 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
             for items in symbols[sym]:
                 p[sym].append(compile_regex(*items))
     for sym in ('routes_onerror', 'routes_apps_raw',
-                'error_handler','error_message', 'error_message_ticket',
-                'default_application','default_controller', 'default_function',
+                'error_handler', 'error_message', 'error_message_ticket',
+                'default_application', 'default_controller', 'default_function',
                 'logging'):
         if sym in symbols:
             p[sym] = symbols[sym]
@@ -357,15 +366,15 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
         apppath = abspath('applications')
         for appname in os.listdir(apppath):
             if not appname.startswith('.') and \
-                    isdir(abspath(apppath,appname)) and \
-                    isdir(abspath(apppath,appname,'controllers')):
+                    isdir(abspath(apppath, appname)) and \
+                    isdir(abspath(apppath, appname, 'controllers')):
                 all_apps.append(appname)
                 if routers:
                     router = Storage(routers.BASE)   # new copy
                     if appname in routers:
                         for key in routers[appname].keys():
                             if key in ROUTER_BASE_KEYS:
-                                raise SyntaxError, "BASE-only key '%s' in router '%s'" % (key, appname)
+                                raise SyntaxError("BASE-only key '%s' in router '%s'" % (key, appname))
                         router.update(routers[appname])
                     routers[appname] = router
                 if exists(abspath('applications', appname, routes)):
@@ -374,7 +383,7 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
         if routers:
             load_routers(all_apps)
 
-    else: # app
+    else:  # app
         params_apps[app] = p
         if routers and p.routers:
             if app in p.routers:
@@ -406,8 +415,8 @@ def compile_regex(k, v, env=None):
     if k.find('://') < 0:
         i = k.find(':/')
         if i < 0:
-            raise SyntaxError, "routes pattern syntax error: path needs leading '/' [%s]" % k0
-        k = r'%s:https?://[^:/]+:[a-z]+ %s' % (k[:i], k[i+1:])
+            raise SyntaxError("routes pattern syntax error: path needs leading '/' [%s]" % k0)
+        k = r'%s:https?://[^:/]+:[a-z]+ %s' % (k[:i], k[i + 1:])
     # $anything -> ?P<anything>.*
     for item in regex_anything.findall(k):
         k = k.replace(item, '(?P<anything>.*)')
@@ -419,6 +428,7 @@ def compile_regex(k, v, env=None):
         v = v.replace(item, r'\g<%s>' % item[1:])
     return (re.compile(k, re.DOTALL), v, env or {})
 
+
 def load_routers(all_apps):
     "load-time post-processing of routers"
 
@@ -431,13 +441,15 @@ def load_routers(all_apps):
             if app != 'BASE':
                 keys = set(routers[app]).intersection(ROUTER_BASE_KEYS)
                 if keys:
-                    raise SyntaxError, "BASE-only key(s) %s in router '%s'" % (tuple(keys), app)
+                    raise SyntaxError("BASE-only key(s) %s in router '%s'" % (
+                        tuple(keys), app))
             router.update(routers[app])
             routers[app] = router
         router = routers[app]
         keys = set(router).difference(ROUTER_KEYS)
         if keys:
-            raise SyntaxError, "unknown key(s) %s in router '%s'" % (tuple(keys), app)
+            raise SyntaxError("unknown key(s) %s in router '%s'" % (
+                tuple(keys), app))
         if not router.controllers:
             router.controllers = set()
         elif not isinstance(router.controllers, str):
@@ -450,10 +462,12 @@ def load_routers(all_apps):
             if isinstance(router.functions, (set, tuple, list)):
                 functions = set(router.functions)
                 if isinstance(router.default_function, str):
-                    functions.add(router.default_function)  # legacy compatibility
-                router.functions = { router.default_controller: functions }
+                    functions.add(
+                        router.default_function)  # legacy compatibility
+                router.functions = {router.default_controller: functions}
             for controller in router.functions:
-                router.functions[controller] = set(router.functions[controller])
+                router.functions[controller] = set(
+                    router.functions[controller])
         else:
             router.functions = dict()
         if app != 'BASE':
@@ -516,19 +530,20 @@ def load_routers(all_apps):
             else:
                 fcn = None
             if app not in all_apps and app not in routers:
-                raise SyntaxError, "unknown app '%s' in domains" % app
+                raise SyntaxError("unknown app '%s' in domains" % app)
             domains[(domain, port)] = (app, ctlr, fcn)
     routers.BASE.domains = domains
 
+
 def regex_uri(e, regexes, tag, default=None):
     "filter incoming URI against a list of regexes"
     path = e['PATH_INFO']
-    host = e.get('http_host', e.get('SERVER_NAME','localhost')).lower()
+    host = e.get('http_host', e.get('SERVER_NAME', 'localhost')).lower()
     i = host.find(':')
     if i > 0:
         host = host[:i]
     key = '%s:%s://%s:%s %s' % \
-        (e.get('REMOTE_ADDR','localhost'),
+        (e.get('REMOTE_ADDR', 'localhost'),
          e.get('wsgi.url_scheme', 'http').lower(), host,
          e.get('REQUEST_METHOD', 'get').lower(), path)
     for (regex, value, custom_env) in regexes:
@@ -540,6 +555,7 @@ def regex_uri(e, regexes, tag, default=None):
     log_rewrite('%s: [%s] -> %s (not rewritten)' % (tag, key, default))
     return default
 
+
 def regex_select(env=None, app=None, request=None):
     """
     select a set of regex rewrite params for the current request
@@ -553,10 +569,11 @@ def regex_select(env=None, app=None, request=None):
             app = regex_uri(env, params.routes_app, "routes_app")
             THREAD_LOCAL.routes = params_apps.get(app, params)
     else:
-        THREAD_LOCAL.routes = params # default to base rewrite parameters
+        THREAD_LOCAL.routes = params  # default to base rewrite parameters
     log_rewrite("select routing parameters: %s" % THREAD_LOCAL.routes.name)
     return app  # for doctest
 
+
 def regex_filter_in(e):
     "regex rewrite incoming URL"
     routes = THREAD_LOCAL.routes
@@ -567,7 +584,7 @@ def regex_filter_in(e):
                          "routes_in", e['PATH_INFO'])
         rmatch = regex_redirect.match(path)
         if rmatch:
-            raise HTTP(int(rmatch.group(1)),location=rmatch.group(2))
+            raise HTTP(int(rmatch.group(1)), location=rmatch.group(2))
         items = path.split('?', 1)
         e['PATH_INFO'] = items[0]
         if len(items) > 1:
@@ -581,7 +598,8 @@ def regex_filter_in(e):
 
 
 def sluggify(key):
-    return key.lower().replace('.','_')
+    return key.lower().replace('.', '_')
+
 
 def regex_url_in(request, environ):
     "rewrite and parse incoming URL"
@@ -596,26 +614,28 @@ def regex_url_in(request, environ):
     routes = THREAD_LOCAL.routes
     if routes.routes_in:
         environ = regex_filter_in(environ)
-    request.env.update((k.lower().replace('.','_'),v) for k,v in environ.iteritems())
+    request.env.update(
+        (k.lower().replace('.', '_'), v) for k, v in environ.iteritems())
 
     # ##################################################
     # serve if a static file
     # ##################################################
 
     path = request.env.path_info.replace('\\', '/') or '/'
-    path = regex_space.sub('_',path)
-    if path.endswith('/') and len(path)>1: path = path[:-1]
+    path = regex_space.sub('_', path)
+    if path.endswith('/') and len(path) > 1:
+        path = path[:-1]
     match = regex_url.match(path)
     if not match:
         raise HTTP(400,
                    routes.error_message % 'invalid request',
                    web2py_error='invalid path')
-    elif match.group('c')=='static':
+    elif match.group('c') == 'static':
         application = match.group('a')
         version, filename = None, match.group('z')
-        items = filename.split('/',1)
+        items = filename.split('/', 1)
         if regex_version.match(items[0]):
-            version,filename = items
+            version, filename = items
         static_file = pjoin(request.env.applications_parent,
                             'applications', application,
                             'static', filename)
@@ -655,9 +675,9 @@ def regex_filter_out(url, e=None):
             if i > 0:
                 host = host[:i]
             items[0] = '%s:%s://%s:%s %s' % \
-                 (e.get('remote_addr', ''),
-                  e.get('wsgi_url_scheme', 'http').lower(), host,
-                  e.get('request_method', 'get').lower(), items[0])
+                (e.get('remote_addr', ''),
+                 e.get('wsgi_url_scheme', 'http').lower(), host,
+                 e.get('request_method', 'get').lower(), items[0])
         else:
             items[0] = ':http://localhost:get %s' % items[0]
         for (regex, value, tmp) in routes.routes_out:
@@ -671,7 +691,7 @@ def regex_filter_out(url, e=None):
 
 def filter_url(url, method='get', remote='0.0.0.0',
                out=False, app=False, lang=None,
-               domain=(None,None), env=False, scheme=None,
+               domain=(None, None), env=False, scheme=None,
                host=None, port=None):
     """
     doctest/unittest interface to regex_filter_in() and regex_filter_out()
@@ -685,21 +705,21 @@ def filter_url(url, method='get', remote='0.0.0.0',
         k = len(uri)
     if isinstance(domain, str):
         domain = (domain, None)
-    (path_info, query_string) = (uri[:k], uri[k+1:])
+    (path_info, query_string) = (uri[:k], uri[k + 1:])
     path_info = urllib.unquote(path_info)   # simulate server
     e = {
-         'REMOTE_ADDR': remote,
-         'REQUEST_METHOD': method,
-         'wsgi.url_scheme': urlscheme,
-         'HTTP_HOST': urlhost,
-         'REQUEST_URI': uri,
-         'PATH_INFO': path_info,
-         'QUERY_STRING': query_string,
-         #for filter_out request.env use lowercase
-         'remote_addr': remote,
-         'request_method': method,
-         'wsgi_url_scheme': urlscheme,
-         'http_host': urlhost
+        'REMOTE_ADDR': remote,
+        'REQUEST_METHOD': method,
+        'wsgi.url_scheme': urlscheme,
+        'HTTP_HOST': urlhost,
+        'REQUEST_URI': uri,
+        'PATH_INFO': path_info,
+        'QUERY_STRING': query_string,
+        #for filter_out request.env use lowercase
+        'remote_addr': remote,
+        'request_method': method,
+        'wsgi_url_scheme': urlscheme,
+        'http_host': urlhost
     }
 
     request = Storage()
@@ -717,17 +737,19 @@ def filter_url(url, method='get', remote='0.0.0.0',
     #  rewrite outbound URL
     #
     if out:
-        (request.env.domain_application, request.env.domain_controller) = domain
+        (request.env.domain_application,
+         request.env.domain_controller) = domain
         items = path_info.lstrip('/').split('/')
         if items[-1] == '':
-            items.pop() # adjust trailing empty args
+            items.pop()  # adjust trailing empty args
         assert len(items) >= 3, "at least /a/c/f is required"
         a = items.pop(0)
         c = items.pop(0)
         f = items.pop(0)
         if not routers:
             return regex_filter_out(uri, e)
-        acf = map_url_out(request, None, a, c, f, items, None, scheme, host, port)
+        acf = map_url_out(
+            request, None, a, c, f, items, None, scheme, host, port)
         if items:
             url = '%s/%s' % (acf, '/'.join(items))
             if items[-1] == '':
@@ -743,7 +765,8 @@ def filter_url(url, method='get', remote='0.0.0.0',
     (static, version, e) = url_in(request, e)
     if static:
         return static
-    result = "/%s/%s/%s" % (request.application, request.controller, request.function)
+    result = "/%s/%s/%s" % (
+        request.application, request.controller, request.function)
     if request.extension and request.extension != 'html':
         result += ".%s" % request.extension
     if request.args:
@@ -762,22 +785,24 @@ def filter_err(status, application='app', ticket='tkt'):
     routes = THREAD_LOCAL.routes
     if status > 399 and routes.routes_onerror:
         keys = set(('%s/%s' % (application, status),
-                  '%s/*' % (application),
-                  '*/%s' % (status),
-                  '*/*'))
-        for (key,redir) in routes.routes_onerror:
+                    '%s/*' % (application),
+                    '*/%s' % (status),
+                    '*/*'))
+        for (key, redir) in routes.routes_onerror:
             if key in keys:
                 if redir == '!':
                     break
                 elif '?' in redir:
-                    url = redir + '&' + 'code=%s&ticket=%s' % (status,ticket)
+                    url = redir + '&' + 'code=%s&ticket=%s' % (status, ticket)
                 else:
-                    url = redir + '?' + 'code=%s&ticket=%s' % (status,ticket)
-                return url # redirection
-    return status # no action
+                    url = redir + '?' + 'code=%s&ticket=%s' % (status, ticket)
+                return url  # redirection
+    return status  # no action
 
 #  router support
 #
+
+
 class MapUrlIn(object):
     "logic for mapping incoming URLs"
 
@@ -804,7 +829,8 @@ class MapUrlIn(object):
         self.query = self.env.get('QUERY_STRING', None)
         path = path.lstrip('/')
         self.env['PATH_INFO'] = '/' + path
-        self.env['WEB2PY_ORIGINAL_URI'] = self.env['PATH_INFO'] + (self.query and ('?' + self.query) or '')
+        self.env['WEB2PY_ORIGINAL_URI'] = self.env['PATH_INFO'] + (
+            self.query and ('?' + self.query) or '')
 
         # to handle empty args, strip exactly one trailing slash, if present
         # .../arg1// represents one trailing empty arg
@@ -814,12 +840,13 @@ class MapUrlIn(object):
         self.args = List(path and path.split('/') or [])
 
         # see http://www.python.org/dev/peps/pep-3333/#url-reconstruction for URL composition
-        self.remote_addr = self.env.get('REMOTE_ADDR','localhost')
+        self.remote_addr = self.env.get('REMOTE_ADDR', 'localhost')
         self.scheme = self.env.get('wsgi.url_scheme', 'http').lower()
         self.method = self.env.get('REQUEST_METHOD', 'get').lower()
         (self.host, self.port) = (self.env.get('HTTP_HOST'), None)
         if not self.host:
-            (self.host, self.port) = (self.env.get('SERVER_NAME'), self.env.get('SERVER_PORT'))
+            (self.host, self.port) = (
+                self.env.get('SERVER_NAME'), self.env.get('SERVER_PORT'))
         if not self.host:
             (self.host, self.port) = ('localhost', '80')
         if ':' in self.host:
@@ -837,7 +864,7 @@ class MapUrlIn(object):
             for i in xrange(prefixlen):
                 if prefix[i] != self.args[i]:
                     return  # prefix didn't match
-            self.args = List(self.args[prefixlen:]) # strip the prefix
+            self.args = List(self.args[prefixlen:])  # strip the prefix
 
     def map_app(self):
         "determine application name"
@@ -851,12 +878,14 @@ class MapUrlIn(object):
         elif not base.exclusive_domain and arg0 and not base.applications:
             self.application = arg0
         elif (self.host, self.port) in base.domains:
-            (self.application, self.domain_controller, self.domain_function) = base.domains[(self.host, self.port)]
+            (self.application, self.domain_controller,
+             self.domain_function) = base.domains[(self.host, self.port)]
             self.env['domain_application'] = self.application
             self.env['domain_controller'] = self.domain_controller
             self.env['domain_function'] = self.domain_function
         elif (self.host, None) in base.domains:
-            (self.application, self.domain_controller, self.domain_function) = base.domains[(self.host, None)]
+            (self.application, self.domain_controller,
+             self.domain_function) = base.domains[(self.host, None)]
             self.env['domain_application'] = self.application
             self.env['domain_controller'] = self.domain_controller
             self.env['domain_function'] = self.domain_function
@@ -869,12 +898,14 @@ class MapUrlIn(object):
         self.pop_arg_if(self.application == arg0)
 
         if not base._acfe_match.match(self.application):
-            raise HTTP(400, THREAD_LOCAL.routes.error_message % 'invalid request',
-                       web2py_error="invalid application: '%s'" % self.application)
+            raise HTTP(
+                400, THREAD_LOCAL.routes.error_message % 'invalid request',
+                web2py_error="invalid application: '%s'" % self.application)
 
         if self.application not in routers and \
-          (self.application != THREAD_LOCAL.routes.default_application or self.application == 'welcome'):
-            raise HTTP(400, THREAD_LOCAL.routes.error_message % 'invalid request',
+                (self.application != THREAD_LOCAL.routes.default_application or self.application == 'welcome'):
+            raise HTTP(
+                400, THREAD_LOCAL.routes.error_message % 'invalid request',
                 web2py_error="unknown application: '%s'" % self.application)
 
         #  set the application router
@@ -908,8 +939,8 @@ class MapUrlIn(object):
         if len(self.args) == 1 and self.arg0 in self.router.root_static:
             self.controller = self.request.controller = 'static'
             root_static_file = pjoin(self.request.env.applications_parent,
-                                   'applications', self.application,
-                                   self.controller, self.arg0)
+                                     'applications', self.application,
+                                     self.controller, self.arg0)
             log_rewrite("route: root static=%s" % root_static_file)
             return root_static_file, None
         return None, None
@@ -938,8 +969,9 @@ class MapUrlIn(object):
         self.pop_arg_if(arg0 == self.controller)
         log_rewrite("route: controller=%s" % self.controller)
         if not self.router._acfe_match.match(self.controller):
-            raise HTTP(400, THREAD_LOCAL.routes.error_message % 'invalid request',
-                       web2py_error='invalid controller')
+            raise HTTP(
+                400, THREAD_LOCAL.routes.error_message % 'invalid request',
+                web2py_error='invalid controller')
 
     def map_static(self):
         '''
@@ -962,7 +994,8 @@ class MapUrlIn(object):
             # match path elements
             bad_static = False
             for name in self.args:
-                bad_static = bad_static or name in ('', '.', '..') or not self.router._file_match.match(name)
+                bad_static = bad_static or name in (
+                    '', '.', '..') or not self.router._file_match.match(name)
         if bad_static:
             log_rewrite('bad static path=%s' % file)
             raise HTTP(400,
@@ -990,9 +1023,10 @@ class MapUrlIn(object):
         arg0 = self.harg0    # map hyphens
         functions = self.functions.get(self.controller, set())
         if isinstance(self.router.default_function, dict):
-            default_function = self.router.default_function.get(self.controller, None)
+            default_function = self.router.default_function.get(
+                self.controller, None)
         else:
-            default_function = self.router.default_function # str or None
+            default_function = self.router.default_function  # str or None
         default_function = self.domain_function or default_function
         if not arg0 or functions and arg0 not in functions:
             self.function = default_function or ""
@@ -1005,14 +1039,17 @@ class MapUrlIn(object):
             else:
                 self.function = arg0
             self.pop_arg_if(True)
-        log_rewrite("route: function.ext=%s.%s" % (self.function, self.extension))
+        log_rewrite(
+            "route: function.ext=%s.%s" % (self.function, self.extension))
 
         if not self.router._acfe_match.match(self.function):
-            raise HTTP(400, THREAD_LOCAL.routes.error_message % 'invalid request',
-                       web2py_error='invalid function')
+            raise HTTP(
+                400, THREAD_LOCAL.routes.error_message % 'invalid request',
+                web2py_error='invalid function')
         if self.extension and not self.router._acfe_match.match(self.extension):
-            raise HTTP(400, THREAD_LOCAL.routes.error_message % 'invalid request',
-                       web2py_error='invalid extension')
+            raise HTTP(
+                400, THREAD_LOCAL.routes.error_message % 'invalid request',
+                web2py_error='invalid extension')
 
     def validate_args(self):
         '''
@@ -1020,13 +1057,14 @@ class MapUrlIn(object):
         '''
         for arg in self.args:
             if not self.router._args_match.match(arg):
-                raise HTTP(400, THREAD_LOCAL.routes.error_message % 'invalid request',
-                           web2py_error='invalid arg <%s>' % arg)
+                raise HTTP(
+                    400, THREAD_LOCAL.routes.error_message % 'invalid request',
+                    web2py_error='invalid arg <%s>' % arg)
 
     def sluggify(self):
         ""
         self.request.env.update(
-            (k.lower().replace('.','_'),v) for k,v in self.env.iteritems())
+            (k.lower().replace('.', '_'), v) for k, v in self.env.iteritems())
 
     def update_request(self):
         '''
@@ -1053,7 +1091,8 @@ class MapUrlIn(object):
         uri = '/%s%s%s%s' % (
             app,
             uri,
-            urllib.quote('/'+'/'.join(str(x) for x in self.args)) if self.args else '',
+            urllib.quote('/' + '/'.join(
+                str(x) for x in self.args)) if self.args else '',
             ('?' + self.query) if self.query else '')
         self.env['REQUEST_URI'] = uri
         self.sluggify()
@@ -1075,6 +1114,7 @@ class MapUrlIn(object):
         if dopop:
             self.args.pop(0)
 
+
 class MapUrlOut(object):
     "logic for mapping outgoing URLs"
 
@@ -1090,7 +1130,8 @@ class MapUrlOut(object):
         self.env = env
         self.application = application
         self.controller = controller
-        self.is_static = (controller == 'static' or controller.startswith('static/'))
+        self.is_static = (
+            controller == 'static' or controller.startswith('static/'))
         self.function = function
         self.args = args
         self.other = other
@@ -1111,12 +1152,13 @@ class MapUrlOut(object):
         self.domain_application = request and self.request.env.domain_application
         self.domain_controller = request and self.request.env.domain_controller
         if isinstance(self.router.default_function, dict):
-            self.default_function = self.router.default_function.get(self.controller, None)
+            self.default_function = self.router.default_function.get(
+                self.controller, None)
         else:
             self.default_function = self.router.default_function
 
         if (self.router.exclusive_domain and self.domain_application and self.domain_application != self.application and not self.host):
-            raise SyntaxError, 'cross-domain conflict: must specify host'
+            raise SyntaxError('cross-domain conflict: must specify host')
 
         lang = request and request.uri_language
         if lang and self.languages and lang in self.languages:
@@ -1237,7 +1279,7 @@ class MapUrlOut(object):
             return None         # use regex filter
         self.omit_lang()        # try to omit language
         self.omit_acf()         # try to omit a/c/f
-        return self.build_acf() # build and return the /a/lang/c/f string
+        return self.build_acf()  # build and return the /a/lang/c/f string
 
 
 def map_url_in(request, env, app=False):
@@ -1259,7 +1301,8 @@ def map_url_in(request, env, app=False):
     if app:
         return map.application
 
-    root_static_file, version = map.map_root_static() # handle root-static files
+    root_static_file, version = map.map_root_static(
+    )  # handle root-static files
     if root_static_file:
         map.update_request()
         return (root_static_file, version, map.env)
@@ -1280,6 +1323,7 @@ def map_url_in(request, env, app=False):
     map.update_request()
     return (None, None, map.env)
 
+
 def map_url_out(request, env, application, controller,
                 function, args, other, scheme, host, port):
     '''
@@ -1311,6 +1355,7 @@ def map_url_out(request, env, application, controller,
                     function, args, other, scheme, host, port)
     return map.acf()
 
+
 def get_effective_router(appname):
     "return a private copy of the effective router for the specified application"
     if not routers or appname not in routers:
diff --git a/gluon/rocket.py b/gluon/rocket.py
index d8e832ae..af5e7133 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -16,21 +16,23 @@ import traceback
 VERSION = '1.2.5'
 SERVER_NAME = socket.gethostname()
 SERVER_SOFTWARE = 'Rocket %s' % VERSION
-HTTP_SERVER_SOFTWARE = '%s Python/%s' % (SERVER_SOFTWARE, sys.version.split(' ')[0])
+HTTP_SERVER_SOFTWARE = '%s Python/%s' % (
+    SERVER_SOFTWARE, sys.version.split(' ')[0])
 BUF_SIZE = 16384
-SOCKET_TIMEOUT = 10 # in secs
-THREAD_STOP_CHECK_INTERVAL = 1 # in secs, How often should threads check for a server stop message?
-IS_JYTHON = platform.system() == 'Java' # Handle special cases for Jython
+SOCKET_TIMEOUT = 10  # in secs
+THREAD_STOP_CHECK_INTERVAL = 1  # in secs, How often should threads check for a server stop message?
+IS_JYTHON = platform.system() == 'Java'  # Handle special cases for Jython
 IGNORE_ERRORS_ON_CLOSE = set([errno.ECONNABORTED, errno.ECONNRESET])
 DEFAULT_LISTEN_QUEUE_SIZE = 5
 DEFAULT_MIN_THREADS = 10
 DEFAULT_MAX_THREADS = 0
-DEFAULTS = dict(LISTEN_QUEUE_SIZE = DEFAULT_LISTEN_QUEUE_SIZE,
-                MIN_THREADS = DEFAULT_MIN_THREADS,
-                MAX_THREADS = DEFAULT_MAX_THREADS)
+DEFAULTS = dict(LISTEN_QUEUE_SIZE=DEFAULT_LISTEN_QUEUE_SIZE,
+                MIN_THREADS=DEFAULT_MIN_THREADS,
+                MAX_THREADS=DEFAULT_MAX_THREADS)
 
 PY3K = sys.version_info[0] > 2
 
+
 class NullHandler(logging.Handler):
     "A Logging handler to prevent library errors."
     def emit(self, record):
@@ -94,6 +96,7 @@ except ImportError:
 # TODO - This part is still very experimental.
 #from .filelike import FileLikeSocket
 
+
 class Connection(object):
     __slots__ = [
         'setblocking',
@@ -170,6 +173,7 @@ except ImportError:
 # Import Package Modules
 # package imports removed in monolithic build
 
+
 class FileLikeSocket(object):
     def __init__(self, conn, buf_size=BUF_SIZE):
         self.conn = conn
@@ -317,13 +321,12 @@ class WSGIFuture(Future):
         else:
             return super(WSGIFuture, self).set_running_or_notify_cancel()
 
-
     def remember(self, name, lifespan=None):
         self._lifespan = lifespan or self._lifespan
 
         if name in self._mem_dict:
-            raise NameError('Cannot remember future by name "%s".  ' % name + \
-                            'A future already exists with that name.' )
+            raise NameError('Cannot remember future by name "%s".  ' % name +
+                            'A future already exists with that name.')
         self._name = name
         self._mem_dict[name] = self
 
@@ -334,6 +337,7 @@ class WSGIFuture(Future):
             del self._mem_dict[self._name]
             self._name = None
 
+
 class _WorkItem(object):
     def __init__(self, future, fn, args, kwargs):
         self.future = future
@@ -353,6 +357,7 @@ class _WorkItem(object):
         else:
             self.future.set_result(result)
 
+
 class WSGIExecutor(ThreadPoolExecutor):
     multithread = True
     multiprocess = False
@@ -366,7 +371,8 @@ class WSGIExecutor(ThreadPoolExecutor):
         if self._shutdown_lock.acquire():
             if self._shutdown:
                 self._shutdown_lock.release()
-                raise RuntimeError('Cannot schedule new futures after shutdown')
+                raise RuntimeError(
+                    'Cannot schedule new futures after shutdown')
 
             f = WSGIFuture(self.futures)
             w = _WorkItem(f, fn, args, kwargs)
@@ -378,6 +384,7 @@ class WSGIExecutor(ThreadPoolExecutor):
         else:
             return False
 
+
 class FuturesMiddleware(object):
     "Futures middleware that adds a Futures Executor to the environment"
     def __init__(self, app, threads=5):
@@ -405,11 +412,13 @@ try:
     has_ssl = True
 except ImportError:
     has_ssl = False
+
     class SSLError(socket.error):
         pass
 # Import Package Modules
 # package imports removed in monolithic build
 
+
 class Listener(Thread):
     """The Listener class is a class responsible for accepting connections
     and queuing them to be processed by a worker thread."""
@@ -446,18 +455,18 @@ class Listener(Thread):
             elif not os.path.exists(interface[2]):
                 data = (interface[2], interface[0], interface[1])
                 self.err_log.error("Cannot find key file "
-                          "'%s'.  Cannot bind to %s:%s" % data)
+                                   "'%s'.  Cannot bind to %s:%s" % data)
                 return
             elif not os.path.exists(interface[3]):
                 data = (interface[3], interface[0], interface[1])
                 self.err_log.error("Cannot find certificate file "
-                          "'%s'.  Cannot bind to %s:%s" % data)
+                                   "'%s'.  Cannot bind to %s:%s" % data)
                 return
 
             if self.clientcert_req and not os.path.exists(interface[4]):
                 data = (interface[4], interface[0], interface[1])
                 self.err_log.error("Cannot find root ca certificate file "
-                          "'%s'.  Cannot bind to %s:%s" % data)
+                                   "'%s'.  Cannot bind to %s:%s" % data)
                 return
 
         # Set socket options
@@ -499,18 +508,18 @@ class Listener(Thread):
                 ca_certs = self.interface[4]
                 cert_reqs = ssl.CERT_OPTIONAL
                 sock = ssl.wrap_socket(sock,
-                                       keyfile = self.interface[2],
-                                       certfile = self.interface[3],
-                                       server_side = True,
-                                       cert_reqs = cert_reqs,
-                                       ca_certs = ca_certs,
-                                       ssl_version = ssl.PROTOCOL_SSLv23)
+                                       keyfile=self.interface[2],
+                                       certfile=self.interface[3],
+                                       server_side=True,
+                                       cert_reqs=cert_reqs,
+                                       ca_certs=ca_certs,
+                                       ssl_version=ssl.PROTOCOL_SSLv23)
             else:
                 sock = ssl.wrap_socket(sock,
-                                       keyfile = self.interface[2],
-                                       certfile = self.interface[3],
-                                       server_side = True,
-                                       ssl_version = ssl.PROTOCOL_SSLv23)
+                                       keyfile=self.interface[2],
+                                       certfile=self.interface[3],
+                                       server_side=True,
+                                       ssl_version=ssl.PROTOCOL_SSLv23)
 
         except SSLError:
             # Generally this happens when an HTTP request is received on a
@@ -598,19 +607,17 @@ except ImportError:
 # package imports removed in monolithic build
 
 
-
-
-
 # Setup Logging
 log = logging.getLogger('Rocket')
 log.addHandler(NullHandler())
 
+
 class Rocket(object):
     """The Rocket class is responsible for handling threads and accepting and
     dispatching connections."""
 
     def __init__(self,
-                 interfaces = ('127.0.0.1', 8000),
+                 interfaces=('127.0.0.1', 8000),
                  method = 'wsgi',
                  app_info = None,
                  min_threads = None,
@@ -650,15 +657,16 @@ class Rocket(object):
         self.active_queue = Queue()
 
         self._threadpool = ThreadPool(get_method(method),
-                                      app_info = app_info,
-                                      active_queue = self.active_queue,
-                                      monitor_queue = self.monitor_queue,
-                                      min_threads = min_threads,
-                                      max_threads = max_threads)
+                                      app_info=app_info,
+                                      active_queue=self.active_queue,
+                                      monitor_queue=self.monitor_queue,
+                                      min_threads=min_threads,
+                                      max_threads=max_threads)
 
         # Build our socket listeners
-        self.listeners = [Listener(i, queue_size, self.active_queue) for i in self.interfaces]
-        for ndx in range(len(self.listeners)-1, 0, -1):
+        self.listeners = [Listener(
+            i, queue_size, self.active_queue) for i in self.interfaces]
+        for ndx in range(len(self.listeners) - 1, 0, -1):
             if not self.listeners[ndx].ready:
                 del self.listeners[ndx]
 
@@ -705,7 +713,8 @@ class Rocket(object):
             str_extract = lambda l: (l.addr, l.port, l.secure and '*' or '')
 
             msg = 'Listening on sockets: '
-            msg += ', '.join(['%s:%i%s' % str_extract(l) for l in self.listeners])
+            msg += ', '.join(
+                ['%s:%i%s' % str_extract(l) for l in self.listeners])
             log.info(msg)
 
             for l in self.listeners:
@@ -730,7 +739,7 @@ class Rocket(object):
 
         return self.stop()
 
-    def stop(self, stoplogging = False):
+    def stop(self, stoplogging=False):
         log.info('Stopping %s' % SERVER_SOFTWARE)
 
         self.startstop_lock.acquire()
@@ -773,23 +782,24 @@ class Rocket(object):
         self.stop()
         self.start()
 
+
 def CherryPyWSGIServer(bind_addr,
                        wsgi_app,
-                       numthreads = 10,
-                       server_name = None,
-                       max = -1,
-                       request_queue_size = 5,
-                       timeout = 10,
-                       shutdown_timeout = 5):
+                       numthreads=10,
+                       server_name=None,
+                       max=-1,
+                       request_queue_size=5,
+                       timeout=10,
+                       shutdown_timeout=5):
     """ A Cherrypy wsgiserver-compatible wrapper. """
     max_threads = max
     if max_threads < 0:
         max_threads = 0
     return Rocket(bind_addr, 'wsgi', {'wsgi_app': wsgi_app},
-                  min_threads = numthreads,
-                  max_threads = max_threads,
-                  queue_size = request_queue_size,
-                  timeout = timeout)
+                  min_threads=numthreads,
+                  max_threads=max_threads,
+                  queue_size=request_queue_size,
+                  timeout=timeout)
 
 # Monolithic build...end of module: rocket\main.py
 # Monolithic build...start of module: rocket\monitor.py
@@ -803,6 +813,7 @@ from threading import Thread
 # Import Package Modules
 # package imports removed in monolithic build
 
+
 class Monitor(Thread):
     # Monitor worker class.
 
@@ -926,8 +937,10 @@ class Monitor(Thread):
                 for c in stale:
                     if __debug__:
                         # "EXPR and A or B" kept for Py2.4 compatibility
-                        data = (c.client_addr, c.server_port, c.ssl and '*' or '')
-                        self.log.debug('Flushing stale connection: %s:%i%s' % data)
+                        data = (
+                            c.client_addr, c.server_port, c.ssl and '*' or '')
+                        self.log.debug(
+                            'Flushing stale connection: %s:%i%s' % data)
 
                     self.connections.remove(c)
                     list_changed = True
@@ -940,7 +953,6 @@ class Monitor(Thread):
             # Dynamically resize the threadpool to adapt to our changing needs.
             self._threadpool.dynamic_resize()
 
-
     def stop(self):
         self.active = False
 
@@ -984,6 +996,7 @@ import logging
 log = logging.getLogger('Rocket.Errors.ThreadPool')
 log.addHandler(NullHandler())
 
+
 class ThreadPool:
     """The ThreadPool class is a container class for all the worker threads. It
     manages the number of actively running threads."""
@@ -1011,7 +1024,7 @@ class ThreadPool:
         self.alive = False
 
         # TODO - Optimize this based on some real-world usage data
-        self.grow_threshold = int(max_threads/10) + 2
+        self.grow_threshold = int(max_threads / 10) + 2
 
         if not isinstance(app_info, dict):
             app_info = dict()
@@ -1193,7 +1206,9 @@ Content-Type: %s
 %s
 '''
 if IS_JYTHON:
-    HTTP_METHODS = set(['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'CONNECT'])
+    HTTP_METHODS = set(['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT',
+                       'DELETE', 'TRACE', 'CONNECT'])
+
 
 class Worker(Thread):
     """The Worker class is a base class responsible for receiving connections
@@ -1223,7 +1238,7 @@ class Worker(Thread):
         self.req_log.addHandler(NullHandler())
 
         # Error Log
-        self.err_log = logging.getLogger('Rocket.Errors.'+self.getName())
+        self.err_log = logging.getLogger('Rocket.Errors.' + self.getName())
         self.err_log.addHandler(NullHandler())
 
     def _handleError(self, typ, val, tb):
@@ -1301,11 +1316,11 @@ class Worker(Thread):
                     self.err_log.debug('Serving a request')
                 try:
                     self.run_app(conn)
-                    log_info = dict(client_ip = conn.client_addr,
-                                    time = datetime.now().strftime('%c'),
-                                    status = self.status.split(' ')[0],
-                                    size = self.size,
-                                    request_line = self.request_line)
+                    log_info = dict(client_ip=conn.client_addr,
+                                    time=datetime.now().strftime('%c'),
+                                    status=self.status.split(' ')[0],
+                                    size=self.size,
+                                    request_line=self.request_line)
                     self.req_log.info(LOG_LINE % log_info)
                 except:
                     exc = sys.exc_info()
@@ -1314,11 +1329,12 @@ class Worker(Thread):
                         break
                     else:
                         if self.request_line:
-                            log_info = dict(client_ip = conn.client_addr,
-                                            time = datetime.now().strftime('%c'),
-                                            status = self.status.split(' ')[0],
-                                            size = self.size,
-                                            request_line = self.request_line + ' - not stopping')
+                            log_info = dict(client_ip=conn.client_addr,
+                                            time=datetime.now(
+                                            ).strftime('%c'),
+                                            status=self.status.split(' ')[0],
+                                            size=self.size,
+                                            request_line=self.request_line + ' - not stopping')
                             self.req_log.info(LOG_LINE % log_info)
 
                 if self.closeConnection:
@@ -1382,13 +1398,15 @@ class Worker(Thread):
         except socket.timeout:
             raise SocketTimeout("Socket timed out before request.")
         except TypeError:
-            raise SocketClosed("ssl bug caused closer of socket, upgrade to python 2.7")
+            raise SocketClosed(
+                "ssl bug caused closer of socket, upgrade to python 2.7")
 
         d = d.strip()
 
         if not d:
             if __debug__:
-                self.err_log.debug('Client did not send a recognizable request.')
+                self.err_log.debug(
+                    'Client did not send a recognizable request.')
             raise SocketClosed('Client closed socket.')
 
         self.request_line = d
@@ -1408,11 +1426,12 @@ class Worker(Thread):
             raise BadRequest
 
         req = match.groupdict()
-        for k,v in req.iteritems():
+        for k, v in req.iteritems():
             if not v:
                 req[k] = ""
             if k == 'path':
-                req['path'] = r'%2F'.join([unquote(x) for x in re_SLASH.split(v)])
+                req['path'] = r'%2F'.join(
+                    [unquote(x) for x in re_SLASH.split(v)])
 
         return req
 
@@ -1421,15 +1440,15 @@ class Worker(Thread):
         try:
             method, uri, proto = d.split(' ')
             if not proto.startswith('HTTP') or \
-               proto[-3:] not in ('1.0', '1.1') or \
-               method not in HTTP_METHODS:
+                proto[-3:] not in ('1.0', '1.1') or \
+                    method not in HTTP_METHODS:
                 self.send_response('400 Bad Request')
                 raise BadRequest
         except ValueError:
             self.send_response('400 Bad Request')
             raise BadRequest
 
-        req = dict(method=method, protocol = proto)
+        req = dict(method=method, protocol=proto)
         scheme = ''
         host = ''
         if uri == '*' or uri.startswith('/'):
@@ -1454,7 +1473,6 @@ class Worker(Thread):
                    host=host)
         return req
 
-
     def read_headers(self, sock_file, environ):
         try:
             lname = None
@@ -1464,9 +1482,10 @@ class Worker(Thread):
                     try:
                         l = str(l, 'ISO-8859-1')
                     except UnicodeDecodeError:
-                        self.err_log.warning('Invalid request header: '+repr(l))
+                        self.err_log.warning(
+                            'Invalid request header: ' + repr(l))
 
-                if l.strip().replace('\0','') == '':
+                if l.strip().replace('\0', '') == '':
                     break
                 elif l[0] in ' \t' and lname:
                     # Some headers take more than one line
@@ -1476,25 +1495,30 @@ class Worker(Thread):
                     l = l.split(':', 1)
                     # HTTP header names are us-ascii encoded
 
-                    lname = str('HTTP_'+l[0].strip().upper().replace('-', '_'))
+                    lname = str(
+                        'HTTP_' + l[0].strip().upper().replace('-', '_'))
                     lval = str(l[-1].strip())
                     environ[lname] = lval
 
         except socket.timeout:
             raise SocketTimeout("Socket timed out before request.")
 
+
 class SocketTimeout(Exception):
     "Exception for when a socket times out between requests."
     pass
 
+
 class BadRequest(Exception):
     "Exception for when a client sends an incomprehensible request."
     pass
 
+
 class SocketClosed(Exception):
     "Exception for when a socket is closed by the client."
     pass
 
+
 class ChunkedReader(object):
     def __init__(self, sock_file):
         self.stream = sock_file
@@ -1542,6 +1566,7 @@ class ChunkedReader(object):
     def readlines(self):
         yield self.readline()
 
+
 def get_method(method):
     methods = dict(wsgi=WSGIWorker)
     return methods[method.lower()]
@@ -1559,7 +1584,6 @@ from wsgiref.util import FileWrapper
 # package imports removed in monolithic build
 
 
-
 if PY3K:
     from email.utils import formatdate
 else:
@@ -1578,6 +1602,7 @@ BASE_ENV = {'SERVER_NAME': SERVER_NAME,
             'wsgi.file_wrapper': FileWrapper
             }
 
+
 class WSGIWorker(Worker):
     def __init__(self, *args, **kwargs):
         """Builds some instance variables that will last the life of the
@@ -1588,9 +1613,10 @@ class WSGIWorker(Worker):
             multithreaded = self.app_info.get('max_threads') != 1
         else:
             multithreaded = False
-        self.base_environ = dict({'SERVER_SOFTWARE': self.app_info['server_software'],
-                                  'wsgi.multithread': multithreaded,
-                                  })
+        self.base_environ = dict(
+            {'SERVER_SOFTWARE': self.app_info['server_software'],
+             'wsgi.multithread': multithreaded,
+             })
         self.base_environ.update(BASE_ENV)
 
         # Grab our application
@@ -1614,7 +1640,7 @@ class WSGIWorker(Worker):
         environ = self.base_environ.copy()
 
         # Grab the headers
-        self.read_headers(sock_file,environ)
+        self.read_headers(sock_file, environ)
 
         # Add CGI Variables
         environ['SERVER_PORT'] = str(conn.server_port)
@@ -1644,7 +1670,7 @@ class WSGIWorker(Worker):
                 peercert = conn.socket.getpeercert(binary_form=True)
                 environ['SSL_CLIENT_RAW_CERT'] = \
                     peercert and ssl.DER_cert_to_PEM_cert(peercert)
-            except Exception,e:
+            except Exception, e:
                 print e
 
         if environ.get('HTTP_TRANSFER_ENCODING', '') == 'chunked':
@@ -1822,7 +1848,7 @@ class WSGIWorker(Worker):
             if __debug__:
                 self.err_log.debug('Finally closing output and sock_file')
 
-            if hasattr(output,'close'):
+            if hasattr(output, 'close'):
                 output.close()
 
             sock_file.close()
@@ -1833,19 +1859,21 @@ class WSGIWorker(Worker):
 # the following code is not part of Rocket but was added in web2py for testing purposes
 #
 
+
 def demo_app(environ, start_response):
     global static_folder
     import os
-    types = {'htm': 'text/html','html': 'text/html','gif': 'image/gif',
-             'jpg': 'image/jpeg','png': 'image/png','pdf': 'applications/pdf'}
+    types = {'htm': 'text/html', 'html': 'text/html', 'gif': 'image/gif',
+             'jpg': 'image/jpeg', 'png': 'image/png', 'pdf': 'applications/pdf'}
     if static_folder:
         if not static_folder.startswith('/'):
-            static_folder = os.path.join(os.getcwd(),static_folder)
-        path = os.path.join(static_folder, environ['PATH_INFO'][1:] or 'index.html')
-        type = types.get(path.split('.')[-1],'text')
+            static_folder = os.path.join(os.getcwd(), static_folder)
+        path = os.path.join(
+            static_folder, environ['PATH_INFO'][1:] or 'index.html')
+        type = types.get(path.split('.')[-1], 'text')
         if os.path.exists(path):
             try:
-                data = open(path,'rb').read()
+                data = open(path, 'rb').read()
                 start_response('200 OK', [('Content-Type', type)])
             except IOError:
                 start_response('404 NOT FOUND', [])
@@ -1858,21 +1886,22 @@ def demo_app(environ, start_response):
         data = '<html><body><h1>Hello from Rocket Web Server</h1></body></html>'
     return [data]
 
+
 def demo():
     from optparse import OptionParser
     parser = OptionParser()
-    parser.add_option("-i", "--ip", dest="ip",default="127.0.0.1",
+    parser.add_option("-i", "--ip", dest="ip", default="127.0.0.1",
                       help="ip address of the network interface")
-    parser.add_option("-p", "--port", dest="port",default="8000",
+    parser.add_option("-p", "--port", dest="port", default="8000",
                       help="post where to run web server")
-    parser.add_option("-s", "--static", dest="static",default=None,
+    parser.add_option("-s", "--static", dest="static", default=None,
                       help="folder containing static files")
     (options, args) = parser.parse_args()
     global static_folder
     static_folder = options.static
     print 'Rocket running on %s:%s' % (options.ip, options.port)
-    r=Rocket((options.ip,int(options.port)),'wsgi', {'wsgi_app':demo_app})
+    r = Rocket((options.ip, int(options.port)), 'wsgi', {'wsgi_app': demo_app})
     r.start()
 
-if __name__=='__main__':
+if __name__ == '__main__':
     demo()
diff --git a/gluon/sanitizer.py b/gluon/sanitizer.py
index 6708a983..e9ded858 100644
--- a/gluon/sanitizer.py
+++ b/gluon/sanitizer.py
@@ -47,12 +47,12 @@ class XssCleaner(HTMLParser):
             'code',
             'pre',
             'img/',
-            ],
+        ],
         allowed_attributes={'a': ['href', 'title'], 'img': ['src', 'alt'
-                            ], 'blockquote': ['type']},
+                                                            ], 'blockquote': ['type']},
         fmt=AbstractFormatter,
-        strip_disallowed = False
-        ):
+        strip_disallowed=False
+    ):
 
         HTMLParser.__init__(self, fmt)
         self.result = ''
@@ -103,7 +103,7 @@ class XssCleaner(HTMLParser):
         tag,
         method,
         attrs,
-        ):
+    ):
         if tag not in self.permitted_tags:
             if self.strip_disallowed:
                 self.in_disallowed = True
@@ -114,16 +114,16 @@ class XssCleaner(HTMLParser):
             if tag in self.allowed_attributes:
                 attrs = dict(attrs)
                 self.allowed_attributes_here = [x for x in
-                        self.allowed_attributes[tag] if x in attrs
-                         and len(attrs[x]) > 0]
+                                                self.allowed_attributes[tag] if x in attrs
+                                                and len(attrs[x]) > 0]
                 for attribute in self.allowed_attributes_here:
                     if attribute in ['href', 'src', 'background']:
                         if self.url_is_acceptable(attrs[attribute]):
                             bt += ' %s="%s"' % (attribute,
-                                    attrs[attribute])
+                                                attrs[attribute])
                     else:
                         bt += ' %s=%s' % (xssescape(attribute),
-                                quoteattr(attrs[attribute]))
+                                          quoteattr(attrs[attribute]))
             if bt == '<a' or bt == '<img':
                 return
             if tag in self.requires_no_close:
@@ -168,7 +168,8 @@ class XssCleaner(HTMLParser):
           content, otherwise remove it
         """
 
-        if not isinstance(rawstring, str): return str(rawstring)
+        if not isinstance(rawstring, str):
+            return str(rawstring)
         for tag in self.requires_no_close:
             rawstring = rawstring.replace("<%s/>" % tag, "<%s />" % tag)
         if not escape:
@@ -209,16 +210,17 @@ def sanitize(text, permitted_tags=[
         'code',
         'pre',
         'img/',
-        'h1','h2','h3','h4','h5','h6',
-        'table','tr','td','div',
-        ],
-             allowed_attributes = {
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+        'table', 'tr', 'td', 'div',
+],
+    allowed_attributes={
         'a': ['href', 'title'],
         'img': ['src', 'alt'],
         'blockquote': ['type'],
         'td': ['colspan'],
-        },
-             escape=True):
-    if not isinstance(text, str): return str(text)
+    },
+        escape=True):
+    if not isinstance(text, str):
+        return str(text)
     return XssCleaner(permitted_tags=permitted_tags,
                       allowed_attributes=allowed_attributes).strip(text, escape)
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 9f4a5a4a..fde13d9a 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -106,7 +106,7 @@ DISABLED = 'DISABLED'
 KILL = 'KILL'
 EXPIRED = 'EXPIRED'
 SECONDS = 1
-HEARTBEAT = 3*SECONDS
+HEARTBEAT = 3 * SECONDS
 MAXHIBERNATION = 10
 CLEAROUT = '!clear!'
 
@@ -114,20 +114,23 @@ CALLABLETYPES = (types.LambdaType, types.FunctionType,
                  types.BuiltinFunctionType,
                  types.MethodType, types.BuiltinMethodType)
 
+
 class Task(object):
-    def __init__(self,app,function,timeout,args='[]',vars='{}',**kwargs):
-        logger.debug(' new task allocated: %s.%s' % (app,function))
+    def __init__(self, app, function, timeout, args='[]', vars='{}', **kwargs):
+        logger.debug(' new task allocated: %s.%s' % (app, function))
         self.app = app
         self.function = function
         self.timeout = timeout
-        self.args = args # json
-        self.vars = vars # json
+        self.args = args  # json
+        self.vars = vars  # json
         self.__dict__.update(kwargs)
+
     def __str__(self):
         return '<Task: %s>' % self.function
 
+
 class TaskReport(object):
-    def __init__(self,status,result=None,output=None,tb=None):
+    def __init__(self, status, result=None, output=None, tb=None):
         logger.debug('    new task report: %s' % status)
         if tb:
             logger.debug('   traceback: %s' % tb)
@@ -137,19 +140,23 @@ class TaskReport(object):
         self.result = result
         self.output = output
         self.tb = tb
+
     def __str__(self):
         return '<TaskReport: %s>' % self.status
 
-def demo_function(*argv,**kwargs):
+
+def demo_function(*argv, **kwargs):
     """ test function """
     for i in range(argv[0]):
-        print 'click',i
+        print 'click', i
         time.sleep(1)
     return 'done'
 
 #the two functions below deal with simplejson decoding as unicode, esp for the dict decode
 #and subsequent usage as function Keyword arguments unicode variable names won't work!
 #borrowed from http://stackoverflow.com/questions/956867/how-to-get-string-objects-instead-unicode-ones-from-json-in-python
+
+
 def _decode_list(lst):
     newlist = []
     for i in lst:
@@ -160,19 +167,21 @@ def _decode_list(lst):
         newlist.append(i)
     return newlist
 
+
 def _decode_dict(dct):
     newdict = {}
     for k, v in dct.iteritems():
         if isinstance(k, unicode):
             k = k.encode('utf-8')
         if isinstance(v, unicode):
-             v = v.encode('utf-8')
+            v = v.encode('utf-8')
         elif isinstance(v, list):
             v = _decode_list(v)
         newdict[k] = v
     return newdict
 
-def executor(queue,task, out):
+
+def executor(queue, task, out):
     """ the background process """
     logger.debug('    task started')
 
@@ -182,11 +191,14 @@ def executor(queue,task, out):
             self.out_queue = out_queue
             self.stdout = sys.stdout
             sys.stdout = self
+
         def __del__(self):
             sys.stdout = self.stdout
+
         def flush(self):
             pass
-        def write(self,data):
+
+        def write(self, data):
             self.out_queue.put(data)
 
     stdout = LogOutput(out)
@@ -200,8 +212,8 @@ def executor(queue,task, out):
             logging.getLogger().setLevel(logging.WARN)
             # Get controller-specific subdirectory if task.app is of
             # form 'app/controller'
-            (a,c,f) = parse_path_info(task.app)
-            _env = env(a=a,c=c,import_models=True)
+            (a, c, f) = parse_path_info(task.app)
+            _env = env(a=a, c=c, import_models=True)
             logging.getLogger().setLevel(level)
             scheduler = current._scheduler
             f = task.function
@@ -212,22 +224,24 @@ def executor(queue,task, out):
             else:
                 _function = functions.get(f)
             if not isinstance(_function, CALLABLETYPES):
-                raise NameError("name '%s' not found in scheduler's environment" % f)
+                raise NameError(
+                    "name '%s' not found in scheduler's environment" % f)
             globals().update(_env)
             args = loads(task.args)
             vars = loads(task.vars, object_hook=_decode_dict)
-            result = dumps(_function(*args,**vars))
+            result = dumps(_function(*args, **vars))
         else:
             ### for testing purpose only
             result = eval(task.function)(
                 *loads(task.args, object_hook=_decode_dict),
-                 **loads(task.vars, object_hook=_decode_dict))
+                **loads(task.vars, object_hook=_decode_dict))
         queue.put(TaskReport(COMPLETED, result=result))
-    except BaseException,e:
+    except BaseException, e:
         tb = traceback.format_exc()
-        queue.put(TaskReport(FAILED,tb=tb))
+        queue.put(TaskReport(FAILED, tb=tb))
     del stdout
 
+
 class MetaScheduler(threading.Thread):
     def __init__(self):
         threading.Thread.__init__(self)
@@ -235,7 +249,7 @@ class MetaScheduler(threading.Thread):
         self.have_heartbeat = True   # set to False to kill
         self.empty_runs = 0
 
-    def async(self,task):
+    def async(self, task):
         """
         starts the background process and returns:
         ('ok',result,output)
@@ -247,7 +261,7 @@ class MetaScheduler(threading.Thread):
         sr = db.scheduler_run
         out = multiprocessing.Queue()
         queue = multiprocessing.Queue(maxsize=1)
-        p = multiprocessing.Process(target=executor,args=(queue,task,out))
+        p = multiprocessing.Process(target=executor, args=(queue, task, out))
         self.process = p
         logger.debug('   task starting')
         p.start()
@@ -264,11 +278,11 @@ class MetaScheduler(threading.Thread):
             start = time.time()
 
             while p.is_alive() and (
-                not task.timeout or time.time()-start < task.timeout):
+                    not task.timeout or time.time() - start < task.timeout):
                 if tout:
                     try:
                         logger.debug(' partial output saved')
-                        db(sr.id==task.run_id).update(output = task_output)
+                        db(sr.id == task.run_id).update(output=task_output)
                         db.commit()
                     except:
                         pass
@@ -279,7 +293,8 @@ class MetaScheduler(threading.Thread):
                 if tout:
                     logger.debug(' partial output: "%s"' % str(tout))
                     if CLEAROUT in tout:
-                        task_output = tout[tout.rfind(CLEAROUT)+len(CLEAROUT):]
+                        task_output = tout[
+                            tout.rfind(CLEAROUT) + len(CLEAROUT):]
                     else:
                         task_output += tout
         except:
@@ -322,7 +337,7 @@ class MetaScheduler(threading.Thread):
         try:
             self.process.terminate()
         except:
-            pass # no process to terminate
+            pass  # no process to terminate
 
     def run(self):
         """ the thread that sends heartbeat """
@@ -334,19 +349,19 @@ class MetaScheduler(threading.Thread):
     def start_heartbeats(self):
         self.start()
 
-    def send_heartbeat(self,counter):
+    def send_heartbeat(self, counter):
         print 'thum'
         time.sleep(1)
 
     def pop_task(self):
         return Task(
-            app = None,
-            function = 'demo_function',
-            timeout = 7,
-            args = '[2]',
-            vars = '{}')
+            app=None,
+            function='demo_function',
+            timeout=7,
+            args='[2]',
+            vars='{}')
 
-    def report_task(self,task,task_report):
+    def report_task(self, task, task_report):
         print 'reporting task'
         pass
 
@@ -361,14 +376,16 @@ class MetaScheduler(threading.Thread):
                 task = self.pop_task()
                 if task:
                     self.empty_runs = 0
-                    self.report_task(task,self.async(task))
+                    self.report_task(task, self.async(task))
                 else:
                     self.empty_runs += 1
                     logger.debug('sleeping...')
                     if self.max_empty_runs != 0:
-                        logger.debug('empty runs %s/%s', self.empty_runs, self.max_empty_runs)
+                        logger.debug('empty runs %s/%s',
+                                     self.empty_runs, self.max_empty_runs)
                         if self.empty_runs >= self.max_empty_runs:
-                            logger.info('empty runs limit reached, killing myself')
+                            logger.info(
+                                'empty runs limit reached, killing myself')
                             self.die()
                     self.sleep()
         except KeyboardInterrupt:
@@ -379,33 +396,35 @@ TASK_STATUS = (QUEUED, RUNNING, COMPLETED, FAILED, TIMEOUT, STOPPED, EXPIRED)
 RUN_STATUS = (RUNNING, COMPLETED, FAILED, TIMEOUT, STOPPED)
 WORKER_STATUS = (ACTIVE, DISABLED, TERMINATE, KILL)
 
+
 class TYPE(object):
     """
     validator that check whether field is valid json and validate its type
     """
 
-    def __init__(self,myclass=list,parse=False):
+    def __init__(self, myclass=list, parse=False):
         self.myclass = myclass
         self.parse = parse
 
-    def __call__(self,value):
+    def __call__(self, value):
         from gluon import current
         try:
             obj = loads(value)
         except:
-            return (value,current.T('invalid json'))
+            return (value, current.T('invalid json'))
         else:
-            if isinstance(obj,self.myclass):
+            if isinstance(obj, self.myclass):
                 if self.parse:
-                    return (obj,None)
+                    return (obj, None)
                 else:
-                    return (value,None)
+                    return (value, None)
             else:
-                return (value,current.T('Not of type: %s') % self.myclass)
+                return (value, current.T('Not of type: %s') % self.myclass)
+
 
 class Scheduler(MetaScheduler):
-    def __init__(self,db,tasks=None,migrate=True,
-                 worker_name=None,group_names=['main'],heartbeat=HEARTBEAT,
+    def __init__(self, db, tasks=None, migrate=True,
+                 worker_name=None, group_names=['main'], heartbeat=HEARTBEAT,
                  max_empty_runs=0, discard_results=False, utc_time=False):
 
         MetaScheduler.__init__(self)
@@ -415,8 +434,9 @@ class Scheduler(MetaScheduler):
         self.tasks = tasks
         self.group_names = group_names
         self.heartbeat = heartbeat
-        self.worker_name = worker_name or socket.gethostname()+'#'+str(os.getpid())
-        self.worker_status = RUNNING, 1 #tuple containing status as recorded in
+        self.worker_name = worker_name or socket.gethostname(
+        ) + '#' + str(os.getpid())
+        self.worker_status = RUNNING, 1  # tuple containing status as recorded in
                                         #the table, plus a boost parameter for
                                         #hibernation (i.e. when someone stop the
                                         #worker acting on the scheduler_worker table)
@@ -429,86 +449,85 @@ class Scheduler(MetaScheduler):
         from gluon import current
         current._scheduler = self
 
-        self.define_tables(db,migrate=migrate)
+        self.define_tables(db, migrate=migrate)
 
     def now(self):
         return self.utc_time and datetime.datetime.utcnow() or datetime.datetime.now()
 
     def set_requirements(self, scheduler_task):
         from gluon import current
-        if hasattr(current,'request'):
-            scheduler_task.application_name.default= '%s/%s' % (
-            current.request.application, current.request.controller
+        if hasattr(current, 'request'):
+            scheduler_task.application_name.default = '%s/%s' % (
+                current.request.application, current.request.controller
             )
 
-    def define_tables(self,db,migrate):
+    def define_tables(self, db, migrate):
         from gluon.dal import DEFAULT
         logger.debug('defining tables (migrate=%s)' % migrate)
         now = self.now
         db.define_table(
             'scheduler_task',
-            Field('application_name',requires=IS_NOT_EMPTY(),
-                  default=None,writable=False),
-            Field('task_name',default=None),
-            Field('group_name',default='main'),
-            Field('status',requires=IS_IN_SET(TASK_STATUS),
-                  default=QUEUED,writable=False),
+            Field('application_name', requires=IS_NOT_EMPTY(),
+                  default=None, writable=False),
+            Field('task_name', default=None),
+            Field('group_name', default='main'),
+            Field('status', requires=IS_IN_SET(TASK_STATUS),
+                  default=QUEUED, writable=False),
             Field('function_name',
                   requires=IS_IN_SET(sorted(self.tasks.keys()))
                   if self.tasks else DEFAULT),
             Field('uuid', requires=IS_NOT_IN_DB(db, 'scheduler_task.uuid'),
                   unique=True, default=web2py_uuid),
-            Field('args','text',default='[]',requires=TYPE(list)),
-            Field('vars','text',default='{}',requires=TYPE(dict)),
-            Field('enabled','boolean',default=True),
-            Field('start_time','datetime',default=now,
-                  requires = IS_DATETIME()),
-            Field('next_run_time','datetime',default=now),
-            Field('stop_time','datetime'),
-            Field('repeats','integer',default=1,comment="0=unlimited",
+            Field('args', 'text', default='[]', requires=TYPE(list)),
+            Field('vars', 'text', default='{}', requires=TYPE(dict)),
+            Field('enabled', 'boolean', default=True),
+            Field('start_time', 'datetime', default=now,
+                  requires=IS_DATETIME()),
+            Field('next_run_time', 'datetime', default=now),
+            Field('stop_time', 'datetime'),
+            Field('repeats', 'integer', default=1, comment="0=unlimited",
                   requires=IS_INT_IN_RANGE(0, None)),
             Field('retry_failed', 'integer', default=0, comment="-1=unlimited",
                   requires=IS_INT_IN_RANGE(-1, None)),
-            Field('period','integer',default=60,comment='seconds',
+            Field('period', 'integer', default=60, comment='seconds',
                   requires=IS_INT_IN_RANGE(0, None)),
-            Field('timeout','integer',default=60,comment='seconds',
+            Field('timeout', 'integer', default=60, comment='seconds',
                   requires=IS_INT_IN_RANGE(0, None)),
             Field('sync_output', 'integer', default=0,
                   comment="update output every n sec: 0=never",
                   requires=IS_INT_IN_RANGE(0, None)),
-            Field('times_run','integer',default=0,writable=False),
-            Field('times_failed','integer',default=0,writable=False),
-            Field('last_run_time','datetime',writable=False,readable=False),
-            Field('assigned_worker_name',default='',writable=False),
+            Field('times_run', 'integer', default=0, writable=False),
+            Field('times_failed', 'integer', default=0, writable=False),
+            Field('last_run_time', 'datetime', writable=False, readable=False),
+            Field('assigned_worker_name', default='', writable=False),
             on_define=self.set_requirements,
-            migrate=migrate,format='%(task_name)s')
-
+            migrate=migrate, format='%(task_name)s')
 
         db.define_table(
             'scheduler_run',
-            Field('scheduler_task','reference scheduler_task'),
-            Field('status',requires=IS_IN_SET(RUN_STATUS)),
-            Field('start_time','datetime'),
-            Field('stop_time','datetime'),
-            Field('output','text'),
-            Field('result','text'),
-            Field('traceback','text'),
-            Field('worker_name',default=self.worker_name),
+            Field('scheduler_task', 'reference scheduler_task'),
+            Field('status', requires=IS_IN_SET(RUN_STATUS)),
+            Field('start_time', 'datetime'),
+            Field('stop_time', 'datetime'),
+            Field('output', 'text'),
+            Field('result', 'text'),
+            Field('traceback', 'text'),
+            Field('worker_name', default=self.worker_name),
             migrate=migrate)
 
         db.define_table(
             'scheduler_worker',
             Field('worker_name', unique=True),
-            Field('first_heartbeat','datetime'),
-            Field('last_heartbeat','datetime'),
-            Field('status',requires=IS_IN_SET(WORKER_STATUS)),
+            Field('first_heartbeat', 'datetime'),
+            Field('last_heartbeat', 'datetime'),
+            Field('status', requires=IS_IN_SET(WORKER_STATUS)),
             Field('is_ticker', 'boolean', default=False, writable=False),
             Field('group_names', 'list:string', default=self.group_names),
             migrate=migrate)
         if migrate:
             db.commit()
 
-    def loop(self,worker_name=None):
+    def loop(self, worker_name=None):
         signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
         try:
             self.start_heartbeats()
@@ -521,14 +540,16 @@ class Scheduler(MetaScheduler):
                 task = self.pop_task()
                 if task:
                     self.empty_runs = 0
-                    self.report_task(task,self.async(task))
+                    self.report_task(task, self.async(task))
                 else:
                     self.empty_runs += 1
                     logger.debug('sleeping...')
                     if self.max_empty_runs != 0:
-                        logger.debug('empty runs %s/%s', self.empty_runs, self.max_empty_runs)
+                        logger.debug('empty runs %s/%s',
+                                     self.empty_runs, self.max_empty_runs)
                         if self.empty_runs >= self.max_empty_runs:
-                            logger.info('empty runs limit reached, killing myself')
+                            logger.info(
+                                'empty runs limit reached, killing myself')
                             self.die()
                     self.sleep()
         except (KeyboardInterrupt, SystemExit):
@@ -541,7 +562,7 @@ class Scheduler(MetaScheduler):
         if self.is_a_ticker and self.do_assign_tasks:
             #I'm a ticker, and 5 loops passed without reassigning tasks, let's do
             #that and loop again
-            db.commit() #?don't know if it's useful, let's be completely sure
+            db.commit()  # ?don't know if it's useful, let's be completely sure
             while True:
                 try:
                     self.assign_tasks()
@@ -552,21 +573,22 @@ class Scheduler(MetaScheduler):
                     logger.error('TICKER: error assigning tasks')
             return None
         db.commit()
-        grabbed = db(ts.assigned_worker_name==self.worker_name)\
-            (ts.status==ASSIGNED)
+        grabbed = db(ts.assigned_worker_name == self.worker_name)(
+            ts.status == ASSIGNED)
 
-        task = grabbed.select(limitby=(0,1), orderby=ts.next_run_time).first()
+        task = grabbed.select(limitby=(0, 1), orderby=ts.next_run_time).first()
         if task:
-            task.update_record(status=RUNNING,last_run_time=now)
+            task.update_record(status=RUNNING, last_run_time=now)
             #noone will touch my task!
             db.commit()
             logger.debug('   work to do %s' % task.id)
         else:
             logger.debug('nothing to do')
             return None
-        next_run_time = task.last_run_time + datetime.timedelta(seconds=task.period)
+        next_run_time = task.last_run_time + datetime.timedelta(
+            seconds=task.period)
         times_run = task.times_run + 1
-        if times_run < task.repeats or task.repeats==0:
+        if times_run < task.repeats or task.repeats == 0:
             run_again = True
         else:
             run_again = False
@@ -575,7 +597,7 @@ class Scheduler(MetaScheduler):
             logger.debug('    new scheduler_run record')
             try:
                 run_id = db.scheduler_run.insert(
-                    scheduler_task = task.id,
+                    scheduler_task=task.id,
                     status=RUNNING,
                     start_time=now,
                     worker_name=self.worker_name)
@@ -585,22 +607,22 @@ class Scheduler(MetaScheduler):
                 db.rollback()
         logger.info('new task %(id)s "%(task_name)s" %(application_name)s.%(function_name)s' % task)
         return Task(
-            app = task.application_name,
-            function = task.function_name,
-            timeout = task.timeout,
-            args = task.args, #in json
-            vars = task.vars, #in json
-            task_id = task.id,
-            run_id = run_id,
-            run_again = run_again,
+            app=task.application_name,
+            function=task.function_name,
+            timeout=task.timeout,
+            args=task.args,  # in json
+            vars=task.vars,  # in json
+            task_id=task.id,
+            run_id=run_id,
+            run_again=run_again,
             next_run_time=next_run_time,
-            times_run = times_run,
-            stop_time = task.stop_time,
-            retry_failed = task.retry_failed,
-            times_failed = task.times_failed,
-            sync_output = task.sync_output)
+            times_run=times_run,
+            stop_time=task.stop_time,
+            retry_failed=task.retry_failed,
+            times_failed=task.times_failed,
+            sync_output=task.sync_output)
 
-    def report_task(self,task,task_report):
+    def report_task(self, task, task_report):
         db = self.db
         now = self.now()
         while True:
@@ -610,16 +632,17 @@ class Scheduler(MetaScheduler):
                         #result is 'null' as a string if task completed
                         #if it's stopped it's None as NoneType, so we record
                         #the STOPPED "run" anyway
-                        logger.debug(' recording task report in db (%s)' % task_report.status)
-                        db(db.scheduler_run.id==task.run_id).update(
-                            status = task_report.status,
-                            stop_time = now,
-                            result = task_report.result,
-                            output = task_report.output,
-                            traceback = task_report.tb)
+                        logger.debug(' recording task report in db (%s)' %
+                                     task_report.status)
+                        db(db.scheduler_run.id == task.run_id).update(
+                            status=task_report.status,
+                            stop_time=now,
+                            result=task_report.result,
+                            output=task_report.output,
+                            traceback=task_report.tb)
                     else:
                         logger.debug(' deleting task report in db because of no result')
-                        db(db.scheduler_run.id==task.run_id).delete()
+                        db(db.scheduler_run.id == task.run_id).delete()
                 is_expired = (task.stop_time
                               and task.next_run_time > task.stop_time
                               and True or False)
@@ -627,26 +650,25 @@ class Scheduler(MetaScheduler):
                           or task.run_again and not is_expired
                           and QUEUED or COMPLETED)
                 if task_report.status == COMPLETED:
-                    d = dict(status = status,
-                             next_run_time = task.next_run_time,
-                             times_run = task.times_run,
-                             times_failed = 0
+                    d = dict(status=status,
+                             next_run_time=task.next_run_time,
+                             times_run=task.times_run,
+                             times_failed=0
                              )
-                    db(db.scheduler_task.id==task.task_id)\
-                        (db.scheduler_task.status==RUNNING).update(**d)
+                    db(db.scheduler_task.id == task.task_id)(
+                        db.scheduler_task.status == RUNNING).update(**d)
                 else:
-                    st_mapping = {'FAILED':'FAILED',
-                                  'TIMEOUT':'TIMEOUT',
-                                  'STOPPED':'QUEUED'}[task_report.status]
+                    st_mapping = {'FAILED': 'FAILED',
+                                  'TIMEOUT': 'TIMEOUT',
+                                  'STOPPED': 'QUEUED'}[task_report.status]
                     status = (task.retry_failed
                               and task.times_failed < task.retry_failed
-                              and QUEUED or task.retry_failed==-1
+                              and QUEUED or task.retry_failed == -1
                               and QUEUED or st_mapping)
-                    db(db.scheduler_task.id==task.task_id)\
-                        (db.scheduler_task.status==RUNNING).update(
-                            times_failed=db.scheduler_task.times_failed+1,
-                            next_run_time = task.next_run_time,
-                            status=status)
+                    db(db.scheduler_task.id == task.task_id)(db.scheduler_task.status == RUNNING).update(
+                        times_failed=db.scheduler_task.times_failed + 1,
+                        next_run_time=task.next_run_time,
+                        status=status)
                 db.commit()
                 logger.info('task completed (%s)' % task_report.status)
                 break
@@ -655,34 +677,39 @@ class Scheduler(MetaScheduler):
 
     def adj_hibernation(self):
         if self.worker_status[0] == DISABLED:
-            hibernation = self.worker_status[1] + 1 if self.worker_status[1] < MAXHIBERNATION else MAXHIBERNATION
+            hibernation = self.worker_status[1] + 1 if self.worker_status[
+                1] < MAXHIBERNATION else MAXHIBERNATION
             self.worker_status = DISABLED, hibernation
 
-    def send_heartbeat(self,counter):
+    def send_heartbeat(self, counter):
         if not self.db_thread:
             logger.debug('thread building own DAL object')
-            self.db_thread = DAL(self.db._uri,folder = self.db._adapter.folder)
-            self.define_tables(self.db_thread,migrate=False)
+            self.db_thread = DAL(
+                self.db._uri, folder=self.db._adapter.folder)
+            self.define_tables(self.db_thread, migrate=False)
         try:
             db = self.db_thread
             sw, st = db.scheduler_worker, db.scheduler_task
             now = self.now()
-            expiration = now-datetime.timedelta(seconds=self.heartbeat*3)
-            departure = now-datetime.timedelta(seconds=self.heartbeat*3*MAXHIBERNATION)
+            expiration = now - datetime.timedelta(seconds=self.heartbeat * 3)
+            departure = now - datetime.timedelta(
+                seconds=self.heartbeat * 3 * MAXHIBERNATION)
             # record heartbeat
-            mybackedstatus = db(sw.worker_name==self.worker_name).select().first()
+            mybackedstatus = db(
+                sw.worker_name == self.worker_name).select().first()
             if not mybackedstatus:
-                sw.insert(status = ACTIVE,worker_name = self.worker_name,
-                          first_heartbeat = now,last_heartbeat = now,
-                          group_names = self.group_names)
-                self.worker_status = ACTIVE, 1       #activating the process
+                sw.insert(status=ACTIVE, worker_name=self.worker_name,
+                          first_heartbeat=now, last_heartbeat=now,
+                          group_names=self.group_names)
+                self.worker_status = ACTIVE, 1  # activating the process
             else:
                 if mybackedstatus.status == DISABLED:
-                    self.worker_status = DISABLED, self.worker_status[1]#keep sleeping
+                    self.worker_status = DISABLED, self.worker_status[
+                        1]  # keep sleeping
                     if self.worker_status[1] == MAXHIBERNATION:
                         logger.debug('........recording heartbeat')
-                        db(sw.worker_name==self.worker_name).update(
-                            last_heartbeat = now)
+                        db(sw.worker_name == self.worker_name).update(
+                            last_heartbeat=now)
 
                 elif mybackedstatus.status == TERMINATE:
                     self.worker_status = TERMINATE, self.worker_status[1]
@@ -695,23 +722,24 @@ class Scheduler(MetaScheduler):
 
                 else:
                     logger.debug('........recording heartbeat')
-                    db(sw.worker_name==self.worker_name).update(
-                        last_heartbeat = now, status = ACTIVE)
-                    self.worker_status = ACTIVE, 1  #re-activating the process
+                    db(sw.worker_name == self.worker_name).update(
+                        last_heartbeat=now, status=ACTIVE)
+                    self.worker_status = ACTIVE, 1  # re-activating the process
 
             self.do_assign_tasks = False
             if counter % 5 == 0:
                 try:
                     # delete inactive workers
-                    logger.debug('    freeing workers that have not sent heartbeat')
+                    logger.debug(
+                        '    freeing workers that have not sent heartbeat')
                     inactive_workers = db(
-                        ((sw.last_heartbeat<expiration) & (sw.status == ACTIVE)) |
-                        ((sw.last_heartbeat<departure) & (sw.status != ACTIVE))
-                        )
+                        ((sw.last_heartbeat < expiration) & (sw.status == ACTIVE)) |
+                        ((sw.last_heartbeat <
+                         departure) & (sw.status != ACTIVE))
+                    )
                     db(st.assigned_worker_name.belongs(
-                        inactive_workers._select(sw.worker_name)))\
-                        (st.status == RUNNING)\
-                        .update(assigned_worker_name='',status=QUEUED)
+                        inactive_workers._select(sw.worker_name)))(st.status == RUNNING)\
+                        .update(assigned_worker_name='', status=QUEUED)
                     inactive_workers.delete()
                     self.is_a_ticker = self.being_a_ticker()
                     if self.worker_status[0] == ACTIVE:
@@ -727,15 +755,17 @@ class Scheduler(MetaScheduler):
     def being_a_ticker(self):
         db = self.db_thread
         sw = db.scheduler_worker
-        ticker = db((sw.worker_name != self.worker_name) & (sw.is_ticker == True) & (sw.status == ACTIVE)).select().first()
+        ticker = db((sw.worker_name != self.worker_name) & (
+            sw.is_ticker == True) & (sw.status == ACTIVE)).select().first()
         if not ticker:
-            db(sw.worker_name == self.worker_name).update(is_ticker = True)
-            db(sw.worker_name != self.worker_name).update(is_ticker = False)
+            db(sw.worker_name == self.worker_name).update(is_ticker=True)
+            db(sw.worker_name != self.worker_name).update(is_ticker=False)
             logger.info("TICKER: I'm a ticker (%s)" % self.worker_name)
             db.commit()
             return True
         else:
-            logger.info("%s is a ticker, I'm a poor worker" % ticker.worker_name)
+            logger.info(
+                "%s is a ticker, I'm a poor worker" % ticker.worker_name)
             return False
 
     def assign_tasks(self):
@@ -749,19 +779,17 @@ class Scheduler(MetaScheduler):
             group_names = w.group_names
             for gname in group_names:
                 if gname not in wkgroups:
-                    wkgroups[gname] = dict(workers=[{'name' : w.worker_name, 'c' : 0}])
+                    wkgroups[gname] = dict(
+                        workers=[{'name': w.worker_name, 'c': 0}])
                 else:
-                    wkgroups[gname]['workers'].append({'name' : w.worker_name, 'c' : 0})
+                    wkgroups[gname]['workers'].append(
+                        {'name': w.worker_name, 'c': 0})
         #set queued tasks that expired between "runs" (i.e., you turned off)
         #the scheduler and then it wasn't expired, but now it is
-        db(ts.status.belongs((QUEUED,ASSIGNED)))(ts.stop_time<now).update(status=EXPIRED)
+        db(ts.status.belongs(
+            (QUEUED, ASSIGNED)))(ts.stop_time < now).update(status=EXPIRED)
 
-        all_available = db(ts.status.belongs((QUEUED,ASSIGNED)))\
-                ((ts.times_run<ts.repeats)|(ts.repeats==0))\
-                (ts.start_time<=now)\
-                ((ts.stop_time==None) | (ts.stop_time>now))\
-                (ts.next_run_time<=now)\
-                (ts.enabled==True)
+        all_available = db(ts.status.belongs((QUEUED, ASSIGNED)))((ts.times_run < ts.repeats) | (ts.repeats == 0))(ts.start_time <= now)((ts.stop_time is None) | (ts.stop_time > now))(ts.next_run_time <= now)(ts.enabled == True)
 
         limit = len(all_workers) * 50
         #if there are a moltitude of tasks, let's assign a maximum of 50 tasks per worker.
@@ -770,7 +798,8 @@ class Scheduler(MetaScheduler):
         #50 is quite a sweet spot also for fast tasks, with sane heartbeat values
         #NB: ticker reassign tasks every 5 cycles, so if a worker completes his 50 tasks in less
         #than heartbeat*5 seconds, it won't pick new tasks until heartbeat*5 seconds pass.
-        tasks = all_available.select(limitby=(0,limit), orderby=ts.next_run_time)
+        tasks = all_available.select(
+            limitby=(0, limit), orderby=ts.next_run_time)
         #everything until now is going fine. If a worker is currently elaborating a long task,
         #all other tasks assigned to him needs to be reassigned "freely" to other workers, that may be free.
         #this shuffles up things a bit, in order to maintain the idea of a semi-linear scalability
@@ -803,7 +832,8 @@ class Scheduler(MetaScheduler):
         logger.info('TICKER: tasks are %s' % len(tasks))
 
     def sleep(self):
-        time.sleep(self.heartbeat*self.worker_status[1]) # should only sleep until next available task
+        time.sleep(self.heartbeat * self.worker_status[1])
+                   # should only sleep until next available task
 
     def queue_task(self, function, pargs=[], pvars={}, **kwargs):
         """
@@ -829,12 +859,12 @@ class Scheduler(MetaScheduler):
         tname = 'task_name' in kwargs and kwargs.pop('task_name') or function
         print 'a', targs
         rtn = self.db.scheduler_task.validate_and_insert(
-             function_name=function,
-             task_name=tname,
-             args=targs,
-             vars=tvars,
-             uuid=tuuid,
-             **kwargs)
+            function_name=function,
+            task_name=tname,
+            args=targs,
+            vars=tvars,
+            uuid=tuuid,
+            **kwargs)
         if not rtn.errors:
             rtn.uuid = tuuid
         else:
@@ -866,25 +896,28 @@ class Scheduler(MetaScheduler):
         elif isinstance(ref, Query):
             q = ref
         else:
-            raise SyntaxError, "You can retrieve results only by id, uuid or Query"
+            raise SyntaxError(
+                "You can retrieve results only by id, uuid or Query")
         fields = st.ALL
         left = False
         orderby = ~st.id
         if output:
             fields = st.ALL, sr.ALL
             left = sr.on(sr.scheduler_task == st.id)
-            orderby = ~st.id|~sr.id
+            orderby = ~st.id | ~sr.id
         row = self.db(q).select(
             *fields,
             orderby=orderby,
             left=left,
-            limitby=(0,1)
-            ).first()
+            limitby=(0, 1)
+        ).first()
         if output:
             row.result = row.scheduler_run.result and \
-                loads(row.scheduler_run.result, object_hook=_decode_dict) or None
+                loads(row.scheduler_run.result,
+                      object_hook=_decode_dict) or None
         return row
 
+
 def main():
     """
     allows to run worker without python web2py.py .... by simply python this.py
@@ -894,34 +927,34 @@ def main():
         "-w", "--worker_name", dest="worker_name", default=None,
         help="start a worker with name")
     parser.add_option(
-        "-b", "--heartbeat",dest="heartbeat", default = 10,
+        "-b", "--heartbeat", dest="heartbeat", default=10,
         type='int', help="heartbeat time in seconds (default 10)")
     parser.add_option(
-        "-L", "--logger_level",dest="logger_level",
+        "-L", "--logger_level", dest="logger_level",
         default=30,
         type='int',
         help="set debug output level (0-100, 0 means all, 100 means none;default is 30)")
     parser.add_option("-E", "--empty-runs",
-        dest="max_empty_runs",
-        type='int',
-        default = 0,
-        help="max loops with no grabbed tasks permitted (0 for never check)")
+                      dest="max_empty_runs",
+                      type='int',
+                      default=0,
+                      help="max loops with no grabbed tasks permitted (0 for never check)")
     parser.add_option(
-        "-g", "--group_names",dest="group_names",
-        default = 'main',
+        "-g", "--group_names", dest="group_names",
+        default='main',
         help="comma separated list of groups to be picked by the worker")
     parser.add_option(
-        "-f", "--db_folder",dest="db_folder",
-        default = '/Users/mdipierro/web2py/applications/scheduler/databases',
+        "-f", "--db_folder", dest="db_folder",
+        default='/Users/mdipierro/web2py/applications/scheduler/databases',
         help="location of the dal database folder")
     parser.add_option(
-        "-u", "--db_uri",dest="db_uri",
-        default = 'sqlite://storage.sqlite',
+        "-u", "--db_uri", dest="db_uri",
+        default='sqlite://storage.sqlite',
         help="database URI string (web2py DAL syntax)")
     parser.add_option(
-        "-t", "--tasks",dest="tasks",default=None,
-        help="file containing task files, must define" + \
-            "tasks = {'task_name':(lambda: 'output')} or similar set of tasks")
+        "-t", "--tasks", dest="tasks", default=None,
+        help="file containing task files, must define" +
+        "tasks = {'task_name':(lambda: 'output')} or similar set of tasks")
     parser.add_option(
         "-U", "--utc-time", dest="utc_time", default=False,
         help="work with UTC timestamps"
@@ -930,35 +963,35 @@ def main():
     if not options.tasks or not options.db_uri:
         print USAGE
     if options.tasks:
-        path,filename = os.path.split(options.tasks)
+        path, filename = os.path.split(options.tasks)
         if filename.endswith('.py'):
             filename = filename[:-3]
         sys.path.append(path)
         print 'importing tasks...'
         tasks = __import__(filename, globals(), locals(), [], -1).tasks
-        print 'tasks found: '+', '.join(tasks.keys())
+        print 'tasks found: ' + ', '.join(tasks.keys())
     else:
         tasks = {}
     group_names = [x.strip() for x in options.group_names.split(',')]
 
     logging.getLogger().setLevel(options.logger_level)
 
-    print 'groups for this worker: '+', '.join(group_names)
+    print 'groups for this worker: ' + ', '.join(group_names)
     print 'connecting to database in folder: ' + options.db_folder or './'
-    print 'using URI: '+options.db_uri
-    db = DAL(options.db_uri,folder=options.db_folder)
+    print 'using URI: ' + options.db_uri
+    db = DAL(options.db_uri, folder=options.db_folder)
     print 'instantiating scheduler...'
-    scheduler=Scheduler(db = db,
-                        worker_name = options.worker_name,
-                        tasks = tasks,
-                        migrate = True,
-                        group_names = group_names,
-                        heartbeat = options.heartbeat,
-                        max_empty_runs = options.max_empty_runs,
-                        utc_time = options.utc_time)
+    scheduler = Scheduler(db=db,
+                          worker_name=options.worker_name,
+                          tasks=tasks,
+                          migrate=True,
+                          group_names=group_names,
+                          heartbeat=options.heartbeat,
+                          max_empty_runs=options.max_empty_runs,
+                          utc_time=options.utc_time)
     signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
     print 'starting main worker loop...'
     scheduler.loop()
 
-if __name__=='__main__':
+if __name__ == '__main__':
     main()
diff --git a/gluon/serializers.py b/gluon/serializers.py
index b9f2b04c..b50ab994 100644
--- a/gluon/serializers.py
+++ b/gluon/serializers.py
@@ -19,61 +19,64 @@ except ImportError:
     except:
         import contrib.simplejson as json_parser    # fallback to pure-Python module
 
+
 def custom_json(o):
-    if hasattr(o,'custom_json') and callable(o.custom_json):
+    if hasattr(o, 'custom_json') and callable(o.custom_json):
         return o.custom_json()
     if isinstance(o, (datetime.date,
                       datetime.datetime,
                       datetime.time)):
-        return o.isoformat()[:19].replace('T',' ')
+        return o.isoformat()[:19].replace('T', ' ')
     elif isinstance(o, (int, long)):
         return int(o)
     elif isinstance(o, decimal.Decimal):
         return str(o)
     elif isinstance(o, lazyT):
         return str(o)
-    elif isinstance(o,XmlComponent):
+    elif isinstance(o, XmlComponent):
         return str(o)
-    elif hasattr(o,'as_list') and callable(o.as_list):
+    elif hasattr(o, 'as_list') and callable(o.as_list):
         return o.as_list()
-    elif hasattr(o,'as_dict') and callable(o.as_dict):
+    elif hasattr(o, 'as_dict') and callable(o.as_dict):
         return o.as_dict()
     else:
         raise TypeError(repr(o) + " is not JSON serializable")
 
 
 def xml_rec(value, key, quote=True):
-    if hasattr(value,'custom_xml') and callable(value.custom_xml):
+    if hasattr(value, 'custom_xml') and callable(value.custom_xml):
         return value.custom_xml()
     elif isinstance(value, (dict, Storage)):
-        return TAG[key](*[TAG[k](xml_rec(v, '',quote)) \
-                              for k, v in value.items()])
+        return TAG[key](*[TAG[k](xml_rec(v, '', quote))
+                          for k, v in value.items()])
     elif isinstance(value, list):
-        return TAG[key](*[TAG.item(xml_rec(item, '',quote)) for item in value])
-    elif hasattr(value,'as_list') and callable(value.as_list):
-        return str(xml_rec(value.as_list(),'',quote))
-    elif hasattr(value,'as_dict') and callable(value.as_dict):
-        return str(xml_rec(value.as_dict(),'',quote))
+        return TAG[key](*[TAG.item(xml_rec(item, '', quote)) for item in value])
+    elif hasattr(value, 'as_list') and callable(value.as_list):
+        return str(xml_rec(value.as_list(), '', quote))
+    elif hasattr(value, 'as_dict') and callable(value.as_dict):
+        return str(xml_rec(value.as_dict(), '', quote))
     else:
-        return xmlescape(value,quote)
+        return xmlescape(value, quote)
 
 
 def xml(value, encoding='UTF-8', key='document', quote=True):
-    return ('<?xml version="1.0" encoding="%s"?>' % encoding) + str(xml_rec(value,key,quote))
+    return ('<?xml version="1.0" encoding="%s"?>' % encoding) + str(xml_rec(value, key, quote))
 
 
-def json(value,default=custom_json):
-    return json_parser.dumps(value,default=default)
+def json(value, default=custom_json):
+    return json_parser.dumps(value, default=default)
 
 
 def csv(value):
     return ''
 
+
 def ics(events, title=None, link=None, timeshift=0, **ignored):
     import datetime
     title = title or '(unkown)'
     if link and not callable(link):
-        link = lambda item,prefix=link: prefix.replace('[id]',str(item['id']))
+        link = lambda item, prefix=link: prefix.replace(
+            '[id]', str(item['id']))
     s = 'BEGIN:VCALENDAR'
     s += '\nVERSION:2.0'
     s += '\nX-WR-CALNAME:%s' % title
@@ -86,9 +89,9 @@ def ics(events, title=None, link=None, timeshift=0, **ignored):
         s += '\nUID:%s' % item['id']
         if link:
             s += '\nURL:%s' % link(item)
-        shift = datetime.timedelta(seconds=3600*timeshift)
-        start = item['start_datetime']+shift
-        stop = item['stop_datetime']+shift
+        shift = datetime.timedelta(seconds=3600 * timeshift)
+        start = item['start_datetime'] + shift
+        stop = item['stop_datetime'] + shift
         s += '\nDTSTART:%s' % start.strftime('%Y%m%dT%H%M%S')
         s += '\nDTEND:%s' % stop.strftime('%Y%m%dT%H%M%S')
         s += '\nSUMMARY:%s' % item['title']
@@ -96,18 +99,19 @@ def ics(events, title=None, link=None, timeshift=0, **ignored):
     s += '\nEND:VCALENDAR'
     return s
 
+
 def rss(feed):
     if not 'entries' in feed and 'items' in feed:
         feed['entries'] = feed['items']
-    now=datetime.datetime.now()
-    rss = rss2.RSS2(title = str(feed.get('title','(notitle)')),
-                    link = str(feed.get('link',None)),
-                    description = str(feed.get('description','')),
-                    lastBuildDate = feed.get('created_on', now),
-                    items = [rss2.RSSItem(
-                title=str(entry.get('title','(notitle)')),
-                link=str(entry.get('link',None)),
-                description=str(entry.get('description','')),
-                pubDate=entry.get('created_on', now)
-                ) for entry in feed.get('entries',[])])
+    now = datetime.datetime.now()
+    rss = rss2.RSS2(title=str(feed.get('title', '(notitle)')),
+                    link=str(feed.get('link', None)),
+                    description=str(feed.get('description', '')),
+                    lastBuildDate=feed.get('created_on', now),
+                    items=[rss2.RSSItem(
+                           title=str(entry.get('title', '(notitle)')),
+                           link=str(entry.get('link', None)),
+                           description=str(entry.get('description', '')),
+                           pubDate=entry.get('created_on', now)
+                           ) for entry in feed.get('entries', [])])
     return rss2.dumps(rss)
diff --git a/gluon/settings.py b/gluon/settings.py
index 655e6467..76058408 100644
--- a/gluon/settings.py
+++ b/gluon/settings.py
@@ -29,7 +29,7 @@ global_settings.app_folders = set()
 global_settings.debugging = False
 
 global_settings.is_pypy = \
-    hasattr(platform,'python_implementation') and \
+    hasattr(platform, 'python_implementation') and \
     platform.python_implementation() == 'PyPy'
 
 global_settings.is_jython = \
diff --git a/gluon/shell.py b/gluon/shell.py
index 10469a1c..b3930329 100644
--- a/gluon/shell.py
+++ b/gluon/shell.py
@@ -30,12 +30,13 @@ from dal import BaseAdapter
 
 logger = logging.getLogger("web2py")
 
+
 def exec_environment(
     pyfile='',
     request=None,
     response=None,
     session=None,
-    ):
+):
     """
     .. function:: gluon.shell.exec_environment([pyfile=''[, request=Request()
         [, response=Response[, session=Session()]]]])
@@ -50,9 +51,12 @@ def exec_environment(
 
     """
 
-    if request is None: request = Request()
-    if response is None: response = Response()
-    if session is None: session = Session()
+    if request is None:
+        request = Request()
+    if response is None:
+        response = Response()
+    if session is None:
+        session = Session()
 
     if request.folder is None:
         mo = re.match(r'(|.*/)applications/(?P<appname>[^/]+)', pyfile)
@@ -78,7 +82,7 @@ def env(
     f=None,
     dir='',
     extra_request={},
-    ):
+):
     """
     Return web2py execution environment for application (a), controller (c),
     function (f).
@@ -113,7 +117,7 @@ def env(
     request.env.remote_addr = '127.0.0.1'
     request.env.web2py_runtime_gae = global_settings.web2py_runtime_gae
 
-    for k,v in extra_request.items():
+    for k, v in extra_request.items():
         request[k] = v
 
     # Monkey patch so credentials checks pass.
@@ -129,7 +133,7 @@ def env(
         try:
             run_models_in(environment)
         except RestrictedError, e:
-            sys.stderr.write(e.traceback+'\n')
+            sys.stderr.write(e.traceback + '\n')
             sys.exit(1)
 
     environment['__name__'] = '__main__'
@@ -156,7 +160,7 @@ def run(
     startfile=None,
     bpython=False,
     python_code=False
-    ):
+):
     """
     Start interactive shell or run Python script (startfile) in web2py
     controller environment. appname is formatted like:
@@ -172,7 +176,8 @@ def run(
     adir = os.path.join('applications', a)
     if not os.path.exists(adir):
         if sys.stdin and not sys.stdin.name == '/dev/null':
-            confirm = raw_input('application %s does not exist, create (y/n)?' % a)
+            confirm = raw_input(
+                'application %s does not exist, create (y/n)?' % a)
         else:
             logging.warn('application does not exist and will not be created')
             return
@@ -180,16 +185,17 @@ def run(
 
             os.mkdir(adir)
             w2p_unpack('welcome.w2p', adir)
-            for subfolder in ['models','views','controllers', 'databases',
-                              'modules','cron','errors','sessions',
-                              'languages','static','private','uploads']:
-                subpath =  os.path.join(adir,subfolder)
+            for subfolder in ['models', 'views', 'controllers', 'databases',
+                              'modules', 'cron', 'errors', 'sessions',
+                              'languages', 'static', 'private', 'uploads']:
+                subpath = os.path.join(adir, subfolder)
                 if not os.path.exists(subpath):
                     os.mkdir(subpath)
-            db = os.path.join(adir,'models/db.py')
+            db = os.path.join(adir, 'models/db.py')
             if os.path.exists(db):
                 data = fileutils.read_file(db)
-                data = data.replace('<your secret key>','sha512:'+web2py_uuid())
+                data = data.replace(
+                    '<your secret key>', 'sha512:' + web2py_uuid())
                 fileutils.write_file(db, data)
 
     if c:
@@ -198,7 +204,8 @@ def run(
     if c:
         cfile = os.path.join('applications', a, 'controllers', c + '.py')
         if not os.path.isfile(cfile):
-            cfile = os.path.join('applications', a, 'compiled', "controllers_%s_%s.pyc" % (c,f))
+            cfile = os.path.join('applications', a, 'compiled',
+                                 "controllers_%s_%s.pyc" % (c, f))
             if not os.path.isfile(cfile):
                 die(errmsg)
             else:
@@ -214,17 +221,21 @@ def run(
     if startfile:
         try:
             execfile(startfile, _env)
-            if import_models: BaseAdapter.close_all_instances('commit')
+            if import_models:
+                BaseAdapter.close_all_instances('commit')
         except Exception, e:
             print traceback.format_exc()
-            if import_models: BaseAdapter.close_all_instances('rollback')
+            if import_models:
+                BaseAdapter.close_all_instances('rollback')
     elif python_code:
         try:
             exec(python_code, _env)
-            if import_models: BaseAdapter.close_all_instances('commit')
+            if import_models:
+                BaseAdapter.close_all_instances('commit')
         except Exception, e:
             print traceback.format_exc()
-            if import_models: BaseAdapter.close_all_instances('rollback')
+            if import_models:
+                BaseAdapter.close_all_instances('rollback')
     else:
         if not plain:
             if bpython:
@@ -248,7 +259,7 @@ def run(
                         # IPython; thanks Michael Toomim
                         if '__builtins__' in _env:
                             del _env['__builtins__']
-                        shell = IPython.Shell.IPShell(argv=[],user_ns=_env)
+                        shell = IPython.Shell.IPShell(argv=[], user_ns=_env)
                         shell.mainloop()
                         return
                 except:
@@ -304,7 +315,7 @@ def test(testpath, import_models=True, verbose=False):
         mo = re.match(r'(|.*/)applications/(?P<a>[^/]+)', testpath)
         if not mo:
             die('test file is not in application directory: %s'
-                 % testpath)
+                % testpath)
         a = mo.group('a')
         c = f = None
         files = [testpath]
@@ -340,8 +351,8 @@ def test(testpath, import_models=True, verbose=False):
                 globs = env(a, c=c, f=f, import_models=import_models)
                 execfile(testfile, globs)
                 doctest.run_docstring_examples(obj, globs=globs,
-                        name='%s: %s' % (os.path.basename(testfile),
-                        name), verbose=verbose)
+                                               name='%s: %s' % (os.path.basename(testfile),
+                                                                name), verbose=verbose)
                 if type(obj) in (types.TypeType, types.ClassType):
                     for attr_name in dir(obj):
 
@@ -369,8 +380,8 @@ def execute_from_command_line(argv=None):
     parser = optparse.OptionParser(usage=get_usage())
 
     parser.add_option('-S', '--shell', dest='shell', metavar='APPNAME',
-        help='run web2py in interactive shell or IPython(if installed) ' + \
-            'with specified appname')
+                      help='run web2py in interactive shell or IPython(if installed) ' +
+                      'with specified appname')
     msg = 'run web2py in interactive shell or bpython (if installed) with'
     msg += ' specified appname (if app does not exist it will be created).'
     msg += '\n Use combined with --shell'
@@ -381,7 +392,7 @@ def execute_from_command_line(argv=None):
         default=False,
         dest='bpython',
         help=msg,
-        )
+    )
     parser.add_option(
         '-P',
         '--plain',
@@ -389,25 +400,25 @@ def execute_from_command_line(argv=None):
         default=False,
         dest='plain',
         help='only use plain python shell, should be used with --shell option',
-        )
+    )
     parser.add_option(
         '-M',
         '--import_models',
         action='store_true',
         default=False,
         dest='import_models',
-        help='auto import model files, default is False, ' + \
-            ' should be used with --shell option',
-        )
+        help='auto import model files, default is False, ' +
+        ' should be used with --shell option',
+    )
     parser.add_option(
         '-R',
         '--run',
         dest='run',
         metavar='PYTHON_FILE',
         default='',
-        help='run PYTHON_FILE in web2py environment, ' + \
-            'should be used with --shell option',
-        )
+        help='run PYTHON_FILE in web2py environment, ' +
+        'should be used with --shell option',
+    )
 
     (options, args) = parser.parse_args(argv[1:])
 
@@ -419,7 +430,8 @@ def execute_from_command_line(argv=None):
         startfile = args[0]
     else:
         startfile = ''
-    run(options.shell, options.plain, startfile=startfile, bpython=options.bpython)
+    run(options.shell, options.plain, startfile=startfile,
+        bpython=options.bpython)
 
 
 if __name__ == '__main__':
diff --git a/gluon/sql.py b/gluon/sql.py
index 41dadbea..144e6c27 100644
--- a/gluon/sql.py
+++ b/gluon/sql.py
@@ -1,5 +1,5 @@
 # this file exists for backward compatibility
 
-__all__ = ['DAL','Field','DRIVERS']
+__all__ = ['DAL', 'Field', 'DRIVERS']
 
 from dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, DRIVERS, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 8ffae918..ef574aee 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -42,21 +42,25 @@ is_gae = settings.global_settings.web2py_runtime_gae
 table_field = re.compile('[\w_]+\.[\w_]+')
 widget_class = re.compile('^\w*')
 
-def trap_class(_class=None,trap=True):
-    return (trap and 'w2p_trap' or '')+(_class and ' '+_class or '')
 
-def represent(field,value,record):
+def trap_class(_class=None, trap=True):
+    return (trap and 'w2p_trap' or '') + (_class and ' ' + _class or '')
+
+
+def represent(field, value, record):
     f = field.represent
     if not callable(f):
         return str(value)
-    n = f.func_code.co_argcount-len(f.func_defaults or [])
-    if getattr(f, 'im_self', None): n -= 1
-    if n==1:
+    n = f.func_code.co_argcount - len(f.func_defaults or [])
+    if getattr(f, 'im_self', None):
+        n -= 1
+    if n == 1:
         return f(value)
-    elif n==2:
-        return f(value,record)
+    elif n == 2:
+        return f(value, record)
     else:
-        raise RuntimeError, "field representation must take 1 or 2 args"
+        raise RuntimeError("field representation must take 1 or 2 args")
+
 
 def safe_int(x):
     try:
@@ -64,12 +68,14 @@ def safe_int(x):
     except ValueError:
         return 0
 
+
 def safe_float(x):
     try:
         return float(x)
     except ValueError:
         return 0
 
+
 class FormWidget(object):
     """
     helper for SQLFORM to generate form input fields
@@ -90,12 +96,12 @@ class FormWidget(object):
         :param attributes: any other supplied attributes
         """
         attr = dict(
-            _id = '%s_%s' % (field._tablename, field.name),
-            _class = cls._class or \
+            _id='%s_%s' % (field._tablename, field.name),
+            _class=cls._class or
                 widget_class.match(str(field.type)).group(),
-            _name = field.name,
-            requires = field.requires,
-            )
+            _name=field.name,
+            requires=field.requires,
+        )
         attr.update(widget_attributes)
         attr.update(attributes)
         return attr
@@ -118,6 +124,7 @@ class FormWidget(object):
 
         raise NotImplementedError
 
+
 class StringWidget(FormWidget):
     _class = 'string'
 
@@ -130,9 +137,9 @@ class StringWidget(FormWidget):
         """
 
         default = dict(
-            _type = 'text',
-            value = (not value is None and str(value)) or '',
-            )
+            _type='text',
+            value=(not value is None and str(value)) or '',
+        )
         attr = cls._attributes(field, default, **attributes)
 
         return INPUT(**attr)
@@ -173,8 +180,8 @@ class TextWidget(FormWidget):
         see also: :meth:`FormWidget.widget`
         """
 
-        default = dict(value = value)
-        attr = cls._attributes(field, default,**attributes)
+        default = dict(value=value)
+        attr = cls._attributes(field, default, **attributes)
         return TEXTAREA(**attr)
 
 
@@ -189,7 +196,7 @@ class BooleanWidget(FormWidget):
         see also: :meth:`FormWidget.widget`
         """
 
-        default=dict(_type='checkbox', value=value)
+        default = dict(_type='checkbox', value=value)
         attr = cls._attributes(field, default,
                                **attributes)
         return INPUT(**attr)
@@ -225,28 +232,32 @@ class OptionsWidget(FormWidget):
             if hasattr(requires[0], 'options'):
                 options = requires[0].options()
             else:
-                raise SyntaxError, 'widget cannot determine options of %s' % field
+                raise SyntaxError(
+                    'widget cannot determine options of %s' % field)
         opts = [OPTION(v, _value=k) for (k, v) in options]
 
         return SELECT(*opts, **attr)
 
+
 class ListWidget(StringWidget):
 
     @classmethod
     def widget(cls, field, value, **attributes):
         _id = '%s_%s' % (field._tablename, field.name)
         _name = field.name
-        if field.type=='list:integer': _class = 'integer'
-        else: _class = 'string'
+        if field.type == 'list:integer':
+            _class = 'integer'
+        else:
+            _class = 'string'
         requires = field.requires if isinstance(
             field.requires, (IS_NOT_EMPTY, IS_LIST_OF)) else None
         attributes['_style'] = 'list-style:none'
         nvalue = value or ['']
         items = [LI(INPUT(_id=_id, _class=_class, _name=_name,
-                          value=v, hideerror=k<len(nvalue)-1,
+                          value=v, hideerror=k < len(nvalue) - 1,
                           requires=requires),
-                    **attributes)  for (k,v) in enumerate(nvalue)]
-        script=SCRIPT("""
+                    **attributes) for (k, v) in enumerate(nvalue)]
+        script = SCRIPT("""
 // from http://refactormycode.com/codes/694-expanding-input-list-using-jquery
 (function(){
 jQuery.fn.grow_input = function() {
@@ -276,9 +287,9 @@ function rel(ul) {
 })();
 jQuery(document).ready(function(){jQuery('#%s_grow_input').grow_input();});
 """ % _id)
-        attributes['_id'] = _id+'_grow_input'
+        attributes['_id'] = _id + '_grow_input'
         attributes['_style'] = 'list-style:none'
-        return TAG[''](UL(*items,**attributes),script)
+        return TAG[''](UL(*items, **attributes), script)
 
 
 class MultipleOptionsWidget(OptionsWidget):
@@ -310,7 +321,7 @@ class RadioWidget(OptionsWidget):
         """
 
         attr = cls._attributes(field, {}, **attributes)
-        attr['_class'] = attr.get('_class','web2py_radiowidget')
+        attr['_class'] = attr.get('_class', 'web2py_radiowidget')
 
         requires = field.requires
         if not isinstance(requires, (list, tuple)):
@@ -319,37 +330,37 @@ class RadioWidget(OptionsWidget):
             if hasattr(requires[0], 'options'):
                 options = requires[0].options()
             else:
-                raise SyntaxError, 'widget cannot determine options of %s' \
-                    % field
+                raise SyntaxError('widget cannot determine options of %s'
+                                  % field)
         options = [(k, v) for k, v in options if str(v)]
         opts = []
-        cols = attributes.get('cols',1)
+        cols = attributes.get('cols', 1)
         totals = len(options)
-        mods = totals%cols
-        rows = totals/cols
+        mods = totals % cols
+        rows = totals / cols
         if mods:
             rows += 1
 
         #widget style
         wrappers = dict(
-            table=(TABLE,TR,TD),
-            ul=(DIV,UL,LI),
-            divs=(CAT,DIV,DIV)
-            )
-        parent, child, inner = wrappers[attributes.get('style','table')]
+            table=(TABLE, TR, TD),
+            ul=(DIV, UL, LI),
+            divs=(CAT, DIV, DIV)
+        )
+        parent, child, inner = wrappers[attributes.get('style', 'table')]
 
         for r_index in range(rows):
             tds = []
-            for k, v in options[r_index*cols:(r_index+1)*cols]:
-                checked={'_checked':'checked'} if k==value else {}
+            for k, v in options[r_index * cols:(r_index + 1) * cols]:
+                checked = {'_checked': 'checked'} if k == value else {}
                 tds.append(inner(INPUT(_type='radio',
-                                       _id='%s%s' % (field.name,k),
+                                       _id='%s%s' % (field.name, k),
                                        _name=field.name,
-                                       requires=attr.get('requires',None),
+                                       requires=attr.get('requires', None),
                                        hideerror=True, _value=k,
                                        value=value,
                                        **checked),
-                                       LABEL(v,_for='%s%s' % (field.name,k))))
+                                 LABEL(v, _for='%s%s' % (field.name, k))))
             opts.append(child(tds))
 
         if opts:
@@ -374,7 +385,7 @@ class CheckboxesWidget(OptionsWidget):
             values = [str(value)]
 
         attr = cls._attributes(field, {}, **attributes)
-        attr['_class'] = attr.get('_class','web2py_checkboxeswidget')
+        attr['_class'] = attr.get('_class', 'web2py_checkboxeswidget')
 
         requires = field.requires
         if not isinstance(requires, (list, tuple)):
@@ -382,8 +393,8 @@ class CheckboxesWidget(OptionsWidget):
         if requires and hasattr(requires[0], 'options'):
             options = requires[0].options()
         else:
-            raise SyntaxError, 'widget cannot determine options of %s' \
-                % field
+            raise SyntaxError('widget cannot determine options of %s'
+                              % field)
 
         options = [(k, v) for k, v in options if k != '']
         opts = []
@@ -396,40 +407,40 @@ class CheckboxesWidget(OptionsWidget):
 
         #widget style
         wrappers = dict(
-            table=(TABLE,TR,TD),
-            ul=(DIV,UL,LI),
-            divs=(CAT,DIV,DIV)
-            )
-        parent, child, inner = wrappers[attributes.get('style','table')]
+            table=(TABLE, TR, TD),
+            ul=(DIV, UL, LI),
+            divs=(CAT, DIV, DIV)
+        )
+        parent, child, inner = wrappers[attributes.get('style', 'table')]
 
         for r_index in range(rows):
             tds = []
-            for k, v in options[r_index*cols:(r_index+1)*cols]:
+            for k, v in options[r_index * cols:(r_index + 1) * cols]:
                 if k in values:
                     r_value = k
                 else:
                     r_value = []
                 tds.append(inner(INPUT(_type='checkbox',
-                                       _id='%s%s' % (field.name,k),
+                                       _id='%s%s' % (field.name, k),
                                        _name=field.name,
                                        requires=attr.get('requires', None),
                                        hideerror=True, _value=k,
                                        value=r_value),
-                                       LABEL(v,_for='%s%s' % (field.name,k))))
+                                 LABEL(v, _for='%s%s' % (field.name, k))))
             opts.append(child(tds))
 
-
         if opts:
-            opts.append(INPUT(_class="hidden", requires=attr.get('requires', None),
-                              _disabled="disabled", _name=field.name,
-                              hideerror=False))
+            opts.append(
+                INPUT(_class="hidden", requires=attr.get('requires', None),
+                      _disabled="disabled", _name=field.name,
+                      hideerror=False))
         return parent(*opts, **attr)
 
 
 class PasswordWidget(FormWidget):
     _class = 'password'
 
-    DEFAULT_PASSWORD_DISPLAY = 8*('*')
+    DEFAULT_PASSWORD_DISPLAY = 8 * ('*')
 
     @classmethod
     def widget(cls, field, value, **attributes):
@@ -441,20 +452,21 @@ class PasswordWidget(FormWidget):
         see also: :meth:`FormWidget.widget`
         """
         # detect if attached a IS_STRONG with entropy
-        default=dict(
+        default = dict(
             _type='password',
             _value=(value and cls.DEFAULT_PASSWORD_DISPLAY) or '',
-            )
+        )
         attr = cls._attributes(field, default, **attributes)
         output = CAT(INPUT(**attr))
 
         # deal with entropy check!
         requires = field.requires
-        if not isinstance(requires,(list,tuple)): requires = [requires]
+        if not isinstance(requires, (list, tuple)):
+            requires = [requires]
         is_strong = [r for r in requires if isinstance(r, IS_STRONG)]
         if is_strong:
-            output.append(SCRIPT("web2py_validate_entropy(jQuery('#%s'),%s);" \
-                                     % (attr['_id'],is_strong[0].entropy)))
+            output.append(SCRIPT("web2py_validate_entropy(jQuery('#%s'),%s);"
+                                 % (attr['_id'], is_strong[0].entropy)))
         # end entropy check
         return output
 
@@ -481,7 +493,7 @@ class UploadWidget(FormWidget):
         :param download_url: Optional URL to link to the file (default = None)
         """
 
-        default=dict(_type='file',)
+        default = dict(_type='file',)
         attr = cls._attributes(field, default, **attributes)
 
         inp = INPUT(**attr)
@@ -494,22 +506,23 @@ class UploadWidget(FormWidget):
             (br, image) = ('', '')
             if UploadWidget.is_image(value):
                 br = BR()
-                image = IMG(_src = url, _width = cls.DEFAULT_WIDTH)
+                image = IMG(_src=url, _width=cls.DEFAULT_WIDTH)
 
             requires = attr["requires"]
             if requires == [] or isinstance(requires, IS_EMPTY_OR):
                 inp = DIV(inp, '[',
-                          A(current.T(UploadWidget.GENERIC_DESCRIPTION), _href = url),
+                          A(current.T(
+                              UploadWidget.GENERIC_DESCRIPTION), _href=url),
                           '|',
                           INPUT(_type='checkbox',
                                 _name=field.name + cls.ID_DELETE_SUFFIX,
                                 _id=field.name + cls.ID_DELETE_SUFFIX),
-                                LABEL(current.T(cls.DELETE_FILE),
-                                     _for=field.name + cls.ID_DELETE_SUFFIX),
-                                ']', br, image)
+                          LABEL(current.T(cls.DELETE_FILE),
+                                _for=field.name + cls.ID_DELETE_SUFFIX),
+                          ']', br, image)
             else:
                 inp = DIV(inp, '[',
-                          A(cls.GENERIC_DESCRIPTION, _href = url),
+                          A(cls.GENERIC_DESCRIPTION, _href=url),
                           ']', br, image)
         return inp
 
@@ -535,8 +548,8 @@ class UploadWidget(FormWidget):
             else:
                 url = download_url + '/' + value
             if cls.is_image(value):
-                inp = IMG(_src = url, _width = cls.DEFAULT_WIDTH)
-            inp = A(inp, _href = url)
+                inp = IMG(_src=url, _width=cls.DEFAULT_WIDTH)
+            inp = A(inp, _href=url)
 
         return inp
 
@@ -561,7 +574,7 @@ class AutocompleteWidget(object):
     _class = 'string'
 
     def __init__(self, request, field, id_field=None, db=None,
-                 orderby=None, limitby=(0,10), distinct=False,
+                 orderby=None, limitby=(0, 10), distinct=False,
                  keyword='_autocomplete_%(tablename)s_%(fieldname)s',
                  min_length=2, help_fields=None, help_string=None):
 
@@ -578,13 +591,13 @@ class AutocompleteWidget(object):
         self.limitby = limitby
         self.distinct = distinct
         self.min_length = min_length
-        self.fields=[field]
+        self.fields = [field]
         if id_field:
             self.is_reference = True
             self.fields.append(id_field)
         else:
             self.is_reference = False
-        if hasattr(request,'application'):
+        if hasattr(request, 'application'):
             self.url = URL(args=request.args)
             self.callback()
         else:
@@ -594,69 +607,76 @@ class AutocompleteWidget(object):
         if self.keyword in self.request.vars:
             field = self.fields[0]
             if is_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)
+                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)
             else:
-                rows = self.db(field.like(self.request.vars[self.keyword]+'%')).select(orderby=self.orderby,limitby=self.limitby,distinct=self.distinct,*self.fields)
+                rows = self.db(field.like(self.request.vars[self.keyword] + '%')).select(orderby=self.orderby, limitby=self.limitby, distinct=self.distinct, *self.fields)
             if rows:
                 if self.is_reference:
                     id_field = self.fields[1]
                     if self.help_fields:
-                        options = [OPTION(self.help_string % dict([(h.name,s[h.name]) for h in self.fields[:1]+self.help_fields]),
-                                          _value=s[id_field.name], _selected=(k==0)) for k,s in enumerate(rows)]
+                        options = [OPTION(
+                            self.help_string % dict([(h.name, s[h.name]) for h in self.fields[:1] + self.help_fields]),
+                                   _value=s[id_field.name], _selected=(k == 0)) for k, s in enumerate(rows)]
                     else:
-                        options = [OPTION(s[field.name],_value=s[id_field.name],
-                                          _selected=(k==0)) for k,s in enumerate(rows)]
-                    raise HTTP(200,SELECT(_id=self.keyword,_class='autocomplete',
-                                          _size=len(rows),_multiple=(len(rows)==1),
-                                          *options).xml())
+                        options = [OPTION(
+                            s[field.name], _value=s[id_field.name],
+                            _selected=(k == 0)) for k, s in enumerate(rows)]
+                    raise HTTP(
+                        200, SELECT(_id=self.keyword, _class='autocomplete',
+                                    _size=len(rows), _multiple=(len(rows) == 1),
+                                    *options).xml())
                 else:
-                    raise HTTP(200,SELECT(_id=self.keyword,_class='autocomplete',
-                                          _size=len(rows),_multiple=(len(rows)==1),
-                                          *[OPTION(s[field.name],
-                                                   _selected=(k==0)) \
-                                                for k,s in enumerate(rows)]).xml())
+                    raise HTTP(
+                        200, SELECT(_id=self.keyword, _class='autocomplete',
+                                    _size=len(rows), _multiple=(len(rows) == 1),
+                                    *[OPTION(s[field.name],
+                                             _selected=(k == 0))
+                                      for k, s in enumerate(rows)]).xml())
             else:
-                raise HTTP(200,'')
+                raise HTTP(200, '')
 
-    def __call__(self,field,value,**attributes):
+    def __call__(self, field, value, **attributes):
         default = dict(
-            _type = 'text',
-            value = (not value is None and str(value)) or '',
-            )
+            _type='text',
+            value=(not value is None and str(value)) or '',
+        )
         attr = StringWidget._attributes(field, default, **attributes)
-        div_id = self.keyword+'_div'
-        attr['_autocomplete']='off'
+        div_id = self.keyword + '_div'
+        attr['_autocomplete'] = 'off'
         if self.is_reference:
-            key2 = self.keyword+'_aux'
-            key3 = self.keyword+'_auto'
-            attr['_class']='string'
+            key2 = self.keyword + '_aux'
+            key3 = self.keyword + '_auto'
+            attr['_class'] = 'string'
             name = attr['_name']
-            if 'requires' in attr: del attr['requires']
+            if 'requires' in attr:
+                del attr['requires']
             attr['_name'] = key2
             value = attr['value']
-            record = self.db(self.fields[1]==value).select(self.fields[0]).first()
+            record = self.db(
+                self.fields[1] == value).select(self.fields[0]).first()
             attr['value'] = record and record[self.fields[0].name]
-            attr['_onblur']="jQuery('#%(div_id)s').delay(1000).fadeOut('slow');" % \
-                dict(div_id=div_id,u='F'+self.keyword)
+            attr['_onblur'] = "jQuery('#%(div_id)s').delay(1000).fadeOut('slow');" % \
+                dict(div_id=div_id, u='F' + self.keyword)
             attr['_onkeyup'] = "jQuery('#%(key3)s').val('');var e=event.which?event.which:event.keyCode; function %(u)s(){jQuery('#%(id)s').val(jQuery('#%(key)s :selected').text());jQuery('#%(key3)s').val(jQuery('#%(key)s').val())}; if(e==39) %(u)s(); else if(e==40) {if(jQuery('#%(key)s option:selected').next().length)jQuery('#%(key)s option:selected').attr('selected',null).next().attr('selected','selected'); %(u)s();} else if(e==38) {if(jQuery('#%(key)s option:selected').prev().length)jQuery('#%(key)s option:selected').attr('selected',null).prev().attr('selected','selected'); %(u)s();} else if(jQuery('#%(id)s').val().length>=%(min_length)s) jQuery.get('%(url)s?%(key)s='+escape(jQuery('#%(id)s').val()),function(data){if(data=='')jQuery('#%(key3)s').val('');else{jQuery('#%(id)s').next('.error').hide();jQuery('#%(div_id)s').html(data).show().focus();jQuery('#%(div_id)s select').css('width',jQuery('#%(id)s').css('width'));jQuery('#%(key3)s').val(jQuery('#%(key)s').val());jQuery('#%(key)s').change(%(u)s);jQuery('#%(key)s').click(%(u)s);};}); else jQuery('#%(div_id)s').fadeOut('slow');" % \
-                dict(url=self.url,min_length=self.min_length,
-                     key=self.keyword,id=attr['_id'],key2=key2,key3=key3,
-                     name=name,div_id=div_id,u='F'+self.keyword)
-            if self.min_length==0:
+                dict(url=self.url, min_length=self.min_length,
+                     key=self.keyword, id=attr['_id'], key2=key2, key3=key3,
+                     name=name, div_id=div_id, u='F' + self.keyword)
+            if self.min_length == 0:
                 attr['_onfocus'] = attr['_onkeyup']
-            return TAG[''](INPUT(**attr),INPUT(_type='hidden',_id=key3,_value=value,
-                                               _name=name,requires=field.requires),
-                           DIV(_id=div_id,_style='position:absolute;'))
+            return TAG[''](INPUT(**attr), INPUT(_type='hidden', _id=key3, _value=value,
+                                                _name=name, requires=field.requires),
+                           DIV(_id=div_id, _style='position:absolute;'))
         else:
-            attr['_name']=field.name
-            attr['_onblur']="jQuery('#%(div_id)s').delay(1000).fadeOut('slow');" % \
-                dict(div_id=div_id,u='F'+self.keyword)
+            attr['_name'] = field.name
+            attr['_onblur'] = "jQuery('#%(div_id)s').delay(1000).fadeOut('slow');" % \
+                dict(div_id=div_id, u='F' + self.keyword)
             attr['_onkeyup'] = "var e=event.which?event.which:event.keyCode; function %(u)s(){jQuery('#%(id)s').val(jQuery('#%(key)s').val())}; if(e==39) %(u)s(); else if(e==40) {if(jQuery('#%(key)s option:selected').next().length)jQuery('#%(key)s option:selected').attr('selected',null).next().attr('selected','selected'); %(u)s();} else if(e==38) {if(jQuery('#%(key)s option:selected').prev().length)jQuery('#%(key)s option:selected').attr('selected',null).prev().attr('selected','selected'); %(u)s();} else if(jQuery('#%(id)s').val().length>=%(min_length)s) jQuery.get('%(url)s?%(key)s='+escape(jQuery('#%(id)s').val()),function(data){jQuery('#%(id)s').next('.error').hide();jQuery('#%(div_id)s').html(data).show().focus();jQuery('#%(div_id)s select').css('width',jQuery('#%(id)s').css('width'));jQuery('#%(key)s').change(%(u)s);jQuery('#%(key)s').click(%(u)s);}); else jQuery('#%(div_id)s').fadeOut('slow');" % \
-                dict(url=self.url,min_length=self.min_length,
-                     key=self.keyword,id=attr['_id'],div_id=div_id,u='F'+self.keyword)
-            if self.min_length==0:
+                dict(url=self.url, min_length=self.min_length,
+                     key=self.keyword, id=attr['_id'], div_id=div_id, u='F' + self.keyword)
+            if self.min_length == 0:
                 attr['_onfocus'] = attr['_onkeyup']
-            return TAG[''](INPUT(**attr),DIV(_id=div_id,_style='position:absolute;'))
+            return TAG[''](INPUT(**attr), DIV(_id=div_id, _style='position:absolute;'))
+
 
 def formstyle_table3cols(form, fields):
     ''' 3 column table - default '''
@@ -668,6 +688,7 @@ def formstyle_table3cols(form, fields):
         table.append(TR(_label, _controls, _help, _id=id))
     return table
 
+
 def formstyle_table2cols(form, fields):
     ''' 2 column table '''
     table = TABLE()
@@ -675,10 +696,11 @@ def formstyle_table2cols(form, fields):
         _help = TD(help, _class='w2p_fc', _width='50%')
         _controls = TD(controls, _class='w2p_fw', _colspan='2')
         _label = TD(label, _class='w2p_fl', _width='50%')
-        table.append(TR(_label, _help,  _id=id+'1', _class='even'))
-        table.append(TR(_controls, _id=id+'2', _class='odd'))
+        table.append(TR(_label, _help, _id=id + '1', _class='even'))
+        table.append(TR(_controls, _id=id + '2', _class='odd'))
     return table
 
+
 def formstyle_divs(form, fields):
     ''' divs only '''
     table = TAG['']()
@@ -689,13 +711,14 @@ def formstyle_divs(form, fields):
         table.append(DIV(_label, _controls, _help, _id=id))
     return table
 
+
 def formstyle_inline(form, fields):
     ''' divs only '''
-    if len(fields)!=2:
-        raise RuntimeError, "Not possible"
+    if len(fields) != 2:
+        raise RuntimeError("Not possible")
     id, label, controls, help = fields[0]
     submit_button = fields[1][2]
-    return CAT(DIV(controls,_style='display:inline'),
+    return CAT(DIV(controls, _style='display:inline'),
                submit_button)
 
 
@@ -709,6 +732,7 @@ def formstyle_ul(form, fields):
         table.append(LI(_label, _controls, _help, _id=id))
     return table
 
+
 def formstyle_bootstrap(form, fields):
     ''' bootstrap format form layout '''
     form['_class'] = 'form-horizontal'
@@ -747,6 +771,7 @@ def formstyle_bootstrap(form, fields):
             parent.append(DIV(label, _controls, _class='control-group'))
     return parent
 
+
 class SQLFORM(FORM):
 
     """
@@ -797,35 +822,34 @@ class SQLFORM(FORM):
     # - add third column to right of fields, populated from the col3 dict
 
     widgets = Storage(dict(
-        string = StringWidget,
-        text = TextWidget,
-        password = PasswordWidget,
-        integer = IntegerWidget,
-        double = DoubleWidget,
-        decimal = DecimalWidget,
-        time = TimeWidget,
-        date = DateWidget,
-        datetime = DatetimeWidget,
-        upload = UploadWidget,
-        boolean = BooleanWidget,
-        blob = None,
-        options = OptionsWidget,
-        multiple = MultipleOptionsWidget,
-        radio = RadioWidget,
-        checkboxes = CheckboxesWidget,
-        autocomplete = AutocompleteWidget,
-        list = ListWidget,
-        ))
-
+        string=StringWidget,
+        text=TextWidget,
+        password=PasswordWidget,
+        integer=IntegerWidget,
+        double=DoubleWidget,
+        decimal=DecimalWidget,
+        time=TimeWidget,
+        date=DateWidget,
+        datetime=DatetimeWidget,
+        upload=UploadWidget,
+        boolean=BooleanWidget,
+        blob=None,
+        options=OptionsWidget,
+        multiple=MultipleOptionsWidget,
+        radio=RadioWidget,
+        checkboxes=CheckboxesWidget,
+        autocomplete=AutocompleteWidget,
+        list=ListWidget,
+    ))
 
     formstyles = Storage(dict(
-        table3cols = formstyle_table3cols,
-        table2cols = formstyle_table2cols,
-        divs = formstyle_divs,
-        ul = formstyle_ul,
-        bootstrap = formstyle_bootstrap,
-        inline = formstyle_inline,
-        ))
+        table3cols=formstyle_table3cols,
+        table2cols=formstyle_table2cols,
+        divs=formstyle_divs,
+        ul=formstyle_ul,
+        bootstrap=formstyle_bootstrap,
+        inline=formstyle_inline,
+    ))
 
     FIELDNAME_REQUEST_DELETE = 'delete_this_record'
     FIELDKEY_DELETE_RECORD = 'delete_record'
@@ -854,26 +878,26 @@ class SQLFORM(FORM):
     def __init__(
         self,
         table,
-        record = None,
-        deletable = False,
-        linkto = None,
-        upload = None,
-        fields = None,
-        labels = None,
-        col3 = {},
-        submit_button = 'Submit',
-        delete_label = 'Check to delete',
-        showid = True,
-        readonly = False,
-        comments = True,
-        keepopts = [],
-        ignore_rw = False,
-        record_id = None,
-        formstyle = 'table3cols',
-        buttons = ['submit'],
-        separator = ': ',
+        record=None,
+        deletable=False,
+        linkto=None,
+        upload=None,
+        fields=None,
+        labels=None,
+        col3={},
+        submit_button='Submit',
+        delete_label='Check to delete',
+        showid=True,
+        readonly=False,
+        comments=True,
+        keepopts=[],
+        ignore_rw=False,
+        record_id=None,
+        formstyle='table3cols',
+        buttons=['submit'],
+        separator=': ',
         **attributes
-        ):
+    ):
         """
         SQLFORM(db.table,
                record=None,
@@ -889,10 +913,10 @@ class SQLFORM(FORM):
         # Default dbio setting
         self.detect_record_change = None
 
-        nbsp = XML('&nbsp;') # Firefox2 does not display fields with blanks
+        nbsp = XML('&nbsp;')  # Firefox2 does not display fields with blanks
         FORM.__init__(self, *[], **attributes)
         ofields = fields
-        keyed = hasattr(table,'_primarykey') # for backward compatibility
+        keyed = hasattr(table, '_primarykey')  # for backward compatibility
 
         # if no fields are provided, build it from the provided table
         # will only use writable or readable fields, unless forced to ignore
@@ -904,7 +928,7 @@ class SQLFORM(FORM):
 
         # make sure we have an id
         if self.fields[0] != table.fields[0] and \
-                isinstance(table,Table) and not keyed:
+                isinstance(table, Table) and not keyed:
             self.fields.insert(0, table.fields[0])
 
         self.table = table
@@ -921,8 +945,8 @@ class SQLFORM(FORM):
 
         self.record_id = record_id
         if keyed:
-            self.record_id = dict([(k,record and str(record[k]) or None) \
-                                       for k in table._primarykey])
+            self.record_id = dict([(k, record and str(record[k]) or None)
+                                   for k in table._primarykey])
         self.field_parent = {}
         xfields = []
         self.fields = fields
@@ -938,7 +962,7 @@ class SQLFORM(FORM):
         if not keyed:
             self.id_field_name = table._id.name
         else:
-            self.id_field_name = table._primarykey[0] ### only works if one key
+            self.id_field_name = table._primarykey[0]  # only works if one key
 
         sep = separator or ''
 
@@ -964,9 +988,9 @@ class SQLFORM(FORM):
             field_id = '%s_%s' % (table._tablename, fieldname)
 
             label = LABEL(label, label and sep, _for=field_id,
-                          _id=field_id+SQLFORM.ID_LABEL_SUFFIX)
+                          _id=field_id + SQLFORM.ID_LABEL_SUFFIX)
 
-            row_id = field_id+SQLFORM.ID_ROW_SUFFIX
+            row_id = field_id + SQLFORM.ID_ROW_SUFFIX
             if field.type == 'id':
                 self.custom.dspval.id = nbsp
                 self.custom.inpval.id = ''
@@ -980,12 +1004,11 @@ class SQLFORM(FORM):
                         v = record[field.name]
                         widget = SPAN(v, _id=field_id)
                         self.custom.dspval.id = str(v)
-                        xfields.append((row_id,label, widget,comment))
+                        xfields.append((row_id, label, widget, comment))
                     self.record_id = str(record[field.name])
                 self.custom.widget.id = widget
                 continue
 
-
             if readonly and not ignore_rw and not field.readable:
                 continue
 
@@ -993,8 +1016,8 @@ class SQLFORM(FORM):
                 default = record[fieldname]
             else:
                 default = field.default
-                if isinstance(default,CALLABLETYPES):
-                    default=default()
+                if isinstance(default, CALLABLETYPES):
+                    default = default()
 
             cond = readonly or \
                 (not ignore_rw and not field.writable and field.readable)
@@ -1011,13 +1034,14 @@ class SQLFORM(FORM):
                 # ## format everything else
 
                 if field.represent:
-                    inp = represent(field,default,record)
+                    inp = represent(field, default, record)
                 elif field.type in ['blob']:
                     continue
                 elif field.type == 'upload':
                     inp = UploadWidget.represent(field, default, upload)
                 elif field.type == 'boolean':
-                    inp = self.widgets.boolean.widget(field, default, _disabled=True)
+                    inp = self.widgets.boolean.widget(
+                        field, default, _disabled=True)
                 else:
                     inp = field.formatter(default)
             elif field.type == 'upload':
@@ -1041,7 +1065,7 @@ class SQLFORM(FORM):
                 if fieldname in keepopts:
                     inpval = TAG[''](*inp.components)
             elif field.type.startswith('list:'):
-                inp = self.widgets.list.widget(field,default)
+                inp = self.widgets.list.widget(field, default)
             elif field.type == 'text':
                 inp = self.widgets.text.widget(field, default)
             elif field.type == 'password':
@@ -1057,9 +1081,10 @@ class SQLFORM(FORM):
                 field_type = field_type in self.widgets and field_type or 'string'
                 inp = self.widgets[field_type].widget(field, default)
 
-            xfields.append((row_id,label,inp,comment))
+            xfields.append((row_id, label, inp, comment))
             self.custom.dspval[fieldname] = dspval or nbsp
-            self.custom.inpval[fieldname] = inpval if not inpval is None else ''
+            self.custom.inpval[
+                fieldname] = inpval if not inpval is None else ''
             self.custom.widget[fieldname] = inp
 
         # if a record is provided and found, as is linkto
@@ -1068,9 +1093,11 @@ class SQLFORM(FORM):
             db = linkto.split('/')[-1]
             for rfld in table._referenced_by:
                 if keyed:
-                    query = urllib.quote('%s.%s==%s' % (db,rfld,record[rfld.type[10:].split('.')[1]]))
+                    query = urllib.quote('%s.%s==%s' % (
+                        db, rfld, record[rfld.type[10:].split('.')[1]]))
                 else:
-                    query = urllib.quote('%s.%s==%s' % (db,rfld,record[self.id_field_name]))
+                    query = urllib.quote(
+                        '%s.%s==%s' % (db, rfld, record[self.id_field_name]))
                 lname = olname = '%s.%s' % (rfld.tablename, rfld.name)
                 if ofields and not olname in ofields:
                     continue
@@ -1079,8 +1106,9 @@ class SQLFORM(FORM):
                 widget = A(lname,
                            _class='reference',
                            _href='%s/%s?query=%s' % (linkto, rfld.tablename, query))
-                xfields.append((olname.replace('.', '__')+SQLFORM.ID_ROW_SUFFIX,
-                                '',widget,col3.get(olname,'')))
+                xfields.append(
+                    (olname.replace('.', '__') + SQLFORM.ID_ROW_SUFFIX,
+                     '', widget, col3.get(olname, '')))
                 self.custom.linkto[olname.replace('.', '__')] = widget
 #                 </block>
 
@@ -1088,17 +1116,18 @@ class SQLFORM(FORM):
         self.custom.deletable = ''
         if record and deletable:
             widget = INPUT(_type='checkbox',
-                            _class='delete',
-                            _id=self.FIELDKEY_DELETE_RECORD,
-                            _name=self.FIELDNAME_REQUEST_DELETE,
-                            )
-            xfields.append((self.FIELDKEY_DELETE_RECORD+SQLFORM.ID_ROW_SUFFIX,
-                            LABEL(
-                                delete_label,separator,
-                                _for=self.FIELDKEY_DELETE_RECORD,
-                                _id=self.FIELDKEY_DELETE_RECORD+SQLFORM.ID_LABEL_SUFFIX),
-                            widget,
-                            col3.get(self.FIELDKEY_DELETE_RECORD, '')))
+                           _class='delete',
+                           _id=self.FIELDKEY_DELETE_RECORD,
+                           _name=self.FIELDNAME_REQUEST_DELETE,
+                           )
+            xfields.append(
+                (self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_ROW_SUFFIX,
+                 LABEL(
+                 delete_label, separator,
+                 _for=self.FIELDKEY_DELETE_RECORD,
+                 _id=self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_LABEL_SUFFIX),
+                 widget,
+                 col3.get(self.FIELDKEY_DELETE_RECORD, '')))
             self.custom.deletable = widget
 
         # when writable, add submit button
@@ -1106,7 +1135,7 @@ class SQLFORM(FORM):
         if not readonly:
             if 'submit' in buttons:
                 widget = self.custom.submit = INPUT(_type='submit',
-                               _value=T(submit_button))
+                                                    _value=T(submit_button))
             elif buttons:
                 widget = self.custom.submit = DIV(*buttons)
             if self.custom.submit:
@@ -1133,26 +1162,26 @@ class SQLFORM(FORM):
             if formstyle in SQLFORM.formstyles:
                 formstyle = SQLFORM.formstyles[formstyle]
             else:
-                raise RuntimeError, 'formstyle not found'
+                raise RuntimeError('formstyle not found')
 
         if callable(formstyle):
             # backward compatibility, 4 argument function is the old style
             args, varargs, keywords, defaults = inspect.getargspec(formstyle)
             if defaults and len(args) - len(defaults) == 4 or len(args) == 4:
                 table = TABLE()
-                for id,a,b,c in xfields:
-                    newrows = formstyle(id,a,b,c)
-                    self.field_parent[id] = getattr(b,'parent',None)
+                for id, a, b, c in xfields:
+                    newrows = formstyle(id, a, b, c)
+                    self.field_parent[id] = getattr(b, 'parent', None)
                     if type(newrows).__name__ != "tuple":
                         newrows = [newrows]
                     for newrow in newrows:
                         table.append(newrow)
             else:
                 table = formstyle(self, xfields)
-                for id,a,b,c in xfields:
-                    self.field_parent[id] = getattr(b,'parent',None)
+                for id, a, b, c in xfields:
+                    self.field_parent[id] = getattr(b, 'parent', None)
         else:
-            raise RuntimeError, 'formstyle not supported'
+            raise RuntimeError('formstyle not supported')
         return table
 
     def accepts(
@@ -1166,7 +1195,7 @@ class SQLFORM(FORM):
         hideerror=False,
         detect_record_change=False,
         **kwargs
-        ):
+    ):
 
         """
         similar FORM.accepts but also does insert, update or delete in DAL.
@@ -1180,12 +1209,13 @@ class SQLFORM(FORM):
         if keepvalues is None:
             keepvalues = True if self.record else False
 
-        if self.readonly: return False
+        if self.readonly:
+            return False
 
         if request_vars.__class__.__name__ == 'Request':
             request_vars = request_vars.post_vars
 
-        keyed = hasattr(self.table,'_primarykey')
+        keyed = hasattr(self.table, '_primarykey')
 
         # implement logic to detect whether record exist but has been modified
         # server side
@@ -1194,7 +1224,8 @@ class SQLFORM(FORM):
         if self.detect_record_change:
             if self.record:
                 self.record_changed = False
-                serialized = '|'.join(str(self.record[k]) for k in self.table.fields())
+                serialized = '|'.join(
+                    str(self.record[k]) for k in self.table.fields())
                 self.record_hash = md5_hash(serialized)
 
         # logic to deal with record_id for keyed tables
@@ -1202,9 +1233,9 @@ class SQLFORM(FORM):
             if keyed:
                 formname_id = '.'.join(str(self.record[k])
                                        for k in self.table._primarykey
-                                       if hasattr(self.record,k))
-                record_id = dict((k, request_vars.get(k,None)) \
-                                     for k in self.table._primarykey)
+                                       if hasattr(self.record, k))
+                record_id = dict((k, request_vars.get(k, None))
+                                 for k in self.table._primarykey)
             else:
                 (formname_id, record_id) = (self.record[self.id_field_name],
                                             request_vars.get('id', None))
@@ -1220,8 +1251,8 @@ class SQLFORM(FORM):
             record_id = record_id[0]
 
         if formname:
-            formname = formname % dict(tablename = self.table._tablename,
-                                       record_id = formname_id)
+            formname = formname % dict(tablename=self.table._tablename,
+                                       record_id=formname_id)
 
         # ## THIS IS FOR UNIQUE RECORDS, read IS_NOT_IN_DB
 
@@ -1231,7 +1262,7 @@ class SQLFORM(FORM):
             if not isinstance(requires, (list, tuple)):
                 requires = [requires]
             [item.set_self_id(self.record_id) for item in requires
-            if hasattr(item, 'set_self_id') and self.record_id]
+             if hasattr(item, 'set_self_id') and self.record_id]
 
         # ## END
 
@@ -1248,7 +1279,7 @@ class SQLFORM(FORM):
             onvalidation,
             hideerror=hideerror,
             **kwargs
-            )
+        )
 
         self.deleted = \
             request_vars.get(self.FIELDNAME_REQUEST_DELETE, False)
@@ -1260,10 +1291,10 @@ class SQLFORM(FORM):
         if self.record_changed and self.detect_record_change:
             message_onchange = \
                 kwargs.setdefault("message_onchange",
-                    current.T("A record change was detected. " +
-                              "Consecutive update self-submissions " +
-                              "are not allowed. Try re-submitting or " +
-                              "refreshing the form page."))
+                                  current.T("A record change was detected. " +
+                                            "Consecutive update self-submissions " +
+                                            "are not allowed. Try re-submitting or " +
+                                            "refreshing the form page."))
             if message_onchange is not None:
                 current.response.flash = message_onchange
             return ret
@@ -1285,19 +1316,20 @@ class SQLFORM(FORM):
                         value = self.table[fieldname].default
                     if field.type.startswith('list:') and isinstance(value, str):
                         value = [value]
-                    row_id = '%s_%s%s' % (self.table, fieldname, SQLFORM.ID_ROW_SUFFIX)
+                    row_id = '%s_%s%s' % (
+                        self.table, fieldname, SQLFORM.ID_ROW_SUFFIX)
                     widget = field.widget(field, value)
                     parent = self.field_parent[row_id]
                     if parent:
-                        parent.components = [ widget ]
+                        parent.components = [widget]
                         parent._traverse(False, hideerror)
                     self.custom.widget[fieldname] = widget
             self.accepted = ret
             return ret
 
         if record_id and str(record_id) != str(self.record_id):
-            raise SyntaxError, 'user is tampering with form\'s record_id: ' \
-                '%s != %s' % (record_id, self.record_id)
+            raise SyntaxError('user is tampering with form\'s record_id: '
+                              '%s != %s' % (record_id, self.record_id))
 
         if record_id and dbio and not keyed:
             self.vars.id = self.record[self.id_field_name]
@@ -1306,8 +1338,8 @@ class SQLFORM(FORM):
             if dbio:
                 if keyed:
                     qry = reduce(lambda x, y: x & y,
-                                 [self.table[k] == record_id[k] \
-                                      for k in self.table._primarykey])
+                                 [self.table[k] == record_id[k]
+                                  for k in self.table._primarykey])
                 else:
                     qry = self.table._id == self.record[self.id_field_name]
                 self.table._db(qry).delete()
@@ -1325,7 +1357,7 @@ class SQLFORM(FORM):
                 ### this happens because FORM has no knowledge of writable
                 ### and thinks that a missing boolean field is a None
                 if self.table[fieldname].type == 'boolean' and \
-                    self.vars.get(fieldname, True) is None:
+                        self.vars.get(fieldname, True) is None:
                     del self.vars[fieldname]
                 continue
 
@@ -1363,7 +1395,7 @@ class SQLFORM(FORM):
                         f = os.path.join(current.request.folder,
                                          os.path.normpath(f))
                         source_file = open(f, 'rb')
-                        original_filename  = os.path.split(f)[1]
+                        original_filename = os.path.split(f)[1]
                 elif hasattr(f, 'file'):
                     (source_file, original_filename) = (f.file, f.filename)
                 elif isinstance(f, (str, unicode)):
@@ -1386,13 +1418,14 @@ class SQLFORM(FORM):
                 self.errors[fieldname] = 'no data'
                 self.accepted = False
                 return False
-            value = fields.get(fieldname,None)
+            value = fields.get(fieldname, None)
             if field.type == 'list:string':
                 if not isinstance(value, (tuple, list)):
                     fields[fieldname] = value and [value] or []
-            elif isinstance(field.type,str) and field.type.startswith('list:'):
+            elif isinstance(field.type, str) and field.type.startswith('list:'):
                 if not isinstance(value, list):
-                    fields[fieldname] = [safe_int(x) for x in (value and [value] or [])]
+                    fields[fieldname] = [safe_int(
+                        x) for x in (value and [value] or [])]
             elif field.type == 'integer':
                 if not value is None:
                     fields[fieldname] = safe_int(value)
@@ -1405,8 +1438,8 @@ class SQLFORM(FORM):
 
         for fieldname in self.vars:
             if fieldname != 'id' and fieldname in self.table.fields\
-                 and not fieldname in fields and not fieldname\
-                 in request_vars:
+                and not fieldname in fields and not fieldname\
+                    in request_vars:
                 fields[fieldname] = self.vars[fieldname]
 
         if dbio:
@@ -1421,10 +1454,10 @@ class SQLFORM(FORM):
                     elif not self.table[field.name].default is None:
                         fields[field.name] = self.table[field.name].default
             if keyed:
-                if reduce(lambda x, y: x and y, record_id.values()): # if record_id
+                if reduce(lambda x, y: x and y, record_id.values()):  # if record_id
                     if fields:
                         qry = reduce(lambda x, y: x & y,
-                            [self.table[k] == self.record[k] for k in self.table._primarykey])
+                                     [self.table[k] == self.record[k] for k in self.table._primarykey])
                         self.table._db(qry).update(**fields)
                 else:
                     pk = self.table.insert(**fields)
@@ -1436,7 +1469,8 @@ class SQLFORM(FORM):
                 if record_id:
                     self.vars.id = self.record[self.id_field_name]
                     if fields:
-                        self.table._db(self.table._id == self.record[self.id_field_name]).update(**fields)
+                        self.table._db(self.table._id == self.record[
+                                       self.id_field_name]).update(**fields)
                 else:
                     self.vars.id = self.table.insert(**fields)
         self.accepted = ret
@@ -1445,38 +1479,38 @@ class SQLFORM(FORM):
     AUTOTYPES = {
         type(''): ('string', None),
         type(True): ('boolean', None),
-        type(1): ('integer', IS_INT_IN_RANGE(-1e12,+1e12)),
+        type(1): ('integer', IS_INT_IN_RANGE(-1e12, +1e12)),
         type(1.0): ('double', IS_FLOAT_IN_RANGE()),
         type([]): ('list:string', None),
         type(datetime.date.today()): ('date', IS_DATE()),
         type(datetime.datetime.today()): ('datetime', IS_DATETIME())
-        }
+    }
 
     @staticmethod
-    def dictform(dictionary,**kwargs):
+    def dictform(dictionary, **kwargs):
         fields = []
-        for key,value in sorted(dictionary.items()):
-            t, requires = SQLFORM.AUTOTYPES.get(type(value),(None,None))
+        for key, value in sorted(dictionary.items()):
+            t, requires = SQLFORM.AUTOTYPES.get(type(value), (None, None))
             if t:
-                fields.append(Field(key,t,requires=requires,
+                fields.append(Field(key, t, requires=requires,
                                     default=value))
-        return SQLFORM.factory(*fields,**kwargs)
+        return SQLFORM.factory(*fields, **kwargs)
 
     @staticmethod
-    def smartdictform(session,name,filename=None,query=None,**kwargs):
+    def smartdictform(session, name, filename=None, query=None, **kwargs):
         import os
         if query:
             session[name] = query.db(query).select().first().as_dict()
         elif os.path.exists(filename):
-            env = {'datetime':datetime}
-            session[name] = eval(open(filename).read(),{},env)
+            env = {'datetime': datetime}
+            session[name] = eval(open(filename).read(), {}, env)
         form = SQLFORM.dictform(session[name])
         if form.process().accepted:
             session[name].update(form.vars)
             if query:
                 query.db(query).update(**form.vars)
             else:
-                open(filename,'w').write(repr(session[name]))
+                open(filename, 'w').write(repr(session[name]))
         return form
 
     @staticmethod
@@ -1501,88 +1535,91 @@ class SQLFORM(FORM):
                        **attributes)
 
     @staticmethod
-    def build_query(fields,keywords):
+    def build_query(fields, keywords):
         request = current.request
-        if isinstance(keywords,(tuple,list)):
-           keywords = keywords[0]
-           request.vars.keywords = keywords
+        if isinstance(keywords, (tuple, list)):
+            keywords = keywords[0]
+            request.vars.keywords = keywords
         key = keywords.strip()
         if key and not ' ' in key and not '"' in key and not "'" in key:
-            SEARCHABLE_TYPES = ('string','text','list:string')
-            parts = [field.contains(key) for field in fields if field.type in SEARCHABLE_TYPES]
+            SEARCHABLE_TYPES = ('string', 'text', 'list:string')
+            parts = [field.contains(
+                key) for field in fields if field.type in SEARCHABLE_TYPES]
         else:
             parts = None
         if parts:
-            return reduce(lambda a,b: a|b,parts)
+            return reduce(lambda a, b: a | b, parts)
         else:
-            return smart_query(fields,key)
+            return smart_query(fields, key)
 
     @staticmethod
-    def search_menu(fields,search_options=None):
+    def search_menu(fields, search_options=None):
         T = current.T
         search_options = search_options or {
-            'string':['=','!=','<','>','<=','>=','starts with','contains'],
-            'text':['=','!=','<','>','<=','>=','starts with','contains'],
-            'date':['=','!=','<','>','<=','>='],
-            'time':['=','!=','<','>','<=','>='],
-            'datetime':['=','!=','<','>','<=','>='],
-            'integer':['=','!=','<','>','<=','>='],
-            'double':['=','!=','<','>','<=','>='],
-            'id':['=','!=','<','>','<=','>='],
-            'reference':['=','!=','<','>','<=','>='],
-            'boolean':['=','!=']}
-        if fields[0]._db._adapter.dbengine=='google:datastore':
-            search_options['string'] = ['=','!=','<','>','<=','>=']
-            search_options['text'] = ['=','!=','<','>','<=','>=']
+            'string': ['=', '!=', '<', '>', '<=', '>=', 'starts with', 'contains'],
+            'text': ['=', '!=', '<', '>', '<=', '>=', 'starts with', 'contains'],
+            'date': ['=', '!=', '<', '>', '<=', '>='],
+            'time': ['=', '!=', '<', '>', '<=', '>='],
+            'datetime': ['=', '!=', '<', '>', '<=', '>='],
+            'integer': ['=', '!=', '<', '>', '<=', '>='],
+            'double': ['=', '!=', '<', '>', '<=', '>='],
+            'id': ['=', '!=', '<', '>', '<=', '>='],
+            'reference': ['=', '!=', '<', '>', '<=', '>='],
+            'boolean': ['=', '!=']}
+        if fields[0]._db._adapter.dbengine == 'google:datastore':
+            search_options['string'] = ['=', '!=', '<', '>', '<=', '>=']
+            search_options['text'] = ['=', '!=', '<', '>', '<=', '>=']
             search_options['list:string'] = ['contains']
             search_options['list:integer'] = ['contains']
             search_options['list:reference'] = ['contains']
         criteria = []
         selectfields = []
         for field in fields:
-            name = str(field).replace('.','-')
-            options = search_options.get(field.type.split(' ')[0],None)
+            name = str(field).replace('.', '-')
+            options = search_options.get(field.type.split(' ')[0], None)
             if options:
-                label = isinstance(field.label,str) and T(field.label) or field.label
+                label = isinstance(
+                    field.label, str) and T(field.label) or field.label
                 selectfields.append(OPTION(label, _value=str(field)))
                 operators = SELECT(*[T(option) for option in options])
-                if field.type=='boolean':
+                if field.type == 'boolean':
                     value_input = SELECT(
-                        OPTION(T("True"),_value="T"),
-                        OPTION(T("False"),_value="F"),
-                        _id="w2p_value_"+name)
+                        OPTION(T("True"), _value="T"),
+                        OPTION(T("False"), _value="F"),
+                        _id="w2p_value_" + name)
                 else:
                     value_input = INPUT(_type='text',
-                                        _id="w2p_value_"+name,
+                                        _id="w2p_value_" + name,
                                         _class=field.type)
                 new_button = INPUT(
-                    _type="button", _value=T('New'),_class="btn",
+                    _type="button", _value=T('New'), _class="btn",
                     _onclick="w2p_build_query('new','%s')" % field)
                 and_button = INPUT(
-                    _type="button", _value=T('And'),_class="btn",
+                    _type="button", _value=T('And'), _class="btn",
                     _onclick="w2p_build_query('and','%s')" % field)
                 or_button = INPUT(
-                    _type="button", _value=T('Or'),_class="btn",
+                    _type="button", _value=T('Or'), _class="btn",
                     _onclick="w2p_build_query('or','%s')" % field)
                 close_button = INPUT(
-                    _type="button", _value=T('Close'),_class="btn",
+                    _type="button", _value=T('Close'), _class="btn",
                     _onclick="jQuery('#w2p_query_panel').slideUp()")
 
                 criteria.append(DIV(
-                        operators,value_input,new_button,
-                        and_button,or_button,close_button,
-                        _id='w2p_field_%s' % name,
+                    operators, value_input, new_button,
+                    and_button, or_button, close_button,
+                    _id='w2p_field_%s' % name,
                         _class='w2p_query_row hidden',
                         _style='display:inline'))
 
-        criteria.insert(0,SELECT(
-                _id="w2p_query_fields",
+        criteria.insert(0, SELECT(
+            _id="w2p_query_fields",
                 _onchange="jQuery('.w2p_query_row').hide();jQuery('#w2p_field_'+jQuery('#w2p_query_fields').val().replace('.','-')).show();",
                 _style='float:left',
                 *selectfields))
 
         fadd = SCRIPT("""
-        jQuery('#w2p_query_panel input,#w2p_query_panel select').css('width','auto');
+        jQuery('#w2p_query_panel input,#w2p_query_panel select').css(
+            'width','auto');
         jQuery(function(){web2py_ajax_fields('#w2p_query_panel');});
         function w2p_build_query(aggregator,a) {
           var b=a.replace('.','-');
@@ -1595,9 +1632,7 @@ class SQLFORM(FORM):
         }
         """)
         return CAT(
-            DIV(_id="w2p_query_panel",_class='hidden',*criteria),fadd)
-
-
+            DIV(_id="w2p_query_panel", _class='hidden', *criteria), fadd)
 
     @staticmethod
     def grid(query,
@@ -1618,16 +1653,16 @@ class SQLFORM(FORM):
              csv=True,
              links=None,
              links_in_grid=True,
-             upload = '<default>',
+             upload='<default>',
              args=[],
-             user_signature = True,
+             user_signature=True,
              maxtextlengths={},
              maxtextlength=20,
              onvalidation=None,
              oncreate=None,
              onupdate=None,
              ondelete=None,
-             sorter_icons=(XML('&#x2191;'),XML('&#x2193;')),
+             sorter_icons=(XML('&#x2191;'), XML('&#x2193;')),
              ui = 'web2py',
              showbuttontext=True,
              _class="web2py_grid",
@@ -1640,7 +1675,7 @@ class SQLFORM(FORM):
              createargs={},
              editargs={},
              viewargs={},
-            ):
+             ):
 
         # jQuery UI ThemeRoller classes (empty if ui is disabled)
         if ui == 'jquery-ui':
@@ -1679,8 +1714,8 @@ class SQLFORM(FORM):
                       buttontable='icon rightarrow icon-arrow-right',
                       buttonview='icon magnifier icon-zoom-in',
                       )
-        elif not isinstance(ui,dict):
-            raise RuntimeError,'SQLFORM.grid ui argument must be a dictionary'
+        elif not isinstance(ui, dict):
+            raise RuntimeError('SQLFORM.grid ui argument must be a dictionary')
 
         db = query._db
         T = current.T
@@ -1693,18 +1728,18 @@ class SQLFORM(FORM):
         deletable = wenabled and deletable
 
         def url(**b):
-            b['args'] = args+b.get('args',[])
-            b['hash_vars']=False
+            b['args'] = args + b.get('args', [])
+            b['hash_vars'] = False
             b['user_signature'] = user_signature
             return URL(**b)
 
         def url2(**b):
-            b['args'] = request.args+b.get('args',[])
-            b['hash_vars']=False
+            b['args'] = request.args + b.get('args', [])
+            b['hash_vars'] = False
             b['user_signature'] = user_signature
             return URL(**b)
 
-        referrer = session.get('_web2py_grid_referrer_'+formname, url())
+        referrer = session.get('_web2py_grid_referrer_' + formname, url())
         # if not user_signature every action is accessible
         # else forbid access unless
         # - url is based url
@@ -1713,7 +1748,7 @@ class SQLFORM(FORM):
         if user_signature:
             if not(
                 '/'.join(str(a) for a in args) == '/'.join(request.args) or
-                URL.verify(request,user_signature=user_signature,
+                URL.verify(request, user_signature=user_signature,
                            hash_vars=False) or not (
                     'create' in request.args or
                     'delete' in request.args or
@@ -1727,65 +1762,66 @@ class SQLFORM(FORM):
             if showbuttontext:
                 if callback:
                     return A(SPAN(_class=ui.get(buttonclass)),
-                             SPAN(T(buttontext),_title=buttontext,
+                             SPAN(T(buttontext), _title=buttontext,
                                   _class=ui.get('buttontext')),
-                             callback=callback,delete=delete,
-                             _class=trap_class(ui.get('button'),trap))
+                             callback=callback, delete=delete,
+                             _class=trap_class(ui.get('button'), trap))
                 else:
                     return A(SPAN(_class=ui.get(buttonclass)),
-                             SPAN(T(buttontext),_title=buttontext,
+                             SPAN(T(buttontext), _title=buttontext,
                                   _class=ui.get('buttontext')),
                              _href=buttonurl,
-                             _class=trap_class(ui.get('button'),trap))
+                             _class=trap_class(ui.get('button'), trap))
             else:
                 if callback:
                     return A(SPAN(_class=ui.get(buttonclass)),
-                             callback=callback,delete=delete,
+                             callback=callback, delete=delete,
                              _title=buttontext,
-                             _class=trap_class(ui.get('buttontext'),trap))
+                             _class=trap_class(ui.get('buttontext'), trap))
                 else:
                     return A(SPAN(_class=ui.get(buttonclass)),
-                             _href=buttonurl,_title=buttontext,
-                             _class=trap_class(ui.get('buttontext'),trap))
+                             _href=buttonurl, _title=buttontext,
+                             _class=trap_class(ui.get('buttontext'), trap))
         dbset = db(query)
         tablenames = db._adapter.tables(dbset.query)
-        if left!=None: tablenames+=db._adapter.tables(left)
+        if left is not None:
+            tablenames += db._adapter.tables(left)
         tables = [db[tablename] for tablename in tablenames]
         if not fields:
-            fields = reduce(lambda a,b:a+b,
+            fields = reduce(lambda a, b: a + b,
                             [[field for field in table] for table in tables])
         if not field_id:
             field_id = tables[0]._id
-        columns = [str(field) for field in fields \
-                       if field._tablename in tablenames]
+        columns = [str(field) for field in fields
+                   if field._tablename in tablenames]
 
         if not str(field_id) in [str(f) for f in fields]:
             fields.append(field_id)
         table = field_id.table
         tablename = table._tablename
-        if upload=='<default>':
-            upload = lambda filename: url(args=['download',filename])
-            if len(request.args)>1 and request.args[-2]=='download':
-                stream = response.download(request,db)
-                raise HTTP(200,stream,**response.headers)
+        if upload == '<default>':
+            upload = lambda filename: url(args=['download', filename])
+            if len(request.args) > 1 and request.args[-2] == 'download':
+                stream = response.download(request, db)
+                raise HTTP(200, stream, **response.headers)
 
-        def buttons(edit=False,view=False,record=None):
+        def buttons(edit=False, view=False, record=None):
             buttons = DIV(gridbutton('buttonback', 'Back', referrer),
                           _class='form_header row_buttons %(header)s %(cornertop)s' % ui)
             if edit and (not callable(edit) or edit(record)):
-                args = ['edit',table._tablename,request.args[-1]]
+                args = ['edit', table._tablename, request.args[-1]]
                 buttons.append(gridbutton('buttonedit', 'Edit',
                                           url(args=args)))
             if view:
-                args = ['view',table._tablename,request.args[-1]]
+                args = ['view', table._tablename, request.args[-1]]
                 buttons.append(gridbutton('buttonview', 'View',
                                           url(args=args)))
             if record and links:
                 for link in links:
-                    if isinstance(link,dict):
-                         buttons.append(link['body'](record))
+                    if isinstance(link, dict):
+                        buttons.append(link['body'](record))
                     elif link(record):
-                         buttons.append(link(record))
+                        buttons.append(link(record))
             return buttons
 
         formfooter = DIV(
@@ -1794,7 +1830,7 @@ class SQLFORM(FORM):
         create_form = update_form = view_form = search_form = None
         sqlformargs = dict(formargs)
 
-        if create and len(request.args)>1 and request.args[-2] == 'new':
+        if create and len(request.args) > 1 and request.args[-2] == 'new':
             table = db[request.args[-1]]
             sqlformargs.update(createargs)
             create_form = SQLFORM(
@@ -1802,9 +1838,9 @@ class SQLFORM(FORM):
                 _class='web2py_form',
                 **sqlformargs)
             create_form.process(formname=formname,
-                    next=referrer,
-                    onvalidation=onvalidation,
-                    onsuccess=oncreate)
+                                next=referrer,
+                                onvalidation=onvalidation,
+                                onsuccess=oncreate)
             res = DIV(buttons(), create_form, formfooter, _class=_class)
             res.create_form = create_form
             res.update_form = update_form
@@ -1812,13 +1848,14 @@ class SQLFORM(FORM):
             res.search_form = search_form
             return res
 
-        elif details and len(request.args)>2 and request.args[-3]=='view':
+        elif details and len(request.args) > 2 and request.args[-3] == 'view':
             table = db[request.args[-2]]
             record = table(request.args[-1]) or redirect(URL('error'))
             sqlformargs.update(viewargs)
-            view_form = SQLFORM(table, record, upload=upload, ignore_rw=ignore_rw,
-                           formstyle=formstyle, readonly=True, _class='web2py_form',
-                           **sqlformargs)
+            view_form = SQLFORM(
+                table, record, upload=upload, ignore_rw=ignore_rw,
+                formstyle=formstyle, readonly=True, _class='web2py_form',
+                **sqlformargs)
             res = DIV(buttons(edit=editable, record=record), view_form,
                       formfooter, _class=_class)
             res.create_form = create_form
@@ -1826,7 +1863,7 @@ class SQLFORM(FORM):
             res.view_form = view_form
             res.search_form = search_form
             return res
-        elif editable and len(request.args)>2 and request.args[-3]=='edit':
+        elif editable and len(request.args) > 2 and request.args[-3] == 'edit':
             table = db[request.args[-2]]
             record = table(request.args[-1]) or redirect(URL('error'))
             sqlformargs.update(editargs)
@@ -1850,20 +1887,20 @@ class SQLFORM(FORM):
             res.view_form = view_form
             res.search_form = search_form
             return res
-        elif deletable and len(request.args)>2 and request.args[-3]=='delete':
+        elif deletable and len(request.args) > 2 and request.args[-3] == 'delete':
             table = db[request.args[-2]]
             if ondelete:
-                ondelete(table,request.args[-1])
-            ret = db(table[table._id.name]==request.args[-1]).delete()
+                ondelete(table, request.args[-1])
+            ret = db(table[table._id.name] == request.args[-1]).delete()
             return ret
 
         exportManager = dict(
-            csv_with_hidden_cols=(ExporterCSV,'CSV (hidden cols)'),
-            csv=(ExporterCSV,'CSV'),
+            csv_with_hidden_cols=(ExporterCSV, 'CSV (hidden cols)'),
+            csv=(ExporterCSV, 'CSV'),
             xml=(ExporterXML, 'XML'),
             html=(ExporterHTML, 'HTML'),
-            tsv_with_hidden_cols=\
-                (ExporterTSV,'TSV (Excel compatible, hidden cols)'),
+            tsv_with_hidden_cols=
+                (ExporterTSV, 'TSV (Excel compatible, hidden cols)'),
             tsv=(ExporterTSV, 'TSV (Excel compatible)'))
         if not exportclasses is None:
             exportManager.update(exportclasses)
@@ -1872,22 +1909,22 @@ class SQLFORM(FORM):
         if export_type:
             order = request.vars.order or ''
             if sortable:
-                if order and not order=='None':
-                    if order[:1]=='~':
+                if order and not order == 'None':
+                    if order[:1] == '~':
                         sign, rorder = '~', order[1:]
                     else:
                         sign, rorder = '', order
-                    tablename,fieldname = rorder.split('.',1)
-                    orderby=db[tablename][fieldname]
-                    if sign=='~':
-                        orderby=~orderby
+                    tablename, fieldname = rorder.split('.', 1)
+                    orderby = db[tablename][fieldname]
+                    if sign == '~':
+                        orderby = ~orderby
 
             table_fields = [f for f in fields if f._tablename in tablenames]
-            if export_type in ('csv_with_hidden_cols','tsv_with_hidden_cols'):
+            if export_type in ('csv_with_hidden_cols', 'tsv_with_hidden_cols'):
                 if request.vars.keywords:
                     try:
                         dbset = dbset(SQLFORM.build_query(
-                                fields,request.vars.get('keywords','')))
+                            fields, request.vars.get('keywords', '')))
                         rows = dbset.select(cacheable=True)
                     except Exception, e:
                         response.flash = T('Internal Error')
@@ -1895,8 +1932,8 @@ class SQLFORM(FORM):
                 else:
                     rows = dbset.select(cacheable=True)
             else:
-                rows = dbset.select(left=left,orderby=orderby,
-                                    cacheable=True,*columns)
+                rows = dbset.select(left=left, orderby=orderby,
+                                    cacheable=True, *columns)
 
             if export_type in exportManager:
                 value = exportManager[export_type]
@@ -1905,46 +1942,46 @@ class SQLFORM(FORM):
                 filename = '.'.join(('rows', oExp.file_ext))
                 response.headers['Content-Type'] = oExp.content_type
                 response.headers['Content-Disposition'] = \
-                    'attachment;filename='+filename+';'
-                raise HTTP(200, oExp.export(),**response.headers)
+                    'attachment;filename=' + filename + ';'
+                raise HTTP(200, oExp.export(), **response.headers)
 
         elif request.vars.records and not isinstance(
-            request.vars.records,list):
-            request.vars.records=[request.vars.records]
+                request.vars.records, list):
+            request.vars.records = [request.vars.records]
         elif not request.vars.records:
-            request.vars.records=[]
+            request.vars.records = []
 
-        session['_web2py_grid_referrer_'+formname] = url2(vars=request.vars)
+        session['_web2py_grid_referrer_' + formname] = url2(vars=request.vars)
         console = DIV(_class='web2py_console %(header)s %(cornertop)s' % ui)
         error = None
         if create:
             add = gridbutton(
-                    buttonclass='buttonadd',
-                    buttontext='Add',
-                    buttonurl=url(args=['new',tablename]))
+                buttonclass='buttonadd',
+                buttontext='Add',
+                buttonurl=url(args=['new', tablename]))
             if not searchable:
                 console.append(add)
         else:
             add = ''
 
         if searchable:
-            sfields = reduce(lambda a,b:a+b,
+            sfields = reduce(lambda a, b: a + b,
                              [[f for f in t if f.readable] for t in tables])
-            if isinstance(search_widget,dict):
+            if isinstance(search_widget, dict):
                 search_widget = search_widget[tablename]
-            if search_widget=='default':
+            if search_widget == 'default':
                 search_menu = SQLFORM.search_menu(sfields)
                 search_widget = lambda sfield, url: CAT(FORM(
-                    INPUT(_name='keywords',_value=request.vars.keywords,
-                          _id='web2py_keywords',_onfocus="jQuery('#w2p_query_fields').change();jQuery('#w2p_query_panel').slideDown();"),
-                    INPUT(_type='submit',_value=T('Search'),_class="btn"),
-                    INPUT(_type='submit',_value=T('Clear'),_class="btn",
+                    INPUT(_name='keywords', _value=request.vars.keywords,
+                          _id='web2py_keywords', _onfocus="jQuery('#w2p_query_fields').change();jQuery('#w2p_query_panel').slideDown();"),
+                    INPUT(_type='submit', _value=T('Search'), _class="btn"),
+                    INPUT(_type='submit', _value=T('Clear'), _class="btn",
                           _onclick="jQuery('#web2py_keywords').val('');"),
-                    _method="GET",_action=url),search_menu)
-            form = search_widget and search_widget(sfields,url()) or ''
+                    _method="GET", _action=url), search_menu)
+            form = search_widget and search_widget(sfields, url()) or ''
             console.append(add)
             console.append(form)
-            keywords = request.vars.get('keywords','')
+            keywords = request.vars.get('keywords', '')
             try:
                 if callable(searchable):
                     subquery = searchable(sfields, keywords)
@@ -1961,7 +1998,7 @@ class SQLFORM(FORM):
         try:
             if left or groupby:
                 c = 'count(*)'
-                nrows = dbset.select(c,left=left,cacheable=True,
+                nrows = dbset.select(c, left=left, cacheable=True,
                                      groupby=groupby).first()[c]
             else:
                 nrows = dbset.count()
@@ -1971,140 +2008,154 @@ class SQLFORM(FORM):
 
         order = request.vars.order or ''
         if sortable:
-            if order and not order=='None':
-                tablename,fieldname = order.split('~')[-1].split('.',1)
+            if order and not order == 'None':
+                tablename, fieldname = order.split('~')[-1].split('.', 1)
                 sort_field = db[tablename][fieldname]
-                exception = sort_field.type in ('date','datetime','time')
+                exception = sort_field.type in ('date', 'datetime', 'time')
                 if exception:
-                    orderby = (order[:1]=='~' and sort_field) or ~sort_field
+                    orderby = (order[:1] == '~' and sort_field) or ~sort_field
                 else:
-                    orderby = (order[:1]=='~' and ~sort_field) or sort_field
+                    orderby = (order[:1] == '~' and ~sort_field) or sort_field
 
         head = TR(_class=ui.get('header'))
         if selectable:
             head.append(TH(_class=ui.get('default')))
         for field in fields:
-            if columns and not str(field) in columns: continue
-            if not field.readable: continue
+            if columns and not str(field) in columns:
+                continue
+            if not field.readable:
+                continue
             key = str(field)
             header = headers.get(str(field), field.label or key)
             if sortable:
                 if key == order:
-                    key, marker = '~'+order, sorter_icons[0]
+                    key, marker = '~' + order, sorter_icons[0]
                 elif key == order[1:]:
                     marker = sorter_icons[1]
                 else:
                     marker = ''
-                header = A(header,marker,_href=url(vars=dict(
-                            keywords=request.vars.keywords or '',
-                            order=key)),_class=trap_class())
+                header = A(header, marker, _href=url(vars=dict(
+                    keywords=request.vars.keywords or '',
+                    order=key)), _class=trap_class())
             head.append(TH(header, _class=ui.get('default')))
 
         if links and links_in_grid:
             for link in links:
-                if isinstance(link,dict):
+                if isinstance(link, dict):
                     head.append(TH(link['header'], _class=ui.get('default')))
 
         # Include extra column for buttons if needed.
         include_buttons_column = (details or editable or deletable or
-            (links and links_in_grid and
-             not all([isinstance(link, dict) for link in links])))
+                                  (links and links_in_grid and
+                                   not all([isinstance(link, dict) for link in links])))
         if include_buttons_column:
             head.append(TH(_class=ui.get('default')))
 
         paginator = UL()
-        if paginate and paginate<nrows:
-            npages,reminder = divmod(nrows,paginate)
-            if reminder: npages+=1
-            try: page = int(request.vars.page or 1)-1
-            except ValueError: page = 0
-            limitby = (paginate*page,paginate*(page+1))
-            def self_link(name,p):
-                d = dict(page=p+1)
-                if order: d['order']=order
-                if request.vars.keywords: d['keywords']=request.vars.keywords
-                return A(name,_href=url(vars=d),_class=trap_class())
-            NPAGES = 5 # window is 2*NPAGES
-            if page>NPAGES+1:
-                paginator.append(LI(self_link('<<',0)))
-            if page>NPAGES:
-                paginator.append(LI(self_link('<',page-1)))
-            pages = range(max(0,page-NPAGES),min(page+NPAGES,npages))
+        if paginate and paginate < nrows:
+            npages, reminder = divmod(nrows, paginate)
+            if reminder:
+                npages += 1
+            try:
+                page = int(request.vars.page or 1) - 1
+            except ValueError:
+                page = 0
+            limitby = (paginate * page, paginate * (page + 1))
+
+            def self_link(name, p):
+                d = dict(page=p + 1)
+                if order:
+                    d['order'] = order
+                if request.vars.keywords:
+                    d['keywords'] = request.vars.keywords
+                return A(name, _href=url(vars=d), _class=trap_class())
+            NPAGES = 5  # window is 2*NPAGES
+            if page > NPAGES + 1:
+                paginator.append(LI(self_link('<<', 0)))
+            if page > NPAGES:
+                paginator.append(LI(self_link('<', page - 1)))
+            pages = range(max(0, page - NPAGES), min(page + NPAGES, npages))
             for p in pages:
                 if p == page:
-                    paginator.append(LI(A(p+1,_onclick='return false'),
+                    paginator.append(LI(A(p + 1, _onclick='return false'),
                                         _class=trap_class('current')))
                 else:
-                    paginator.append(LI(self_link(p+1,p)))
-            if page<npages-NPAGES:
-                paginator.append(LI(self_link('>',page+1)))
-            if page<npages-NPAGES-1:
-                paginator.append(LI(self_link('>>',npages-1)))
+                    paginator.append(LI(self_link(p + 1, p)))
+            if page < npages - NPAGES:
+                paginator.append(LI(self_link('>', page + 1)))
+            if page < npages - NPAGES - 1:
+                paginator.append(LI(self_link('>>', npages - 1)))
         else:
             limitby = None
 
         try:
             table_fields = [f for f in fields if f._tablename in tablenames]
-            rows = dbset.select(left=left,orderby=orderby,
-                                groupby=groupby,limitby=limitby,
+            rows = dbset.select(left=left, orderby=orderby,
+                                groupby=groupby, limitby=limitby,
                                 *table_fields)
         except SyntaxError:
             rows = None
             error = T("Query Not Supported")
         if nrows:
             message = error or T('%(nrows)s records found') % dict(nrows=nrows)
-            console.append(DIV(message,_class='web2py_counter'))
+            console.append(DIV(message, _class='web2py_counter'))
 
         if rows:
             htmltable = TABLE(THEAD(head))
             tbody = TBODY()
-            numrec=0
+            numrec = 0
             for row in rows:
                 if numrec % 2 == 0:
                     classtr = 'even'
                 else:
                     classtr = 'odd'
-                numrec+=1
+                numrec += 1
                 id = row[field_id]
                 if id:
                     rid = id
-                    if callable(rid): ### can this ever be callable?
+                    if callable(rid):  # can this ever be callable?
                         rid = rid(row)
                     tr = TR(_id=rid, _class='%s %s' % (classtr, 'with_id'))
                 else:
                     tr = TR(_class=classtr)
                 if selectable:
-                    tr.append(INPUT(_type="checkbox",_name="records",_value=id,
+                    tr.append(
+                        INPUT(_type="checkbox", _name="records", _value=id,
                                     value=request.vars.records))
                 for field in fields:
-                    if not str(field) in columns: continue
-                    if not field.readable: continue
-                    if field.type=='blob': continue
+                    if not str(field) in columns:
+                        continue
+                    if not field.readable:
+                        continue
+                    if field.type == 'blob':
+                        continue
                     value = row[field]
-                    maxlength = maxtextlengths.get(str(field),maxtextlength)
+                    maxlength = maxtextlengths.get(str(field), maxtextlength)
                     if field.represent:
                         try:
-                            value=field.represent(value,row)
+                            value = field.represent(value, row)
                         except KeyError:
                             try:
-                                value=field.represent(value,row[field._tablename])
+                                value = field.represent(
+                                    value, row[field._tablename])
                             except KeyError:
                                 pass
-                    elif field.type=='boolean':
-                        value = INPUT(_type="checkbox",_checked = value,
+                    elif field.type == 'boolean':
+                        value = INPUT(_type="checkbox", _checked=value,
                                       _disabled=True)
-                    elif field.type=='upload':
+                    elif field.type == 'upload':
                         if value:
                             if callable(upload):
-                                value = A(current.T('file'), _href=upload(value))
+                                value = A(
+                                    current.T('file'), _href=upload(value))
                             elif upload:
                                 value = A(current.T('file'),
                                           _href='%s/%s' % (upload, value))
                         else:
                             value = ''
-                    if isinstance(value,str):
-                        value = truncate_string(value,maxlength)
-                    elif not isinstance(value,DIV):
+                    if isinstance(value, str):
+                        value = truncate_string(value, maxlength)
+                    elif not isinstance(value, DIV):
                         value = field.formatter(value)
                     tr.append(TD(value))
                 row_buttons = TD(_class='row_buttons')
@@ -2118,24 +2169,24 @@ class SQLFORM(FORM):
                 if include_buttons_column:
                     if details and (not callable(details) or details(row)):
                         row_buttons.append(gridbutton(
-                                'buttonview', 'View',
-                                url(args=['view',tablename,id])))
+                            'buttonview', 'View',
+                            url(args=['view', tablename, id])))
                     if editable and (not callable(editable) or editable(row)):
                         row_buttons.append(gridbutton(
-                                'buttonedit', 'Edit',
-                                url(args=['edit',tablename,id])))
+                            'buttonedit', 'Edit',
+                            url(args=['edit', tablename, id])))
                     if deletable and (not callable(deletable) or deletable(row)):
                         row_buttons.append(gridbutton(
-                                'buttondelete', 'Delete',
-                                callback=url(args=['delete',tablename,id]),
-                                delete='tr'))
+                            'buttondelete', 'Delete',
+                            callback=url(args=['delete', tablename, id]),
+                            delete='tr'))
                     tr.append(row_buttons)
                 tbody.append(tr)
             htmltable.append(tbody)
-            htmltable = DIV(htmltable,_style='width:100%;overflow-x:auto')
+            htmltable = DIV(htmltable, _style='width:100%;overflow-x:auto')
             if selectable:
-                htmltable = FORM(htmltable,INPUT(_type="submit"))
-                if htmltable.process(formname=formname).accepted:#
+                htmltable = FORM(htmltable, INPUT(_type="submit"))
+                if htmltable.process(formname=formname).accepted:
                     htmltable.vars.records = htmltable.vars.records or []
                     htmltable.vars.records = htmltable.vars.records if type(htmltable.vars.records) == list else [htmltable.vars.records]
                     records = [int(r) for r in htmltable.vars.records]
@@ -2145,26 +2196,27 @@ class SQLFORM(FORM):
             htmltable = DIV(current.T('No records found'))
 
         if csv and nrows:
-            export_links =[]
-            for k,v in sorted(exportManager.items()):
+            export_links = []
+            for k, v in sorted(exportManager.items()):
                 label = v[1] if hasattr(v, "__getitem__") else k
                 link = url2(vars=dict(
-                        order=request.vars.order or '',
-                        _export_type=k,
-                        keywords=request.vars.keywords or ''))
-                export_links.append(A(T(label),_href=link))
+                    order=request.vars.order or '',
+                    _export_type=k,
+                    keywords=request.vars.keywords or ''))
+                export_links.append(A(T(label), _href=link))
             export_menu = \
-                DIV(T('Export:'),_class="w2p_export_menu",*export_links)
+                DIV(T('Export:'), _class="w2p_export_menu", *export_links)
         else:
             export_menu = None
 
-        res = DIV(console,DIV(htmltable,_class="web2py_table"),
+        res = DIV(console, DIV(htmltable, _class="web2py_table"),
                   _class='%s %s' % (_class, ui.get('widget')))
         if paginator.components:
             res.append(
                 DIV(paginator,
-                    _class="web2py_paginator %(header)s %(cornerbottom)s"%ui))
-        if export_menu: res.append(export_menu)
+                    _class="web2py_paginator %(header)s %(cornerbottom)s" % ui))
+        if export_menu:
+            res.append(export_menu)
         res.create_form = create_form
         res.update_form = update_form
         res.view_form = view_form
@@ -2207,50 +2259,56 @@ class SQLFORM(FORM):
         to be linked
         """
         request, T = current.request, current.T
-        if args is None: args = []
+        if args is None:
+            args = []
 
         def url(**b):
-            b['args'] = request.args[:nargs]+b.get('args',[])
-            b['hash_vars']=False
+            b['args'] = request.args[:nargs] + b.get('args', [])
+            b['hash_vars'] = False
             b['user_signature'] = user_signature
             return URL(**b)
 
         db = table._db
         breadcrumbs = []
         if request.args(len(args)) != table._tablename:
-            request.args[:]=args+[table._tablename]
-        if links is None: links = {}
-        if constraints is None: constraints = {}
+            request.args[:] = args + [table._tablename]
+        if links is None:
+            links = {}
+        if constraints is None:
+            constraints = {}
         field = None
         try:
-            nargs = len(args)+1
-            previous_tablename,previous_fieldname,previous_id = \
-                table._tablename,None,None
-            while len(request.args)>nargs:
+            nargs = len(args) + 1
+            previous_tablename, previous_fieldname, previous_id = \
+                table._tablename, None, None
+            while len(request.args) > nargs:
                 key = request.args(nargs)
                 if '.' in key:
-                    id = request.args(nargs+1)
-                    tablename,fieldname = key.split('.',1)
+                    id = request.args(nargs + 1)
+                    tablename, fieldname = key.split('.', 1)
                     table = db[tablename]
                     field = table[fieldname]
                     field.default = id
                     referee = field.type[10:]
-                    if referee!=previous_tablename:
+                    if referee != previous_tablename:
                         raise HTTP(400)
-                    cond = constraints.get(referee,None)
+                    cond = constraints.get(referee, None)
                     if cond:
-                        record = db(db[referee].id==id)(cond).select().first()
+                        record = db(
+                            db[referee].id == id)(cond).select().first()
                     else:
                         record = db[referee](id)
                     if previous_id:
                         if record[previous_fieldname] != int(previous_id):
                             raise HTTP(400)
-                    previous_tablename,previous_fieldname,previous_id = \
-                        tablename,fieldname,id
+                    previous_tablename, previous_fieldname, previous_id = \
+                        tablename, fieldname, id
                     try:
                         format = db[referee]._format
-                        if callable(format): name = format(record)
-                        else: name = format % record
+                        if callable(format):
+                            name = format(record)
+                        else:
+                            name = format % record
                     except TypeError:
                         name = id
                     nameLink = 'view'
@@ -2258,35 +2316,35 @@ class SQLFORM(FORM):
                         LI(A(T(db[referee]._plural),
                              _class=trap_class(),
                              _href=url()),
-                           SPAN(divider,_class='divider'),
+                           SPAN(divider, _class='divider'),
                            _class='w2p_grid_breadcrumb_elem'))
-                    if kwargs.get('details',True):
+                    if kwargs.get('details', True):
                         breadcrumbs.append(
-                            LI(A(name,_class=trap_class(),
-                                 _href=url(args=['view',referee,id])),
-                               SPAN(divider,_class='divider'),
+                            LI(A(name, _class=trap_class(),
+                                 _href=url(args=['view', referee, id])),
+                               SPAN(divider, _class='divider'),
                                _class='w2p_grid_breadcrumb_elem'))
-                    nargs+=2
+                    nargs += 2
                 else:
                     break
-            if nargs>len(args)+1:
+            if nargs > len(args) + 1:
                 query = (field == id)
-                if isinstance(linked_tables,dict):
-                    linked_tables = linked_tables.get(table._tablename,[])
+                if isinstance(linked_tables, dict):
+                    linked_tables = linked_tables.get(table._tablename, [])
                 if linked_tables is None or referee in linked_tables:
-                    field.represent = lambda id,r=None,referee=referee,rep=field.represent: A(callable(rep) and rep(id) or id,_class=trap_class(),_href=url(args=['view',referee,id]))
-        except (KeyError,ValueError,TypeError):
+                    field.represent = lambda id, r=None, referee=referee, rep=field.represent: A(callable(rep) and rep(id) or id, _class=trap_class(), _href=url(args=['view', referee, id]))
+        except (KeyError, ValueError, TypeError):
             redirect(URL(args=table._tablename))
-        if nargs==len(args)+1:
-            query = table.id>0
+        if nargs == len(args) + 1:
+            query = table.id > 0
 
         # filter out data info for displayed table
         if table._tablename in constraints:
             query = query & constraints[table._tablename]
-        if isinstance(links,dict):
-            links = links.get(table._tablename,[])
+        if isinstance(links, dict):
+            links = links.get(table._tablename, [])
         for key in 'columns,orderby,searchable,sortable,paginate,deletable,editable,details,selectable,create,fields'.split(','):
-            if isinstance(kwargs.get(key,None),dict):
+            if isinstance(kwargs.get(key, None), dict):
                 if table._tablename in kwargs[key]:
                     kwargs[key] = kwargs[key][table._tablename]
                 else:
@@ -2296,31 +2354,32 @@ class SQLFORM(FORM):
         for rfield in table._referenced_by:
             if rfield.readable:
                 check[rfield.tablename] = \
-                    check.get(rfield.tablename,[])+[rfield.name]
-        if isinstance(linked_tables,dict):
-            linked_tables = linked_tables.get(table._tablename,[])
+                    check.get(rfield.tablename, []) + [rfield.name]
+        if isinstance(linked_tables, dict):
+            linked_tables = linked_tables.get(table._tablename, [])
         for tablename in sorted(check):
             linked_fieldnames = check[tablename]
             tb = db[tablename]
-            multiple_links = len(linked_fieldnames)>1
+            multiple_links = len(linked_fieldnames) > 1
             for fieldname in linked_fieldnames:
                 if linked_tables is None or tablename in linked_tables:
                     t = T(tb._plural) if not multiple_links else \
-                        T(tb._plural+'('+fieldname+')')
-                    args0 = tablename+'.'+fieldname
+                        T(tb._plural + '(' + fieldname + ')')
+                    args0 = tablename + '.' + fieldname
                     links.append(
-                        lambda row,t=t,nargs=nargs,args0=args0:\
-                            A(SPAN(t),_class=trap_class(),_href=url(
-                                args=[args0,row[id_field_name]])))
+                        lambda row, t=t, nargs=nargs, args0=args0:
+                        A(SPAN(t), _class=trap_class(), _href=url(
+                          args=[args0, row[id_field_name]])))
 
-        grid=SQLFORM.grid(query,args=request.args[:nargs],links=links,
-                          links_in_grid=links_in_grid,
-                          user_signature=user_signature,**kwargs)
-        if isinstance(grid,DIV):
-            header = table._plural + (field and ' for '+field.name or '')
-            breadcrumbs.append(LI(A(T(header),_class=trap_class(),
-                                 _href=url()),_class='active w2p_grid_breadcrumb_elem'))
-            grid.insert(0,DIV(UL(*breadcrumbs, **{'_class':breadcrumbs_class}),
+        grid = SQLFORM.grid(query, args=request.args[:nargs], links=links,
+                            links_in_grid=links_in_grid,
+                            user_signature=user_signature, **kwargs)
+        if isinstance(grid, DIV):
+            header = table._plural + (field and ' for ' + field.name or '')
+            breadcrumbs.append(LI(A(T(header), _class=trap_class(),
+                                    _href=url()), _class='active w2p_grid_breadcrumb_elem'))
+            grid.insert(
+                0, DIV(UL(*breadcrumbs, **{'_class': breadcrumbs_class}),
                               _class='web2py_breadcrumbs'))
         return grid
 
@@ -2428,46 +2487,45 @@ class SQLTABLE(TABLE):
             return
         if not columns:
             columns = sqlrows.colnames
-        if headers=='fieldname:capitalize':
+        if headers == 'fieldname:capitalize':
             headers = {}
             for c in columns:
-                headers[c] = c.split('.')[-1].replace('_',' ').title()
-        elif headers=='labels':
+                headers[c] = c.split('.')[-1].replace('_', ' ').title()
+        elif headers == 'labels':
             headers = {}
             for c in columns:
-                (t,f) = c.split('.')
+                (t, f) = c.split('.')
                 field = sqlrows.db[t][f]
                 headers[c] = field.label
         if headers is None:
             headers = {}
         else:
-            for c in columns:#new implement dict
+            for c in columns:  # new implement dict
                 if isinstance(headers.get(c, c), dict):
                     coldict = headers.get(c, c)
                     attrcol = dict()
-                    if coldict['width']!="":
+                    if coldict['width'] != "":
                         attrcol.update(_width=coldict['width'])
-                    if coldict['class']!="":
+                    if coldict['class'] != "":
                         attrcol.update(_class=coldict['class'])
-                    row.append(TH(coldict['label'],**attrcol))
+                    row.append(TH(coldict['label'], **attrcol))
                 elif orderby:
                     row.append(TH(A(headers.get(c, c),
-                                    _href=th_link+'?orderby=' + c, cid=cid)))
+                                    _href=th_link + '?orderby=' + c, cid=cid)))
                 else:
                     row.append(TH(headers.get(c, c)))
 
-            if extracolumns:#new implement dict
+            if extracolumns:  # new implement dict
                 for c in extracolumns:
                     attrcol = dict()
-                    if c['width']!="":
+                    if c['width'] != "":
                         attrcol.update(_width=c['width'])
-                    if c['class']!="":
+                    if c['class'] != "":
                         attrcol.update(_class=c['class'])
-                    row.append(TH(c['label'],**attrcol))
+                    row.append(TH(c['label'], **attrcol))
 
             components.append(THEAD(TR(*row)))
 
-
         tbody = []
         for (rc, record) in enumerate(sqlrows):
             row = []
@@ -2476,7 +2534,7 @@ class SQLTABLE(TABLE):
             else:
                 _class = 'odd'
 
-            if not selectid is None: #new implement
+            if not selectid is None:  # new implement
                 if record.get('id') == selectid:
                     _class += ' rowselected'
 
@@ -2487,20 +2545,21 @@ class SQLTABLE(TABLE):
                         row.append(TD(r))
                         continue
                     else:
-                        raise KeyError("Column %s not found (SQLTABLE)" % colname)
+                        raise KeyError(
+                            "Column %s not found (SQLTABLE)" % colname)
                 (tablename, fieldname) = colname.split('.')
                 try:
                     field = sqlrows.db[tablename][fieldname]
                 except KeyError:
                     field = None
                 if tablename in record \
-                        and isinstance(record,Row) \
-                        and isinstance(record[tablename],Row):
+                        and isinstance(record, Row) \
+                        and isinstance(record[tablename], Row):
                     r = record[tablename][fieldname]
                 elif fieldname in record:
                     r = record[fieldname]
                 else:
-                    raise SyntaxError, 'something wrong in Rows object'
+                    raise SyntaxError('something wrong in Rows object')
                 r_old = r
                 if not field:
                     pass
@@ -2518,26 +2577,26 @@ class SQLTABLE(TABLE):
                         except TypeError:
                             href = '%s/%s/%s' % (linkto, ref, r_old)
                             if ref.find('.') >= 0:
-                                tref,fref = ref.split('.')
-                                if hasattr(sqlrows.db[tref],'_primarykey'):
-                                    href = '%s/%s?%s' % (linkto, tref, urllib.urlencode({fref:r}))
-                        r = A(represent(field,r,record), _href=str(href))
+                                tref, fref = ref.split('.')
+                                if hasattr(sqlrows.db[tref], '_primarykey'):
+                                    href = '%s/%s?%s' % (linkto, tref, urllib.urlencode({fref: r}))
+                        r = A(represent(field, r, record), _href=str(href))
                     elif field.represent:
-                        r = represent(field,r,record)
-                elif linkto and hasattr(field._table,'_primarykey')\
+                        r = represent(field, r, record)
+                elif linkto and hasattr(field._table, '_primarykey')\
                         and fieldname in field._table._primarykey:
                     # have to test this with multi-key tables
-                    key = urllib.urlencode(dict( [ \
-                                ((tablename in record \
-                                      and isinstance(record, Row) \
+                    key = urllib.urlencode(dict([
+                                ((tablename in record
+                                      and isinstance(record, Row)
                                       and isinstance(record[tablename], Row)) and
-                                 (k, record[tablename][k])) or (k, record[k]) \
-                                    for k in field._table._primarykey ] ))
+                                 (k, record[tablename][k])) or (k, record[k])
+                                    for k in field._table._primarykey]))
                     r = A(r, _href='%s/%s?%s' % (linkto, tablename, key))
                 elif isinstance(field.type, str) and field.type.startswith('list:'):
-                    r = represent(field,r or [],record)
+                    r = represent(field, r or [], record)
                 elif field.represent:
-                    r = represent(field,r,record)
+                    r = represent(field, r, record)
                 elif field.type == 'blob' and r:
                     r = 'DATA'
                 elif field.type == 'upload':
@@ -2547,35 +2606,37 @@ class SQLTABLE(TABLE):
                         r = current.T('file')
                     else:
                         r = ''
-                elif field.type in ['string','text']:
+                elif field.type in ['string', 'text']:
                     r = str(field.formatter(r))
-                    if headers!={}: #new implement dict
-                        if isinstance(headers[colname],dict):
+                    if headers != {}:  # new implement dict
+                        if isinstance(headers[colname], dict):
                             if isinstance(headers[colname]['truncate'], int):
-                                r = truncate_string(r, headers[colname]['truncate'])
+                                r = truncate_string(
+                                    r, headers[colname]['truncate'])
                     elif not truncate is None:
                         r = truncate_string(r, truncate)
-                attrcol = dict()#new implement dict
-                if headers!={}:
-                    if isinstance(headers[colname],dict):
-                        colclass=headers[colname]['class']
+                attrcol = dict()  # new implement dict
+                if headers != {}:
+                    if isinstance(headers[colname], dict):
+                        colclass = headers[colname]['class']
                         if headers[colname]['selected']:
-                            colclass= str(headers[colname]['class'] + " colselected").strip()
-                        if colclass!="":
+                            colclass = str(headers[colname]
+                                           ['class'] + " colselected").strip()
+                        if colclass != "":
                             attrcol.update(_class=colclass)
 
-                row.append(TD(r,**attrcol))
+                row.append(TD(r, **attrcol))
 
-            if extracolumns:#new implement dict
+            if extracolumns:  # new implement dict
                 for c in extracolumns:
                     attrcol = dict()
-                    colclass=c['class']
+                    colclass = c['class']
                     if c['selected']:
-                        colclass= str(c['class'] + " colselected").strip()
-                    if colclass!="":
+                        colclass = str(c['class'] + " colselected").strip()
+                    if colclass != "":
                         attrcol.update(_class=colclass)
                     contentfunc = c['content']
-                    row.append(TD(contentfunc(record, rc),**attrcol))
+                    row.append(TD(contentfunc(record, rc), **attrcol))
 
             tbody.append(TR(_class=_class, *row))
 
@@ -2584,7 +2645,6 @@ class SQLTABLE(TABLE):
 
         components.append(TBODY(*tbody))
 
-
     def style(self):
 
         css = '''
@@ -2607,7 +2667,7 @@ class SQLTABLE(TABLE):
 
         return css
 
-form_factory = SQLFORM.factory # for backward compatibility, deprecated
+form_factory = SQLFORM.factory  # for backward compatibility, deprecated
 
 
 class ExportClass(object):
@@ -2629,11 +2689,11 @@ class ExportClass(object):
                 return '<NULL>'
             elif isinstance(value, unicode):
                 return value.encode('utf8')
-            elif isinstance(value,Reference):
+            elif isinstance(value, Reference):
                 return int(value)
             elif hasattr(value, 'isoformat'):
                 return value.isoformat()[:19].replace('T', ' ')
-            elif isinstance(value, (list,tuple)): # for type='list:..'
+            elif isinstance(value, (list, tuple)):  # for type='list:..'
                 return bar_encode(value)
             return value
 
@@ -2646,11 +2706,11 @@ class ExportClass(object):
                 else:
                     (t, f) = col.split('.')
                     field = self.rows.db[t][f]
-                    if isinstance(record.get(t, None), (Row,dict)):
+                    if isinstance(record.get(t, None), (Row, dict)):
                         value = record[t][f]
                     else:
                         value = record[f]
-                    if field.type=='blob' and not value is None:
+                    if field.type == 'blob' and not value is None:
                         value = ''
                     elif field.represent:
                         value = field.represent(value, record)
@@ -2662,6 +2722,7 @@ class ExportClass(object):
     def export(self):
         raise NotImplementedError
 
+
 class ExporterTSV(ExportClass):
 
     label = 'TSV'
@@ -2680,7 +2741,8 @@ class ExporterTSV(ExportClass):
         import codecs
         final.write(codecs.BOM_UTF16)
         colnames = [a.split('.') for a in self.rows.colnames]
-        writer.writerow([unicode(col).encode("utf8") for col in self.rows.colnames])
+        writer.writerow(
+            [unicode(col).encode("utf8") for col in self.rows.colnames])
         data = out.getvalue().decode("utf8")
         data = data.encode("utf-16")
         data = data[2:]
@@ -2688,7 +2750,8 @@ class ExporterTSV(ExportClass):
         out.truncate(0)
         records = self.represented()
         for row in records:
-            writer.writerow([str(col).decode('utf8').encode("utf-8") for col in row])
+            writer.writerow(
+                [str(col).decode('utf8').encode("utf-8") for col in row])
             data = out.getvalue().decode("utf8")
             data = data.encode("utf-16")
             data = data[2:]
@@ -2696,6 +2759,7 @@ class ExporterTSV(ExportClass):
             out.truncate(0)
         return str(final.getvalue())
 
+
 class ExporterCSV(ExportClass):
     label = 'CSV'
     file_ext = "csv"
@@ -2707,6 +2771,7 @@ class ExporterCSV(ExportClass):
     def export(self):
         return str(self.rows)
 
+
 class ExporterHTML(ExportClass):
     label = 'HTML'
     file_ext = "html"
@@ -2722,7 +2787,7 @@ class ExporterHTML(ExportClass):
         for row in self.rows.records:
             out.write('<tr>\n')
             for col in colnames:
-                out.write('<td>'+str(row[col[0]][col[1]])+'</td>\n')
+                out.write('<td>' + str(row[col[0]][col[1]]) + '</td>\n')
             out.write('</tr>\n')
         out.write('</table>\n</body>\n</html>')
         return str(out.getvalue())
@@ -2743,7 +2808,8 @@ class ExporterXML(ExportClass):
         for row in self.rows.records:
             out.write('<row>\n')
             for col in colnames:
-                out.write('<%s>'%col+str(row[col[0]][col[1]])+'</%s>\n'%col)
+                out.write(
+                    '<%s>' % col + str(row[col[0]][col[1]]) + '</%s>\n' % col)
             out.write('</row>\n')
         out.write('</rows>')
         return str(out.getvalue())
diff --git a/gluon/storage.py b/gluon/storage.py
index a90ccd3d..bb63b408 100644
--- a/gluon/storage.py
+++ b/gluon/storage.py
@@ -18,6 +18,7 @@ import portalocker
 __all__ = ['List', 'Storage', 'Settings', 'Messages',
            'StorageList', 'load_storage', 'save_storage']
 
+
 class Storage(dict):
     """
     A Storage object is like a dictionary except `obj.foo` can be used
@@ -38,7 +39,7 @@ class Storage(dict):
         >>> print o.a
         None
     """
-    __slots__=()
+    __slots__ = ()
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
     __getitem__ = dict.get
@@ -48,7 +49,7 @@ class Storage(dict):
     __getstate__ = lambda self: None
     __copy__ = lambda self: Storage(self)
 
-    def getlist(self,key):
+    def getlist(self, key):
         """
         Return a Storage value as a list.
 
@@ -68,11 +69,11 @@ class Storage(dict):
         >>> request.vars.getlist('z')
         []
         """
-        value = self.get(key,[])
+        value = self.get(key, [])
         return value if not value else \
-            value if isinstance(value,(list,tuple)) else [value]
+            value if isinstance(value, (list, tuple)) else [value]
 
-    def getfirst(self,key,default=None):
+    def getfirst(self, key, default=None):
         """
         Return the first or only value when given a request.vars-style key.
 
@@ -93,7 +94,7 @@ class Storage(dict):
         values = self.getlist(key)
         return values[0] if values else default
 
-    def getlast(self,key,default=None):
+    def getlast(self, key, default=None):
         """
         Returns the last or only single value when
         given a request.vars-style key.
@@ -115,56 +116,66 @@ class Storage(dict):
         values = self.getlist(key)
         return values[-1] if values else default
 
-PICKABLE = (str,int,long,float,bool,list,dict,tuple,set)
+PICKABLE = (str, int, long, float, bool, list, dict, tuple, set)
+
 
 class StorageList(Storage):
     """
     like Storage but missing elements default to [] instead of None
     """
-    def __getitem__(self,key):
+    def __getitem__(self, key):
         return self.__getattr__(key)
+
     def __getattr__(self, key):
         if key in self:
-            return getattr(self,key)
+            return getattr(self, key)
         else:
             r = []
-            setattr(self,key,r)
+            setattr(self, key, r)
             return r
 
+
 def load_storage(filename):
     fp = None
     try:
         fp = portalocker.LockedFile(filename, 'rb')
         storage = cPickle.load(fp)
     finally:
-        if fp: fp.close()
+        if fp:
+            fp.close()
     return Storage(storage)
 
+
 def save_storage(storage, filename):
     fp = None
     try:
         fp = portalocker.LockedFile(filename, 'wb')
         cPickle.dump(dict(storage), fp)
     finally:
-        if fp: fp.close()
+        if fp:
+            fp.close()
+
 
 class Settings(Storage):
     def __setattr__(self, key, value):
         if key != 'lock_keys' and self['lock_keys'] and key not in self:
-            raise SyntaxError, 'setting key \'%s\' does not exist' % key
+            raise SyntaxError('setting key \'%s\' does not exist' % key)
         if key != 'lock_values' and self['lock_values']:
-            raise SyntaxError, 'setting value cannot be changed: %s' % key
+            raise SyntaxError('setting value cannot be changed: %s' % key)
         self[key] = value
 
+
 class Messages(Settings):
     def __init__(self, T):
-        Storage.__init__(self,T=T)
+        Storage.__init__(self, T=T)
+
     def __getattr__(self, key):
         value = self[key]
         if isinstance(value, str):
             return str(self.T(value))
         return value
 
+
 class FastStorage(dict):
     """
     Eventually this should replace class Storage but causes memory leak
@@ -203,25 +214,33 @@ class FastStorage(dict):
     def __init__(self, *args, **kwargs):
         dict.__init__(self, *args, **kwargs)
         self.__dict__ = self
-    def __getattr__(self,key):
-        return getattr(self,key) if key in self else None
-    def __getitem__(self,key):
-        return dict.get(self,key,None)
+
+    def __getattr__(self, key):
+        return getattr(self, key) if key in self else None
+
+    def __getitem__(self, key):
+        return dict.get(self, key, None)
+
     def copy(self):
         self.__dict__ = {}
         s = FastStorage(self)
         self.__dict__ = self
         return s
+
     def __repr__(self):
         return '<Storage %s>' % dict.__repr__(self)
+
     def __getstate__(self):
         return dict(self)
+
     def __setstate__(self, sdict):
         dict.__init__(self, sdict)
-        self.__dict__=self
+        self.__dict__ = self
+
     def update(self, *args, **kwargs):
         dict.__init__(self, *args, **kwargs)
-        self.__dict__=self
+        self.__dict__ = self
+
 
 class List(list):
     """
@@ -235,7 +254,7 @@ class List(list):
         request.args(0,default=0,cast=int,otherwise=lambda:...)
         """
         n = len(self)
-        if 0<=i<n or -n<=i<0:
+        if 0 <= i < n or -n <= i < 0:
             value = self[i]
         else:
             value = default
@@ -246,12 +265,12 @@ class List(list):
                 from http import HTTP, redirect
                 if otherwise is None:
                     raise HTTP(404)
-                elif isinstance(otherwise,str):
+                elif isinstance(otherwise, str):
                     redirect(otherwise)
                 elif callable(otherwise):
                     return otherwise()
                 else:
-                    raise RuntimeError, "invalid otherwise"
+                    raise RuntimeError("invalid otherwise")
         return value
 
 
diff --git a/gluon/streamer.py b/gluon/streamer.py
index 1b6dab2b..4dd5d318 100644
--- a/gluon/streamer.py
+++ b/gluon/streamer.py
@@ -20,9 +20,10 @@ from contenttype import contenttype
 regex_start_range = re.compile('\d+(?=\-)')
 regex_stop_range = re.compile('(?<=\-)\d+')
 
-DEFAULT_CHUNK_SIZE = 64*1024
+DEFAULT_CHUNK_SIZE = 64 * 1024
 
-def streamer(stream, chunk_size = DEFAULT_CHUNK_SIZE, bytes = None):
+
+def streamer(stream, chunk_size=DEFAULT_CHUNK_SIZE, bytes=None):
     offset = 0
     while bytes is None or offset < bytes:
         if not bytes is None and bytes - offset < chunk_size:
@@ -38,14 +39,15 @@ def streamer(stream, chunk_size = DEFAULT_CHUNK_SIZE, bytes = None):
         offset += length
     stream.close()
 
+
 def stream_file_or_304_or_206(
     static_file,
-    chunk_size = DEFAULT_CHUNK_SIZE,
-    request = None,
-    headers = {},
-    status = 200,
-    error_message = None,
-    ):
+    chunk_size=DEFAULT_CHUNK_SIZE,
+    request=None,
+    headers={},
+    status=200,
+    error_message=None,
+):
     if error_message is None:
         error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request'
     try:
@@ -62,7 +64,7 @@ def stream_file_or_304_or_206(
     stat_file = os.stat(static_file)
     fsize = stat_file[stat.ST_SIZE]
     modified = stat_file[stat.ST_MTIME]
-    mtime = time.strftime('%a, %d %b %Y %H:%M:%S GMT',time.gmtime(modified))
+    mtime = time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.gmtime(modified))
     headers.setdefault('Content-Type', contenttype(static_file))
     headers.setdefault('Last-Modified', mtime)
     headers.setdefault('Pragma', 'cache')
@@ -95,10 +97,10 @@ def stream_file_or_304_or_206(
             status = 206
     # in all the other cases (not 304, not 206, but 200 or error page)
     if status != 206:
-        enc =  request.env.http_accept_encoding
+        enc = request.env.http_accept_encoding
         if enc and 'gzip' in enc and not 'Content-Encoding' in headers:
             gzipped = static_file + '.gz'
-            if os.path.isfile(gzipped) and os.path.getmtime(gzipped)>modified:
+            if os.path.isfile(gzipped) and os.path.getmtime(gzipped) > modified:
                 static_file = gzipped
                 fsize = os.path.getsize(gzipped)
                 headers['Content-Encoding'] = 'gzip'
diff --git a/gluon/template.py b/gluon/template.py
index e531860c..0c1cb913 100644
--- a/gluon/template.py
+++ b/gluon/template.py
@@ -26,23 +26,26 @@ try:
 except ImportError:
     # do not have web2py
     current = None
-    def RestrictedError(a,b,c):
-        logging.error(str(a)+':'+str(b)+':'+str(c))
+
+    def RestrictedError(a, b, c):
+        logging.error(str(a) + ':' + str(b) + ':' + str(c))
         return RuntimeError
 
+
 class Node(object):
     """
     Basic Container Object
     """
-    def __init__(self, value = None, pre_extend = False):
+    def __init__(self, value=None, pre_extend=False):
         self.value = value
         self.pre_extend = pre_extend
 
     def __str__(self):
         return str(self.value)
 
+
 class SuperNode(Node):
-    def __init__(self, name = '', pre_extend = False):
+    def __init__(self, name='', pre_extend=False):
         self.name = name
         self.value = None
         self.pre_extend = pre_extend
@@ -57,7 +60,8 @@ class SuperNode(Node):
     def __repr__(self):
         return "%s->%s" % (self.name, self.value)
 
-def output_aux(node,blocks):
+
+def output_aux(node, blocks):
     # If we have a block level
     #   If we can override this block.
     #     Override block from vars.
@@ -66,8 +70,9 @@ def output_aux(node,blocks):
     return (blocks[node.name].output(blocks)
             if node.name in blocks else
             node.output(blocks)) \
-            if isinstance(node, BlockNode) \
-            else str(node)
+        if isinstance(node, BlockNode) \
+        else str(node)
+
 
 class BlockNode(Node):
     """
@@ -82,7 +87,7 @@ class BlockNode(Node):
             This is default block test
         {{ end }}
     """
-    def __init__(self, name = '', pre_extend = False, delimiters = ('{{','}}')):
+    def __init__(self, name='', pre_extend=False, delimiters=('{{', '}}')):
         """
         name - Name of this Node.
         """
@@ -92,7 +97,7 @@ class BlockNode(Node):
         self.left, self.right = delimiters
 
     def __repr__(self):
-        lines = ['%sblock %s%s' % (self.left,self.name,self.right)]
+        lines = ['%sblock %s%s' % (self.left, self.name, self.right)]
         lines += [str(node) for node in self.nodes]
         lines.append('%send%s' % (self.left, self.right))
         return ''.join(lines)
@@ -101,8 +106,8 @@ class BlockNode(Node):
         """
         Get this BlockNodes content, not including child Nodes
         """
-        return ''.join(str(node) for node in self.nodes \
-                           if not isinstance(node, BlockNode))
+        return ''.join(str(node) for node in self.nodes
+                       if not isinstance(node, BlockNode))
 
     def append(self, node):
         """
@@ -128,8 +133,8 @@ class BlockNode(Node):
         if isinstance(other, BlockNode):
             self.nodes.extend(other.nodes)
         else:
-            raise TypeError("Invalid type; must be instance of ``BlockNode``. %s" % other)
-
+            raise TypeError(
+                "Invalid type; must be instance of ``BlockNode``. %s" % other)
 
     def output(self, blocks):
         """
@@ -137,7 +142,8 @@ class BlockNode(Node):
         blocks -- Dictionary of blocks that are extending
         from this template.
         """
-        return ''.join(output_aux(node,blocks) for node in self.nodes)
+        return ''.join(output_aux(node, blocks) for node in self.nodes)
+
 
 class Content(BlockNode):
     """
@@ -145,7 +151,7 @@ class Content(BlockNode):
 
     Contains functions that operate as such.
     """
-    def __init__(self, name = "ContentBlock", pre_extend = False):
+    def __init__(self, name="ContentBlock", pre_extend=False):
         """
         Keyword Arguments
 
@@ -157,18 +163,19 @@ class Content(BlockNode):
         self.pre_extend = pre_extend
 
     def __str__(self):
-        return ''.join(output_aux(node,self.blocks) for node in self.nodes)
+        return ''.join(output_aux(node, self.blocks) for node in self.nodes)
 
-    def _insert(self, other, index = 0):
+    def _insert(self, other, index=0):
         """
         Inserts object at index.
         """
         if isinstance(other, (str, Node)):
             self.nodes.insert(index, other)
         else:
-            raise TypeError("Invalid type, must be instance of ``str`` or ``Node``.")
+            raise TypeError(
+                "Invalid type, must be instance of ``str`` or ``Node``.")
 
-    def insert(self, other, index = 0):
+    def insert(self, other, index=0):
         """
         Inserts object at index.
 
@@ -201,21 +208,23 @@ class Content(BlockNode):
             self.nodes.extend(other.nodes)
             self.blocks.update(other.blocks)
         else:
-            raise TypeError("Invalid type; must be instance of ``BlockNode``. %s" % other)
+            raise TypeError(
+                "Invalid type; must be instance of ``BlockNode``. %s" % other)
 
     def clear_content(self):
         self.nodes = []
 
+
 class TemplateParser(object):
 
-    default_delimiters = ('{{','}}')
+    default_delimiters = ('{{', '}}')
     r_tag = compile(r'(\{\{.*?\}\})', DOTALL)
 
     r_multiline = compile(r'(""".*?""")|(\'\'\'.*?\'\'\')', DOTALL)
 
     # These are used for re-indentation.
     # Indent + 1
-    re_block = compile('^(elif |else:|except:|except |finally:).*$',DOTALL)
+    re_block = compile('^(elif |else:|except:|except |finally:).*$', DOTALL)
 
     # Indent - 1
     re_unblock = compile('^(return|continue|break|raise)( .*)?$', DOTALL)
@@ -223,12 +232,12 @@ class TemplateParser(object):
     re_pass = compile('^pass( .*)?$', DOTALL)
 
     def __init__(self, text,
-                 name    = "ParserContainer",
-                 context = dict(),
-                 path    = 'views/',
-                 writer  = 'response.write',
-                 lexers  = {},
-                 delimiters = ('{{','}}'),
+                 name="ParserContainer",
+                 context=dict(),
+                 path='views/',
+                 writer='response.write',
+                 lexers={},
+                 delimiters=('{{', '}}'),
                  _super_nodes = [],
                  ):
         """
@@ -270,7 +279,7 @@ class TemplateParser(object):
             escaped_delimiters = (escape(delimiters[0]),
                                   escape(delimiters[1]))
             self.r_tag = compile(r'(%s.*?%s)' % escaped_delimiters, DOTALL)
-        elif hasattr(context.get('response',None),'delimiters'):
+        elif hasattr(context.get('response', None), 'delimiters'):
             if context['response'].delimiters != self.default_delimiters:
                 escaped_delimiters = (
                     escape(context['response'].delimiters[0]),
@@ -359,10 +368,10 @@ class TemplateParser(object):
                 k = k + credit - 1
 
             # We obviously can't have a negative indentation
-            k = max(k,0)
+            k = max(k, 0)
 
             # Add the indentation!
-            new_lines.append(' '*(4*k)+line)
+            new_lines.append(' ' * (4 * k) + line)
 
             # Bank account back to 0 again :(
             credit = 0
@@ -416,7 +425,7 @@ class TemplateParser(object):
         # Allow Views to include other views dynamically
         context = self.context
         if current and not "response" in context:
-            context["response"] = getattr(current,'response',None)
+            context["response"] = getattr(current, 'response', None)
 
         # Get the filename; filename looks like ``"template.html"``.
         # We need to eval to remove the quotes and get the string type.
@@ -442,11 +451,11 @@ class TemplateParser(object):
         text = self._get_file_text(filename)
 
         t = TemplateParser(text,
-                           name    = filename,
-                           context = self.context,
-                           path    = self.path,
-                           writer  = self.writer,
-                           delimiters = self.delimiters)
+                           name=filename,
+                           context=self.context,
+                           path=self.path,
+                           writer=self.writer,
+                           delimiters=self.delimiters)
 
         content.append(t.content)
 
@@ -465,16 +474,17 @@ class TemplateParser(object):
         super_nodes.extend(self.super_nodes)
 
         t = TemplateParser(text,
-                    name         = filename,
-                    context      = self.context,
-                    path         = self.path,
-                    writer       = self.writer,
-                    delimiters   = self.delimiters,
-                    _super_nodes = super_nodes)
+                           name=filename,
+                           context=self.context,
+                           path=self.path,
+                           writer=self.writer,
+                           delimiters=self.delimiters,
+                           _super_nodes=super_nodes)
 
         # Make a temporary buffer that is unique for parent
         # template.
-        buf = BlockNode(name='__include__' + filename, delimiters=self.delimiters)
+        buf = BlockNode(
+            name='__include__' + filename, delimiters=self.delimiters)
         pre = []
 
         # Iterate through each of our nodes
@@ -601,22 +611,22 @@ class TemplateParser(object):
                         # You can define custom names such as
                         # '{{<<variable}}' which could potentially
                         # write unescaped version of the variable.
-                        self.lexers[name](parser    = self,
-                                          value     = value,
-                                          top       = top,
-                                          stack     = stack)
+                        self.lexers[name](parser=self,
+                                          value=value,
+                                          top=top,
+                                          stack=stack)
 
                     elif name == '=':
                         # So we have a variable to insert into
                         # the template
                         buf = "\n%s(%s)" % (self.writer, value)
-                        top.append(Node(buf, pre_extend = pre_extend))
+                        top.append(Node(buf, pre_extend=pre_extend))
 
                     elif name == 'block' and not value.startswith('='):
                         # Make a new node with name.
-                        node = BlockNode(name = value.strip(),
-                                         pre_extend = pre_extend,
-                                         delimiters = self.delimiters)
+                        node = BlockNode(name=value.strip(),
+                                         pre_extend=pre_extend,
+                                         delimiters=self.delimiters)
 
                         # Append this node to our active node
                         top.append(node)
@@ -646,8 +656,8 @@ class TemplateParser(object):
                             target_node = top.name
 
                         # Create a SuperNode instance
-                        node = SuperNode(name = target_node,
-                                            pre_extend = pre_extend)
+                        node = SuperNode(name=target_node,
+                                         pre_extend=pre_extend)
 
                         # Add this to our list to be taken care of
                         self.super_nodes.append(node)
@@ -663,9 +673,10 @@ class TemplateParser(object):
                         # Otherwise, make a temporary include node
                         # That the child node will know to hook into.
                         else:
-                            include_node = BlockNode(name = '__include__' + self.name,
-                                                     pre_extend = pre_extend,
-                                                     delimiters = self.delimiters)
+                            include_node = BlockNode(
+                                name='__include__' + self.name,
+                                pre_extend=pre_extend,
+                                delimiters=self.delimiters)
                             top.append(include_node)
 
                     elif name == 'extend' and not value.startswith('='):
@@ -697,21 +708,22 @@ class TemplateParser(object):
                                 if token.startswith('='):
                                     if token.endswith('\\'):
                                         continuation = True
-                                        tokens[k] = "\n%s(%s" % (self.writer, token[1:].strip())
+                                        tokens[k] = "\n%s(%s" % (
+                                            self.writer, token[1:].strip())
                                     else:
-                                        tokens[k] = "\n%s(%s)" % (self.writer, token[1:].strip())
+                                        tokens[k] = "\n%s(%s)" % (
+                                            self.writer, token[1:].strip())
                                 elif continuation:
                                     tokens[k] += ')'
                                     continuation = False
 
-
                             buf = "\n%s" % '\n'.join(tokens)
-                            top.append(Node(buf, pre_extend = pre_extend))
+                            top.append(Node(buf, pre_extend=pre_extend))
 
                 else:
                     # It is HTML so just include it.
                     buf = "\n%s(%r, escape=False)" % (self.writer, i)
-                    top.append(Node(buf, pre_extend = pre_extend))
+                    top.append(Node(buf, pre_extend=pre_extend))
 
             # Remember: tag, not tag, tag, not tag
             in_tag = not in_tag
@@ -740,11 +752,13 @@ class TemplateParser(object):
             self.extend(extend)
 
 # We need this for integration with gluon
+
+
 def parse_template(filename,
-                   path    = 'views/',
-                   context = dict(),
-                   lexers  = {},
-                   delimiters = ('{{','}}')
+                   path='views/',
+                   context=dict(),
+                   lexers={},
+                   delimiters=('{{', '}}')
                    ):
     """
     filename can be a view filename in the views folder or an input stream
@@ -766,6 +780,7 @@ def parse_template(filename,
     # Use the file contents to get a parsed template and return it.
     return str(TemplateParser(text, context=context, path=path, lexers=lexers, delimiters=delimiters))
 
+
 def get_parsed(text):
     """
     Returns the indented python code of text. Useful for unit testing.
@@ -773,13 +788,15 @@ def get_parsed(text):
     """
     return str(TemplateParser(text))
 
+
 class DummyResponse():
     def __init__(self):
         self.body = cStringIO.StringIO()
+
     def write(self, data, escape=True):
         if not escape:
             self.body.write(str(data))
-        elif hasattr(data,'xml') and callable(data.xml):
+        elif hasattr(data, 'xml') and callable(data.xml):
             self.body.write(data.xml())
         else:
             # make it a string
@@ -787,27 +804,31 @@ class DummyResponse():
                 data = str(data)
             elif isinstance(data, unicode):
                 data = data.encode('utf8', 'xmlcharrefreplace')
-            data = cgi.escape(data, True).replace("'","&#x27;")
+            data = cgi.escape(data, True).replace("'", "&#x27;")
             self.body.write(data)
 
+
 class NOESCAPE():
     """
     A little helper to avoid escaping.
     """
     def __init__(self, text):
         self.text = text
+
     def xml(self):
         return self.text
 
 # And this is a generic render function.
 # Here for integration with gluon.
-def render(content = "hello world",
-           stream = None,
-           filename = None,
-           path = None,
-           context = {},
-           lexers  = {},
-           delimiters = ('{{','}}')
+
+
+def render(content="hello world",
+           stream=None,
+           filename=None,
+           path=None,
+           context={},
+           lexers={},
+           delimiters=('{{', '}}')
            ):
     """
     >>> render()
@@ -856,7 +877,7 @@ def render(content = "hello world",
 
     # If we don't have anything to render, why bother?
     if not content and not stream and not filename:
-        raise SyntaxError, "Must specify a stream or filename or content"
+        raise SyntaxError("Must specify a stream or filename or content")
 
     # Here for legacy purposes, probably can be reduced to
     # something more simple.
@@ -869,7 +890,8 @@ def render(content = "hello world",
             stream = cStringIO.StringIO(content)
 
     # Execute the template.
-    code = str(TemplateParser(stream.read(), context=context, path=path, lexers=lexers, delimiters=delimiters))
+    code = str(TemplateParser(stream.read(
+    ), context=context, path=path, lexers=lexers, delimiters=delimiters))
     try:
         exec(code) in context
     except Exception:
diff --git a/gluon/tests/test_cache.py b/gluon/tests/test_cache.py
index ec9b94d4..2ef79103 100644
--- a/gluon/tests/test_cache.py
+++ b/gluon/tests/test_cache.py
@@ -18,6 +18,7 @@ from cache import CacheInRam, CacheOnDisk
 
 oldcwd = None
 
+
 def setUpModule():
     global oldcwd
     if oldcwd is None:
@@ -25,12 +26,14 @@ def setUpModule():
         if not os.path.isdir('gluon'):
             os.chdir(os.path.realpath('../../'))
 
+
 def tearDownModule():
     global oldcwd
     if oldcwd:
         os.chdir(oldcwd)
         oldcwd = None
 
+
 class TestCache(unittest.TestCase):
 
     def testCacheInRam(self):
@@ -70,5 +73,3 @@ if __name__ == '__main__':
     setUpModule()       # pre-python-2.7
     unittest.main()
     tearDownModule()
-
-
diff --git a/gluon/tests/test_contribs.py b/gluon/tests/test_contribs.py
index fbb4595f..534c04dd 100644
--- a/gluon/tests/test_contribs.py
+++ b/gluon/tests/test_contribs.py
@@ -22,13 +22,14 @@ class TestContribs(unittest.TestCase):
     def test_fpdf(self):
         """ Basic PDF test and sanity checks """
 
-        self.assertEqual(fpdf.FPDF_VERSION, pyfpdf.FPDF_VERSION, 'version mistmatch')
+        self.assertEqual(
+            fpdf.FPDF_VERSION, pyfpdf.FPDF_VERSION, 'version mistmatch')
         self.assertEqual(fpdf.FPDF, pyfpdf.FPDF, 'class mistmatch')
 
         pdf = fpdf.FPDF()
         pdf.add_page()
         pdf.compress = False
-        pdf.set_font('Arial', '',14)
+        pdf.set_font('Arial', '', 14)
         pdf.ln(10)
         pdf.write(5, 'hello world')
         pdf_out = pdf.output('', 'S')
@@ -39,4 +40,3 @@ class TestContribs(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_html.py b/gluon/tests/test_html.py
index ff906b56..336eff9b 100644
--- a/gluon/tests/test_html.py
+++ b/gluon/tests/test_html.py
@@ -130,7 +130,7 @@ class TestBareHelpers(unittest.TestCase):
 
     def testOPTION(self):
         self.assertEqual(OPTION('<>', _a='1', _b='2').xml(),
-                         '<option a="1" b="2" value="&lt;&gt;">&lt;&gt;' + \
+                         '<option a="1" b="2" value="&lt;&gt;">&lt;&gt;' +
                          '</option>')
 
     def testP(self):
@@ -149,7 +149,7 @@ class TestBareHelpers(unittest.TestCase):
 
     def testSELECT(self):
         self.assertEqual(SELECT('<>', _a='1', _b='2').xml(),
-                         '<select a="1" b="2">'+ \
+                         '<select a="1" b="2">' +
                          '<option value="&lt;&gt;">&lt;&gt;</option></select>')
 
     def testSPAN(self):
@@ -162,7 +162,7 @@ class TestBareHelpers(unittest.TestCase):
 
     def testTABLE(self):
         self.assertEqual(TABLE('<>', _a='1', _b='2').xml(),
-                         '<table a="1" b="2"><tr><td>&lt;&gt;</td></tr>' + \
+                         '<table a="1" b="2"><tr><td>&lt;&gt;</td></tr>' +
                          '</table>')
 
     def testTBODY(self):
@@ -175,8 +175,8 @@ class TestBareHelpers(unittest.TestCase):
 
     def testTEXTAREA(self):
         self.assertEqual(TEXTAREA('<>', _a='1', _b='2').xml(),
-                        '<textarea a="1" b="2" cols="40" rows="10">&lt;&gt;' + \
-                        '</textarea>')
+                         '<textarea a="1" b="2" cols="40" rows="10">&lt;&gt;' +
+                         '</textarea>')
 
     def testTFOOT(self):
         self.assertEqual(TFOOT('<>', _a='1', _b='2').xml(),
@@ -209,4 +209,3 @@ class TestBareHelpers(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_is_url.py b/gluon/tests/test_is_url.py
index 7a17496c..39f89610 100644
--- a/gluon/tests/test_is_url.py
+++ b/gluon/tests/test_is_url.py
@@ -31,7 +31,8 @@ class TestIsUrl(unittest.TestCase):
         self.assertEqual(x('unreal.blargg'), ('unreal.blargg',
                          'enter a valid URL'))
         self.assertEqual(x('google..ca'), ('google..ca', 'enter a valid URL'))
-        self.assertEqual(x('google.ca..'), ('google.ca..', 'enter a valid URL'))
+        self.assertEqual(
+            x('google.ca..'), ('google.ca..', 'enter a valid URL'))
 
         # explicit use of 'http' mode
 
@@ -116,9 +117,9 @@ class TestIsUrl(unittest.TestCase):
         # 'generic' mode
 
         x = IS_URL(mode='generic')
-        self.assertEqual(x('http://google.ca'), ('http://google.ca',None))
+        self.assertEqual(x('http://google.ca'), ('http://google.ca', None))
         self.assertEqual(x('google.ca'), ('google.ca', None))
-        self.assertEqual(x('google.ca:80'), ('http://google.ca:80',None))
+        self.assertEqual(x('google.ca:80'), ('http://google.ca:80', None))
         self.assertEqual(x('blargg://unreal'), ('blargg://unreal',
                          'enter a valid URL'))
 
@@ -152,7 +153,7 @@ class TestIsUrl(unittest.TestCase):
         # 'generic' mode with overriden allowed_schemes and prepend_scheme
 
         x = IS_URL(mode='generic', allowed_schemes=[None, 'ftp', 'ftps'
-                   ], prepend_scheme='ftp')
+                                                    ], prepend_scheme='ftp')
         self.assertEqual(x('http://google.ca'), ('http://google.ca',
                          'enter a valid URL'))
         self.assertEqual(x('google.ca'), ('google.ca', None))
@@ -191,10 +192,11 @@ class TestIsUrl(unittest.TestCase):
                                      # error at calling time
         except Exception, e:
             if str(e)\
-                 != "allowed_scheme value 'ftp' is not in [None, 'http', 'https']":
+                    != "allowed_scheme value 'ftp' is not in [None, 'http', 'https']":
                 self.fail('Wrong exception: ' + str(e))
         else:
-            self.fail("Accepted invalid allowed_schemes: [None, 'ftp', 'ftps']")
+            self.fail(
+                "Accepted invalid allowed_schemes: [None, 'ftp', 'ftps']")
 
         # prepend_scheme's value must be in allowed_schemes (default for 'http'
         # mode is [None, 'http', 'https'])
@@ -205,7 +207,7 @@ class TestIsUrl(unittest.TestCase):
                                      # error at calling time
         except Exception, e:
             if str(e)\
-                 != "prepend_scheme='ftp' is not in allowed_schemes=[None, 'http', 'https']":
+                    != "prepend_scheme='ftp' is not in allowed_schemes=[None, 'http', 'https']":
                 self.fail('Wrong exception: ' + str(e))
         else:
             self.fail("Accepted invalid prepend_scheme: 'ftp'")
@@ -217,7 +219,7 @@ class TestIsUrl(unittest.TestCase):
             x = IS_URL(allowed_schemes=[None, 'https'])
         except Exception, e:
             if str(e)\
-                 != "prepend_scheme='http' is not in allowed_schemes=[None, 'https']":
+                    != "prepend_scheme='http' is not in allowed_schemes=[None, 'https']":
                 self.fail('Wrong exception: ' + str(e))
         else:
             self.fail("Accepted invalid prepend_scheme: 'http'")
@@ -229,7 +231,7 @@ class TestIsUrl(unittest.TestCase):
                        prepend_scheme='https')
         except Exception, e:
             if str(e)\
-                 != "prepend_scheme='https' is not in allowed_schemes=[None, 'http']":
+                    != "prepend_scheme='https' is not in allowed_schemes=[None, 'http']":
                 self.fail('Wrong exception: ' + str(e))
         else:
             self.fail("Accepted invalid prepend_scheme: 'https'")
@@ -241,7 +243,7 @@ class TestIsUrl(unittest.TestCase):
                        'ftps'])
         except Exception, e:
             if str(e)\
-                 != "prepend_scheme='http' is not in allowed_schemes=[None, 'ftp', 'ftps']":
+                    != "prepend_scheme='http' is not in allowed_schemes=[None, 'ftp', 'ftps']":
                 self.fail('Wrong exception: ' + str(e))
         else:
             self.fail("Accepted invalid prepend_scheme: 'http'")
@@ -251,7 +253,8 @@ class TestIsUrl(unittest.TestCase):
 
         try:
             x = IS_URL(mode='generic', prepend_scheme='blargg')
-            x('http://www.google.ca')  # we can only reasonably know about the error at calling time
+            x('http://www.google.ca')
+              # we can only reasonably know about the error at calling time
         except Exception, e:
             if not str(e).startswith(
                     "prepend_scheme='blargg' is not in allowed_schemes="):
@@ -266,7 +269,7 @@ class TestIsUrl(unittest.TestCase):
                        prepend_scheme='blargg')
         except Exception, e:
             if str(e)\
-                 != "prepend_scheme='blargg' is not in allowed_schemes=[None, 'http']":
+                    != "prepend_scheme='blargg' is not in allowed_schemes=[None, 'http']":
                 self.fail('Wrong exception: ' + str(e))
         else:
             self.fail("Accepted invalid prepend_scheme: 'blargg'")
@@ -282,7 +285,7 @@ class TestIsUrl(unittest.TestCase):
         # prepend_scheme has the invalid value 'http', we don't care!
 
         x = IS_URL(mode='generic', allowed_schemes=['https'],
-            prepend_scheme='https')
+                   prepend_scheme='https')
         self.assertEqual(x('google.ca'), ('google.ca', 'enter a valid URL'))
 
 
@@ -335,12 +338,12 @@ class TestIsGenericUrl(unittest.TestCase):
             'ht,tp://www.benn.ca',
             'ht:tp://www.benn.ca',
             'htp://invalid_scheme.com',
-            ]
+        ]
 
         failures = []
 
         for url in urlsToCheckA + urlsToCheckB:
-            if self.x(url)[1] == None:
+            if self.x(url)[1] is None:
                 failures.append('Incorrectly accepted: ' + str(url))
 
         if len(failures) > 0:
@@ -377,14 +380,13 @@ class TestIsGenericUrl(unittest.TestCase):
             'http://localhost:8080/',
             'http://localhost:8080/hello',
             'http://localhost:8080/hello/',
-            'file:///C:/Documents%20and%20Settings/Jonathan/Desktop/view.py'
-                ,
-            ]
+            'file:///C:/Documents%20and%20Settings/Jonathan/Desktop/view.py',
+        ]
 
         failures = []
 
         for url in urlsToCheck:
-            if self.x(url)[1] != None:
+            if self.x(url)[1] is not None:
                 failures.append('Incorrectly rejected: ' + str(url))
 
         if len(failures) > 0:
@@ -405,7 +407,7 @@ class TestIsGenericUrl(unittest.TestCase):
         # because a scheme is required
 
         y = IS_GENERIC_URL(allowed_schemes=['http', 'blargg'],
-            prepend_scheme='http')
+                           prepend_scheme='http')
         self.assertEqual(y('google.ca'), ('google.ca', 'enter a valid URL'))
 
 
@@ -459,12 +461,12 @@ class TestIsHttpUrl(unittest.TestCase):
             'path/segment/without/starting/slash',
             'http://www.math.uio.no;param=3',
             '://ABC.com:/%7esmith/home.html',
-            ]
+        ]
 
         failures = []
 
         for url in urlsToCheck:
-            if self.x(url)[1] == None:
+            if self.x(url)[1] is None:
                 failures.append('Incorrectly accepted: ' + str(url))
 
         if len(failures) > 0:
@@ -523,8 +525,7 @@ class TestIsHttpUrl(unittest.TestCase):
             'HTTPS://localhost.',
             'http://localhost#fragment',
             'http://localhost/hello;param=value',
-            'http://localhost/hello;param=value/hi;param2=value2;param3=value3'
-                ,
+            'http://localhost/hello;param=value/hi;param2=value2;param3=value3',
             'http://localhost/hello?query=True',
             'http://www.benn.ca/hello;param=value/hi;param2=value2;param3=value3/index.html?query=3',
             'http://localhost/hello/?query=1500&five=6',
@@ -534,12 +535,12 @@ class TestIsHttpUrl(unittest.TestCase):
             'http://localhost:8080/hello%20world/',
             'http://www.a.3.be-nn.5.ca',
             'http://www.amazon.COM',
-            ]
+        ]
 
         failures = []
 
         for url in urlsToCheck:
-            if self.x(url)[1] != None:
+            if self.x(url)[1] is not None:
                 failures.append('Incorrectly rejected: ' + str(url))
 
         if len(failures) > 0:
@@ -557,17 +558,20 @@ class TestIsHttpUrl(unittest.TestCase):
         self.assertEqual(self.x('https://google.ca'),
                          ('https://google.ca', None))
 
-        y = IS_HTTP_URL(prepend_scheme='https', allowed_schemes=[None, 'https'])
-        self.assertEqual(y('google.ca'), ('https://google.ca', None))  # prepends https if asked
+        y = IS_HTTP_URL(
+            prepend_scheme='https', allowed_schemes=[None, 'https'])
+        self.assertEqual(y('google.ca'), (
+            'https://google.ca', None))  # prepends https if asked
 
         z = IS_HTTP_URL(prepend_scheme=None)
-        self.assertEqual(z('google.ca:8080'), ('google.ca:8080', None))  # prepending disabled
+        self.assertEqual(z('google.ca:8080'), ('google.ca:8080',
+                         None))  # prepending disabled
 
         try:
             IS_HTTP_URL(prepend_scheme='mailto')
         except Exception, e:
             if str(e)\
-                 != "prepend_scheme='mailto' is not in allowed_schemes=[None, 'http', 'https']":
+                    != "prepend_scheme='mailto' is not in allowed_schemes=[None, 'http', 'https']":
                 self.fail('Wrong exception: ' + str(e))
         else:
             self.fail("Got invalid prepend_scheme: 'mailto'")
@@ -579,67 +583,93 @@ class TestIsHttpUrl(unittest.TestCase):
         self.assertEqual(a('google.ca:80'), ('google.ca:80',
                          'enter a valid URL'))
 
+
 class TestUnicode(unittest.TestCase):
     x = IS_URL()
-    y = IS_URL(allowed_schemes=['https'], prepend_scheme='https') #excludes the option for abbreviated URLs with no scheme
-    z = IS_URL(prepend_scheme=None) # disables prepending the scheme in the return value
-
+    y = IS_URL(allowed_schemes=['https'], prepend_scheme='https')
+               #excludes the option for abbreviated URLs with no scheme
+    z = IS_URL(prepend_scheme=None)
+               # disables prepending the scheme in the return value
 
     def testUnicodeToAsciiUrl(self):
         self.assertEquals(unicode_to_ascii_authority(u'www.Alliancefran\xe7aise.nu'), 'www.xn--alliancefranaise-npb.nu')
-        self.assertEquals(unicode_to_ascii_authority(u'www.benn.ca'), 'www.benn.ca')
-        self.assertRaises(UnicodeError, unicode_to_ascii_authority, u'\u4e2d'*1000) #label is too long
-
+        self.assertEquals(
+            unicode_to_ascii_authority(u'www.benn.ca'), 'www.benn.ca')
+        self.assertRaises(UnicodeError, unicode_to_ascii_authority,
+                          u'\u4e2d' * 1000)  # label is too long
 
     def testValidUrls(self):
-        self.assertEquals(self.x(u'www.Alliancefrancaise.nu'), ('http://www.Alliancefrancaise.nu', None))
-        self.assertEquals(self.x(u'www.Alliancefran\xe7aise.nu'), ('http://www.xn--alliancefranaise-npb.nu', None))
-        self.assertEquals(self.x(u'www.Alliancefran\xe7aise.nu:8080'), ('http://www.xn--alliancefranaise-npb.nu:8080', None))
-        self.assertEquals(self.x(u'http://www.Alliancefran\xe7aise.nu'), ('http://www.xn--alliancefranaise-npb.nu', None))
+        self.assertEquals(self.x(u'www.Alliancefrancaise.nu'), (
+            'http://www.Alliancefrancaise.nu', None))
+        self.assertEquals(self.x(u'www.Alliancefran\xe7aise.nu'), (
+            'http://www.xn--alliancefranaise-npb.nu', None))
+        self.assertEquals(self.x(u'www.Alliancefran\xe7aise.nu:8080'), (
+            'http://www.xn--alliancefranaise-npb.nu:8080', None))
+        self.assertEquals(self.x(u'http://www.Alliancefran\xe7aise.nu'),
+                          ('http://www.xn--alliancefranaise-npb.nu', None))
         self.assertEquals(self.x(u'http://www.Alliancefran\xe7aise.nu/parnaise/blue'), ('http://www.xn--alliancefranaise-npb.nu/parnaise/blue', None))
         self.assertEquals(self.x(u'http://www.Alliancefran\xe7aise.nu/parnaise/blue#fragment'), ('http://www.xn--alliancefranaise-npb.nu/parnaise/blue#fragment', None))
         self.assertEquals(self.x(u'http://www.Alliancefran\xe7aise.nu/parnaise/blue?query=value#fragment'), ('http://www.xn--alliancefranaise-npb.nu/parnaise/blue?query=value#fragment', None))
         self.assertEquals(self.x(u'http://www.Alliancefran\xe7aise.nu:8080/parnaise/blue?query=value#fragment'), ('http://www.xn--alliancefranaise-npb.nu:8080/parnaise/blue?query=value#fragment', None))
         self.assertEquals(self.x(u'www.Alliancefran\xe7aise.nu/parnaise/blue?query=value#fragment'), ('http://www.xn--alliancefranaise-npb.nu/parnaise/blue?query=value#fragment', None))
-        self.assertEquals(self.x(u'http://\u4e2d\u4fd4.com'), ('http://xn--fiq13b.com', None))
-        self.assertEquals(self.x(u'http://\u4e2d\u4fd4.com/\u4e86'), ('http://xn--fiq13b.com/%4e%86', None))
+        self.assertEquals(self.x(
+            u'http://\u4e2d\u4fd4.com'), ('http://xn--fiq13b.com', None))
+        self.assertEquals(self.x(u'http://\u4e2d\u4fd4.com/\u4e86'),
+                          ('http://xn--fiq13b.com/%4e%86', None))
         self.assertEquals(self.x(u'http://\u4e2d\u4fd4.com/\u4e86?query=\u4e86'), ('http://xn--fiq13b.com/%4e%86?query=%4e%86', None))
         self.assertEquals(self.x(u'http://\u4e2d\u4fd4.com/\u4e86?query=\u4e86#fragment'), ('http://xn--fiq13b.com/%4e%86?query=%4e%86#fragment', None))
         self.assertEquals(self.x(u'http://\u4e2d\u4fd4.com?query=\u4e86#fragment'), ('http://xn--fiq13b.com?query=%4e%86#fragment', None))
-        self.assertEquals(self.x(u'http://B\xfccher.ch'), ('http://xn--bcher-kva.ch', None))
-        self.assertEquals(self.x(u'http://\xe4\xf6\xfc\xdf.com'), ('http://xn--ss-uia6e4a.com', None))
-        self.assertEquals(self.x(u'http://visegr\xe1d.com'), ('http://xn--visegrd-mwa.com', None))
-        self.assertEquals(self.x(u'http://h\xe1zipatika.com'), ('http://xn--hzipatika-01a.com', None))
-        self.assertEquals(self.x(u'http://www.\xe7ukurova.com'), ('http://www.xn--ukurova-txa.com', None))
+        self.assertEquals(
+            self.x(u'http://B\xfccher.ch'), ('http://xn--bcher-kva.ch', None))
+        self.assertEquals(self.x(u'http://\xe4\xf6\xfc\xdf.com'), (
+            'http://xn--ss-uia6e4a.com', None))
+        self.assertEquals(self.x(
+            u'http://visegr\xe1d.com'), ('http://xn--visegrd-mwa.com', None))
+        self.assertEquals(self.x(u'http://h\xe1zipatika.com'), (
+            'http://xn--hzipatika-01a.com', None))
+        self.assertEquals(self.x(u'http://www.\xe7ukurova.com'), (
+            'http://www.xn--ukurova-txa.com', None))
         self.assertEquals(self.x(u'http://nixier\xf6hre.nixieclock-tube.com'), ('http://xn--nixierhre-57a.nixieclock-tube.com', None))
         self.assertEquals(self.x(u'google.ca.'), ('http://google.ca.', None))
 
-        self.assertEquals(self.y(u'https://google.ca'), ('https://google.ca', None))
-        self.assertEquals(self.y(u'https://\u4e2d\u4fd4.com'), ('https://xn--fiq13b.com', None))
+        self.assertEquals(
+            self.y(u'https://google.ca'), ('https://google.ca', None))
+        self.assertEquals(self.y(
+            u'https://\u4e2d\u4fd4.com'), ('https://xn--fiq13b.com', None))
 
         self.assertEquals(self.z(u'google.ca'), ('google.ca', None))
 
-
     def testInvalidUrls(self):
-        self.assertEquals(self.x(u'://ABC.com'), (u'://ABC.com', 'enter a valid URL'))
-        self.assertEquals(self.x(u'http://\u4e2d\u4fd4.dne'), (u'http://\u4e2d\u4fd4.dne', 'enter a valid URL'))
-        self.assertEquals(self.x(u'https://google.dne'), (u'https://google.dne', 'enter a valid URL'))
-        self.assertEquals(self.x(u'https://google..ca'), (u'https://google..ca', 'enter a valid URL'))
-        self.assertEquals(self.x(u'google..ca'), (u'google..ca', 'enter a valid URL'))
-        self.assertEquals(self.x(u'http://' + u'\u4e2d'*1000 + u'.com'), (u'http://' + u'\u4e2d'*1000 + u'.com', 'enter a valid URL'))
+        self.assertEquals(
+            self.x(u'://ABC.com'), (u'://ABC.com', 'enter a valid URL'))
+        self.assertEquals(self.x(u'http://\u4e2d\u4fd4.dne'), (
+            u'http://\u4e2d\u4fd4.dne', 'enter a valid URL'))
+        self.assertEquals(self.x(u'https://google.dne'), (
+            u'https://google.dne', 'enter a valid URL'))
+        self.assertEquals(self.x(u'https://google..ca'), (
+            u'https://google..ca', 'enter a valid URL'))
+        self.assertEquals(
+            self.x(u'google..ca'), (u'google..ca', 'enter a valid URL'))
+        self.assertEquals(self.x(u'http://' + u'\u4e2d' * 1000 + u'.com'), (
+            u'http://' + u'\u4e2d' * 1000 + u'.com', 'enter a valid URL'))
 
-        self.assertEquals(self.x(u'http://google.com#fragment_\u4e86'), (u'http://google.com#fragment_\u4e86', 'enter a valid URL'))
-        self.assertEquals(self.x(u'http\u4e86://google.com'), (u'http\u4e86://google.com', 'enter a valid URL'))
-        self.assertEquals(self.x(u'http\u4e86://google.com#fragment_\u4e86'), (u'http\u4e86://google.com#fragment_\u4e86', 'enter a valid URL'))
+        self.assertEquals(self.x(u'http://google.com#fragment_\u4e86'), (
+            u'http://google.com#fragment_\u4e86', 'enter a valid URL'))
+        self.assertEquals(self.x(u'http\u4e86://google.com'), (
+            u'http\u4e86://google.com', 'enter a valid URL'))
+        self.assertEquals(self.x(u'http\u4e86://google.com#fragment_\u4e86'), (
+            u'http\u4e86://google.com#fragment_\u4e86', 'enter a valid URL'))
 
-        self.assertEquals(self.y(u'http://\u4e2d\u4fd4.com/\u4e86'), (u'http://\u4e2d\u4fd4.com/\u4e86', 'enter a valid URL'))
+        self.assertEquals(self.y(u'http://\u4e2d\u4fd4.com/\u4e86'), (
+            u'http://\u4e2d\u4fd4.com/\u4e86', 'enter a valid URL'))
         #self.assertEquals(self.y(u'google.ca'), (u'google.ca', 'enter a valid URL'))
 
-        self.assertEquals(self.z(u'invalid.domain..com'), (u'invalid.domain..com', 'enter a valid URL'))
-        self.assertEquals(self.z(u'invalid.\u4e2d\u4fd4.blargg'), (u'invalid.\u4e2d\u4fd4.blargg', 'enter a valid URL'))
+        self.assertEquals(self.z(u'invalid.domain..com'), (
+            u'invalid.domain..com', 'enter a valid URL'))
+        self.assertEquals(self.z(u'invalid.\u4e2d\u4fd4.blargg'), (
+            u'invalid.\u4e2d\u4fd4.blargg', 'enter a valid URL'))
 
 # ##############################################################################
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_languages.py b/gluon/tests/test_languages.py
index 5fda85e6..911ddcd2 100644
--- a/gluon/tests/test_languages.py
+++ b/gluon/tests/test_languages.py
@@ -49,12 +49,11 @@ try:
 
         def test_reads_and_writes(self):
             readwriters = 10
-            pool = multiprocessing.Pool(processes = readwriters)
+            pool = multiprocessing.Pool(processes=readwriters)
             results = pool.map(read_write, [[self.filename, 10]] * readwriters)
             for result in results:
                 self.assertTrue(result)
 
-
     class TestTranslations(unittest.TestCase):
 
         def setUp(self):
@@ -62,11 +61,11 @@ try:
             if os.path.isdir('gluon'):
                 self.request.folder = 'applications/welcome'
             else:
-                self.request.folder = os.path.realpath('../../applications/welcome')
+                self.request.folder = os.path.realpath(
+                    '../../applications/welcome')
             self.request.env = Storage()
             self.request.env.http_accept_language = 'en'
 
-
         def tearDown(self):
             pass
 
@@ -99,4 +98,3 @@ except ImportError:
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_markmin.py b/gluon/tests/test_markmin.py
index 643a100a..f53d3aa0 100644
--- a/gluon/tests/test_markmin.py
+++ b/gluon/tests/test_markmin.py
@@ -13,10 +13,10 @@ else:
 import unittest
 from contrib.markmin.markmin2html import run_doctests
 
+
 class TestMarkmin(unittest.TestCase):
     def testMarkmin(self):
         run_doctests()
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_router.py b/gluon/tests/test_router.py
index 3cd75db3..8b9709b4 100644
--- a/gluon/tests/test_router.py
+++ b/gluon/tests/test_router.py
@@ -10,9 +10,9 @@ import tempfile
 import logging
 
 if os.path.isdir('gluon'):
-    sys.path.append(os.path.realpath('gluon')) # running from web2py base
+    sys.path.append(os.path.realpath('gluon'))  # running from web2py base
 else:
-    sys.path.append(os.path.realpath('../')) # running from gluon/tests/
+    sys.path.append(os.path.realpath('../'))  # running from gluon/tests/
     os.environ['web2py_path'] = os.path.realpath('../../')  # for settings
 
 from rewrite import load, filter_url, filter_err, get_effective_router, map_url_out
@@ -26,6 +26,7 @@ logger = None
 oldcwd = None
 root = None
 
+
 def setUpModule():
     def make_apptree():
         "build a temporary applications tree"
@@ -41,14 +42,17 @@ def setUpModule():
 
         #  applications/admin/controllers/*.py
         for ctr in ('appadmin', 'default', 'gae', 'mercurial', 'shell', 'wizard'):
-            open(abspath('applications', 'admin', 'controllers', '%s.py' % ctr), 'w').close()
+            open(abspath('applications', 'admin',
+                 'controllers', '%s.py' % ctr), 'w').close()
         #  applications/examples/controllers/*.py
         for ctr in ('ajax_examples', 'appadmin', 'default', 'global', 'spreadsheet'):
-            open(abspath('applications', 'examples', 'controllers', '%s.py' % ctr), 'w').close()
+            open(abspath('applications', 'examples',
+                 'controllers', '%s.py' % ctr), 'w').close()
         #  applications/welcome/controllers/*.py
         #  (include controller that collides with another app)
         for ctr in ('appadmin', 'default', 'other', 'admin'):
-            open(abspath('applications', 'welcome', 'controllers', '%s.py' % ctr), 'w').close()
+            open(abspath('applications', 'welcome',
+                 'controllers', '%s.py' % ctr), 'w').close()
 
         #  create an app-specific routes.py for examples app
         routes = open(abspath('applications', 'examples', 'routes.py'), 'w')
@@ -58,13 +62,15 @@ def setUpModule():
         #  create language files for examples app
         for lang in ('en', 'it'):
             os.mkdir(abspath('applications', 'examples', 'static', lang))
-            open(abspath('applications', 'examples', 'static', lang, 'file'), 'w').close()
+            open(abspath('applications', 'examples', 'static',
+                 lang, 'file'), 'w').close()
 
     global oldcwd
     if oldcwd is None:  # do this only once
         oldcwd = os.getcwd()
         if not os.path.isdir('gluon'):
-            os.chdir(os.path.realpath('../../'))    # run from web2py base directory
+            os.chdir(os.path.realpath(
+                '../../'))    # run from web2py base directory
         import main   # for initialization after chdir
         global logger
         logger = logging.getLogger('web2py.rewrite')
@@ -73,6 +79,7 @@ def setUpModule():
         root = global_settings.applications_parent
         make_apptree()
 
+
 def tearDownModule():
     global oldcwd
     if oldcwd is not None:
@@ -88,16 +95,18 @@ class TestRouter(unittest.TestCase):
         level = logger.getEffectiveLevel()
         logger.setLevel(logging.CRITICAL)  # disable logging temporarily
         self.assertRaises(SyntaxError, load, data='x:y')
-        self.assertRaises(SyntaxError, load, rdict=dict(BASE=dict(badkey="value")))
-        self.assertRaises(SyntaxError, load, rdict=dict(BASE=dict(), app=dict(default_application="name")))
+        self.assertRaises(
+            SyntaxError, load, rdict=dict(BASE=dict(badkey="value")))
+        self.assertRaises(SyntaxError, load, rdict=dict(
+            BASE=dict(), app=dict(default_application="name")))
         try:
             # 2.7+ only
             self.assertRaisesRegexp(SyntaxError, "invalid syntax",
-                load, data='x:y')
+                                    load, data='x:y')
             self.assertRaisesRegexp(SyntaxError, "unknown key",
-                load, rdict=dict(BASE=dict(badkey="value")))
+                                    load, rdict=dict(BASE=dict(badkey="value")))
             self.assertRaisesRegexp(SyntaxError, "BASE-only key",
-                load, rdict=dict(BASE=dict(), app=dict(default_application="name")))
+                                    load, rdict=dict(BASE=dict(), app=dict(default_application="name")))
         except AttributeError:
             pass
         logger.setLevel(level)
@@ -106,14 +115,20 @@ class TestRouter(unittest.TestCase):
         """ Tests the null router """
         load(rdict=dict())
         # app resolution
-        self.assertEqual(filter_url('http://domain.com/welcome', app=True), 'welcome')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome', app=True), 'welcome')
         self.assertEqual(filter_url('http://domain.com/', app=True), 'init')
         # incoming
-        self.assertEqual(filter_url('http://domain.com/favicon.ico'), '%s/applications/init/static/favicon.ico' % root)
-        self.assertEqual(filter_url('http://domain.com/abc'), '/init/default/abc')
-        self.assertEqual(filter_url('http://domain.com/index/abc'), "/init/default/index ['abc']")
-        self.assertEqual(filter_url('http://domain.com/abc/def'), "/init/default/abc ['def']")
-        self.assertEqual(filter_url('http://domain.com/index/a%20bc'), "/init/default/index ['a bc']")
+        self.assertEqual(filter_url('http://domain.com/favicon.ico'),
+                         '%s/applications/init/static/favicon.ico' % root)
+        self.assertEqual(
+            filter_url('http://domain.com/abc'), '/init/default/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/index/abc'), "/init/default/index ['abc']")
+        self.assertEqual(filter_url(
+            'http://domain.com/abc/def'), "/init/default/abc ['def']")
+        self.assertEqual(filter_url(
+            'http://domain.com/index/a%20bc'), "/init/default/index ['a bc']")
         self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static'), "%s/applications/welcome/static/path/to/static" % root)
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
         try:
@@ -122,15 +137,23 @@ class TestRouter(unittest.TestCase):
         except AttributeError:
             pass
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/init/default/index', out=True), '/')
+        self.assertEqual(
+            filter_url('http://domain.com/init/default/index', out=True), '/')
         self.assertEqual(filter_url('http://domain.com/init/default/index/arg1', out=True), '/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/init/default/abc', out=True), '/abc')
-        self.assertEqual(filter_url('http://domain.com/init/static/abc', out=True), '/init/static/abc')
-        self.assertEqual(filter_url('http://domain.com/init/appadmin/index', out=True), '/appadmin')
-        self.assertEqual(filter_url('http://domain.com/init/appadmin/abc', out=True), '/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/init/admin/index', out=True), '/init/admin')
-        self.assertEqual(filter_url('http://domain.com/init/admin/abc', out=True), '/init/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/init/default/abc', out=True), '/abc')
+        self.assertEqual(filter_url('http://domain.com/init/static/abc',
+                         out=True), '/init/static/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/init/appadmin/index', out=True), '/appadmin')
+        self.assertEqual(filter_url(
+            'http://domain.com/init/appadmin/abc', out=True), '/appadmin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/init/admin/index', out=True), '/init/admin')
+        self.assertEqual(filter_url(
+            'http://domain.com/init/admin/abc', out=True), '/init/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
 
     def test_router_specific(self):
         """
@@ -139,38 +162,58 @@ class TestRouter(unittest.TestCase):
         Note that make_apptree above created applications/examples/routes.py with a default_function.
         """
         load(rdict=dict())
-        self.assertEqual(filter_url('http://domain.com/welcome'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/examples'), '/examples/default/exdef')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome'), '/welcome/default/index')
+        self.assertEqual(filter_url(
+            'http://domain.com/examples'), '/examples/default/exdef')
 
     def test_router_defapp(self):
         """ Test the default-application function """
         routers = dict(BASE=dict(default_application='welcome'))
         load(rdict=routers)
         # app resolution
-        self.assertEqual(filter_url('http://domain.com/welcome', app=True), 'welcome')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome', app=True), 'welcome')
         self.assertEqual(filter_url('http://domain.com/', app=True), 'welcome')
         # incoming
-        self.assertEqual(filter_url('http://domain.com'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/appadmin'), '/welcome/appadmin/index')
-        self.assertEqual(filter_url('http://domain.com/abc'), '/welcome/default/abc')
-        self.assertEqual(filter_url('http://domain.com/index/abc'), "/welcome/default/index ['abc']")
-        self.assertEqual(filter_url('http://domain.com/abc/def'), "/welcome/default/abc ['def']")
-        self.assertEqual(filter_url('http://domain.com/favicon.ico'), '%s/applications/welcome/static/favicon.ico' % root)
-        self.assertEqual(filter_url('http://domain.com/static/abc'), '%s/applications/welcome/static/abc' % root)
+        self.assertEqual(
+            filter_url('http://domain.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/'), '/welcome/default/index')
+        self.assertEqual(filter_url(
+            'http://domain.com/appadmin'), '/welcome/appadmin/index')
+        self.assertEqual(
+            filter_url('http://domain.com/abc'), '/welcome/default/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/index/abc'), "/welcome/default/index ['abc']")
+        self.assertEqual(filter_url(
+            'http://domain.com/abc/def'), "/welcome/default/abc ['def']")
+        self.assertEqual(filter_url('http://domain.com/favicon.ico'),
+                         '%s/applications/welcome/static/favicon.ico' % root)
+        self.assertEqual(filter_url('http://domain.com/static/abc'),
+                         '%s/applications/welcome/static/abc' % root)
         self.assertEqual(filter_url('http://domain.com/static/path/to/static'), "%s/applications/welcome/static/path/to/static" % root)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/')
+        self.assertEqual(filter_url(
+            'http://domain.com/welcome/default/index', out=True), '/')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/admin', out=True), '/default/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True),
+        self.assertEqual(filter_url(
+            'http://domain.com/welcome/default/abc', out=True), '/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/admin',
+                         out=True), '/default/admin')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/static/abc', out=True),
             '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/appadmin')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/appadmin')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
 
     def test_router_nodef(self):
         """ Test no-default functions """
@@ -180,46 +223,71 @@ class TestRouter(unittest.TestCase):
         )
         load(rdict=routers)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/default')
+        self.assertEqual(filter_url(
+            'http://domain.com/welcome/default/index', out=True), '/default')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/default/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/default/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True),
+        self.assertEqual(filter_url('http://domain.com/welcome/default/abc',
+                         out=True), '/default/abc')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/static/abc', out=True),
             '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/appadmin')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/appadmin')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
         # incoming
-        self.assertEqual(filter_url('http://domain.com'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/appadmin'), '/welcome/appadmin/index')
-        self.assertEqual(filter_url('http://domain.com/abc'), '/welcome/abc/index')
-        self.assertEqual(filter_url('http://domain.com/index/abc'), "/welcome/index/abc")
-        self.assertEqual(filter_url('http://domain.com/abc/def'), "/welcome/abc/def")
-        self.assertEqual(filter_url('http://domain.com/abc/def/ghi'), "/welcome/abc/def ['ghi']")
+        self.assertEqual(
+            filter_url('http://domain.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/'), '/welcome/default/index')
+        self.assertEqual(filter_url(
+            'http://domain.com/appadmin'), '/welcome/appadmin/index')
+        self.assertEqual(
+            filter_url('http://domain.com/abc'), '/welcome/abc/index')
+        self.assertEqual(
+            filter_url('http://domain.com/index/abc'), "/welcome/index/abc")
+        self.assertEqual(
+            filter_url('http://domain.com/abc/def'), "/welcome/abc/def")
+        self.assertEqual(filter_url(
+            'http://domain.com/abc/def/ghi'), "/welcome/abc/def ['ghi']")
 
         routers = dict(
             BASE=dict(default_application=None),
         )
         load(rdict=routers)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/welcome')
+        self.assertEqual(filter_url(
+            'http://domain.com/welcome/default/index', out=True), '/welcome')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/welcome/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/welcome/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True), '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/welcome/appadmin')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/welcome/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/abc',
+                         out=True), '/welcome/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/static/abc',
+                         out=True), '/welcome/static/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/welcome/appadmin')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/welcome/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
         # incoming
         self.assertRaises(HTTP, filter_url, 'http://domain.com')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/appadmin')
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(HTTP, "400.*invalid application", filter_url, 'http://domain.com')
-            self.assertRaisesRegexp(HTTP, "400.*invalid application", filter_url, 'http://domain.com/appadmin')
+            self.assertRaisesRegexp(HTTP, "400.*invalid application",
+                                    filter_url, 'http://domain.com')
+            self.assertRaisesRegexp(HTTP, "400.*invalid application",
+                                    filter_url, 'http://domain.com/appadmin')
         except AttributeError:
             pass
 
@@ -228,18 +296,28 @@ class TestRouter(unittest.TestCase):
         )
         load(rdict=routers)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/welcome')
+        self.assertEqual(filter_url(
+            'http://domain.com/welcome/default/index', out=True), '/welcome')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/welcome/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/welcome/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True), '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/welcome/appadmin')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/welcome/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/abc',
+                         out=True), '/welcome/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/static/abc',
+                         out=True), '/welcome/static/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/welcome/appadmin')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/welcome/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
         # incoming
-        self.assertEqual(filter_url('http://domain.com'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/'), '/welcome/default/index')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/appadmin')
         try:
             # 2.7+ only
@@ -253,18 +331,28 @@ class TestRouter(unittest.TestCase):
         )
         load(rdict=routers)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/welcome/default')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/index',
+                         out=True), '/welcome/default')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/welcome/default/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/welcome/default/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True), '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/welcome/appadmin')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/welcome/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/abc',
+                         out=True), '/welcome/default/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/static/abc',
+                         out=True), '/welcome/static/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/welcome/appadmin')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/welcome/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
         # incoming
-        self.assertEqual(filter_url('http://domain.com'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/'), '/welcome/default/index')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/appadmin')
         try:
             # 2.7+ only
@@ -278,21 +366,30 @@ class TestRouter(unittest.TestCase):
         )
         load(rdict=routers)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/welcome/default')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/index',
+                         out=True), '/welcome/default')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/welcome/default/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/welcome/default/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True), '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/welcome/appadmin')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/welcome/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/abc',
+                         out=True), '/welcome/default/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/static/abc',
+                         out=True), '/welcome/static/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/welcome/appadmin')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/welcome/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
         # incoming
         self.assertRaises(HTTP, filter_url, 'http://domain.com')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/appadmin')
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(HTTP, "400.*invalid controller", filter_url, 'http://domain.com')
+            self.assertRaisesRegexp(HTTP, "400.*invalid controller",
+                                    filter_url, 'http://domain.com')
             self.assertRaisesRegexp(HTTP, "400.*unknown application: 'appadmin'", filter_url, 'http://domain.com/appadmin')
         except AttributeError:
             pass
@@ -303,21 +400,30 @@ class TestRouter(unittest.TestCase):
         )
         load(rdict=routers)
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/welcome/default/index', out=True), '/welcome/default/index')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/index',
+                         out=True), '/welcome/default/index')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/arg1', out=True), '/welcome/default/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/welcome/default/abc', out=True), '/welcome/default/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc', out=True), '/welcome/static/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index', out=True), '/welcome/appadmin/index')
-        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc', out=True), '/welcome/appadmin/abc')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/index', out=True), '/welcome/admin/index')
-        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc', out=True), '/welcome/admin/abc')
-        self.assertEqual(filter_url('http://domain.com/admin/default/abc', out=True), '/admin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/abc',
+                         out=True), '/welcome/default/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/static/abc',
+                         out=True), '/welcome/static/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/index',
+                         out=True), '/welcome/appadmin/index')
+        self.assertEqual(filter_url('http://domain.com/welcome/appadmin/abc',
+                         out=True), '/welcome/appadmin/abc')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/index',
+                         out=True), '/welcome/admin/index')
+        self.assertEqual(filter_url('http://domain.com/welcome/admin/abc',
+                         out=True), '/welcome/admin/abc')
+        self.assertEqual(filter_url(
+            'http://domain.com/admin/default/abc', out=True), '/admin/abc')
         # incoming
         self.assertRaises(HTTP, filter_url, 'http://domain.com')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/appadmin')
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(HTTP, "400.*invalid function", filter_url, 'http://domain.com')
+            self.assertRaisesRegexp(HTTP, "400.*invalid function",
+                                    filter_url, 'http://domain.com')
             self.assertRaisesRegexp(HTTP, "400.*unknown application: 'appadmin'", filter_url, 'http://domain.com/appadmin')
         except AttributeError:
             pass
@@ -325,39 +431,48 @@ class TestRouter(unittest.TestCase):
     def test_router_app(self):
         """ Tests the doctest router app resolution"""
         routers = dict(
-            BASE = dict(
-                domains = {
-                    "domain1.com" : "app1",
-                    "www.domain1.com" : "app1",
-                    "domain2.com" : "app2",
+            BASE=dict(
+                domains={
+                    "domain1.com": "app1",
+                    "www.domain1.com": "app1",
+                    "domain2.com": "app2",
                 },
             ),
-            app1 = dict(),
-            app2 = dict(),
-            goodapp = dict(),
+            app1=dict(),
+            app2=dict(),
+            goodapp=dict(),
         )
         routers['bad!app'] = dict()
         load(rdict=routers)
-        self.assertEqual(filter_url('http://domain.com/welcome', app=True), 'welcome')
-        self.assertEqual(filter_url('http://domain.com/welcome/', app=True), 'welcome')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome', app=True), 'welcome')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/', app=True), 'welcome')
         self.assertEqual(filter_url('http://domain.com', app=True), 'init')
         self.assertEqual(filter_url('http://domain.com/', app=True), 'init')
         self.assertEqual(filter_url('http://domain.com/abc', app=True), 'init')
-        self.assertEqual(filter_url('http://domain1.com/abc', app=True), 'app1')
-        self.assertEqual(filter_url('http://www.domain1.com/abc', app=True), 'app1')
-        self.assertEqual(filter_url('http://domain2.com/abc', app=True), 'app2')
-        self.assertEqual(filter_url('http://domain2.com/admin', app=True), 'admin')
+        self.assertEqual(
+            filter_url('http://domain1.com/abc', app=True), 'app1')
+        self.assertEqual(
+            filter_url('http://www.domain1.com/abc', app=True), 'app1')
+        self.assertEqual(
+            filter_url('http://domain2.com/abc', app=True), 'app2')
+        self.assertEqual(
+            filter_url('http://domain2.com/admin', app=True), 'admin')
 
         routers['BASE']['exclusive_domain'] = True
         load(rdict=routers)
-        self.assertEqual(filter_url('http://domain2.com/admin', app=True), 'app2')
+        self.assertEqual(
+            filter_url('http://domain2.com/admin', app=True), 'app2')
 
-
-        self.assertEqual(filter_url('http://domain.com/goodapp', app=True), 'goodapp')
-        self.assertRaises(HTTP, filter_url, 'http://domain.com/bad!app', app=True)
+        self.assertEqual(
+            filter_url('http://domain.com/goodapp', app=True), 'goodapp')
+        self.assertRaises(
+            HTTP, filter_url, 'http://domain.com/bad!app', app=True)
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(HTTP, '400.*invalid application', filter_url, 'http://domain.com/bad!app')
+            self.assertRaisesRegexp(HTTP, '400.*invalid application',
+                                    filter_url, 'http://domain.com/bad!app')
         except AttributeError:
             pass
 
@@ -365,7 +480,8 @@ class TestRouter(unittest.TestCase):
         self.assertRaises(SyntaxError, load, rdict=routers)
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(SyntaxError, "unknown.*app3", load, rdict=routers)
+            self.assertRaisesRegexp(
+                SyntaxError, "unknown.*app3", load, rdict=routers)
         except AttributeError:
             pass
 
@@ -374,203 +490,270 @@ class TestRouter(unittest.TestCase):
         Test URLs that map domains using test filesystem layout
         '''
         routers = dict(
-            BASE = dict(
-                domains = {
-                    "domain1.com" : "admin",
-                    "domain2.com" : "welcome",
+            BASE=dict(
+                domains={
+                    "domain1.com": "admin",
+                    "domain2.com": "welcome",
                 },
             ),
         )
 
         load(rdict=routers)
-        self.assertEqual(filter_url('http://domain1.com'), '/admin/default/index')
-        self.assertEqual(filter_url('http://domain2.com'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain1.com/gae'), '/admin/gae/index')
-        self.assertEqual(filter_url('http://domain2.com/other'), '/welcome/other/index')
-        self.assertEqual(filter_url('http://domain1.com/gae/f1'), '/admin/gae/f1')
-        self.assertEqual(filter_url('http://domain2.com/f2'), '/welcome/default/f2')
-        self.assertEqual(filter_url('http://domain2.com/other/f3'), '/welcome/other/f3')
-
+        self.assertEqual(
+            filter_url('http://domain1.com'), '/admin/default/index')
+        self.assertEqual(
+            filter_url('http://domain2.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain1.com/gae'), '/admin/gae/index')
+        self.assertEqual(
+            filter_url('http://domain2.com/other'), '/welcome/other/index')
+        self.assertEqual(
+            filter_url('http://domain1.com/gae/f1'), '/admin/gae/f1')
+        self.assertEqual(
+            filter_url('http://domain2.com/f2'), '/welcome/default/f2')
+        self.assertEqual(
+            filter_url('http://domain2.com/other/f3'), '/welcome/other/f3')
 
     def test_router_domains(self):
         '''
         Test URLs that map domains
         '''
         routers = dict(
-            BASE = dict(
-                applications = ['app1', 'app2', 'app2A', 'app3', 'app4', 'app5', 'app6'],
-                domains = {
+            BASE=dict(
+                applications=['app1', 'app2', 'app2A',
+                              'app3', 'app4', 'app5', 'app6'],
+                domains={
                     #  two domains to the same app
-                    "domain1.com"     : "app1",
-                    "www.domain1.com" : "app1",
+                    "domain1.com": "app1",
+                    "www.domain1.com": "app1",
                     #  same domain, two ports, to two apps
-                    "domain2.com"      : "app2a",
-                    "domain2.com:8080" : "app2b",
+                    "domain2.com": "app2a",
+                    "domain2.com:8080": "app2b",
                     #  two domains, same app, two controllers
-                    "domain3a.com" : "app3/c3a",
-                    "domain3b.com" : "app3/c3b",
+                    "domain3a.com": "app3/c3a",
+                    "domain3b.com": "app3/c3b",
                     #  two domains, same app & controller, two functions
-                    "domain4a.com" : "app4/c4/f4a",
-                    "domain4b.com" : "app4/c4/f4b",
+                    "domain4a.com": "app4/c4/f4a",
+                    "domain4b.com": "app4/c4/f4b",
                     #  http vs https
-                    "domain6.com:80"  : "app6",
-                    "domain6.com:443" : "app6s",
+                    "domain6.com:80": "app6",
+                    "domain6.com:443": "app6s",
                 },
             ),
-            app1 =  dict( default_controller = 'c1',  default_function = 'f1',  controllers = ['c1'], exclusive_domain=True, ),
-            app2a = dict( default_controller = 'c2a', default_function = 'f2a', controllers = ['c2a'], ),
-            app2b = dict( default_controller = 'c2b', default_function = 'f2b', controllers = ['c2b'], ),
-            app3 =  dict( controllers = ['c3a', 'c3b'], ),
-            app4 =  dict( default_controller = 'c4', controllers = ['c4']),
-            app5 =  dict( default_controller = 'c5', controllers = ['c5'], domain = 'localhost' ),
-            app6 =  dict( default_controller = 'c6',  default_function = 'f6',  controllers = ['c6'], ),
-            app6s =  dict( default_controller = 'c6s',  default_function = 'f6s',  controllers = ['c6s'], ),
+            app1=dict(default_controller='c1', default_function='f1',
+                      controllers=['c1'], exclusive_domain=True, ),
+            app2a=dict(default_controller='c2a',
+                       default_function='f2a', controllers=['c2a'], ),
+            app2b=dict(default_controller='c2b',
+                       default_function='f2b', controllers=['c2b'], ),
+            app3=dict(controllers=['c3a', 'c3b'], ),
+            app4=dict(default_controller='c4', controllers=['c4']),
+            app5=dict(default_controller='c5',
+                      controllers=['c5'], domain='localhost'),
+            app6=dict(default_controller='c6',
+                      default_function='f6', controllers=['c6'], ),
+            app6s=dict(default_controller='c6s',
+                       default_function='f6s', controllers=['c6s'], ),
         )
 
         load(rdict=routers)
         self.assertEqual(filter_url('http://domain1.com/abc'), '/app1/c1/abc')
-        self.assertEqual(filter_url('http://domain1.com/c1/abc'), '/app1/c1/abc')
-        self.assertEqual(filter_url('http://domain1.com/abc.html'), '/app1/c1/abc')
-        self.assertEqual(filter_url('http://domain1.com/abc.css'), '/app1/c1/abc.css')
-        self.assertEqual(filter_url('http://domain1.com/index/abc'), "/app1/c1/index ['abc']")
+        self.assertEqual(
+            filter_url('http://domain1.com/c1/abc'), '/app1/c1/abc')
+        self.assertEqual(
+            filter_url('http://domain1.com/abc.html'), '/app1/c1/abc')
+        self.assertEqual(
+            filter_url('http://domain1.com/abc.css'), '/app1/c1/abc.css')
+        self.assertEqual(filter_url(
+            'http://domain1.com/index/abc'), "/app1/c1/index ['abc']")
         self.assertEqual(filter_url('http://domain2.com/app1'), "/app1/c1/f1")
 
-        self.assertEqual(filter_url('https://domain1.com/app1/ctr/fcn', domain=('app1',None), out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://www.domain1.com/app1/ctr/fcn', domain=('app1',None), out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://domain1.com/app1/ctr/fcn',
+                         domain=('app1', None), out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://www.domain1.com/app1/ctr/fcn',
+                         domain=('app1', None), out=True), "/ctr/fcn")
 
-        self.assertEqual(filter_url('http://domain2.com/abc'), '/app2a/c2a/abc')
-        self.assertEqual(filter_url('http://domain2.com:8080/abc'), '/app2b/c2b/abc')
+        self.assertEqual(
+            filter_url('http://domain2.com/abc'), '/app2a/c2a/abc')
+        self.assertEqual(
+            filter_url('http://domain2.com:8080/abc'), '/app2b/c2b/abc')
 
-        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/fcn', domain=('app2a',None), out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/f2a', domain=('app2a',None), out=True), "/ctr")
-        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/f2a', domain=('app2a',None), out=True), "/")
-        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/fcn', domain=('app2a',None), out=True), "/fcn")
-        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/fcn', domain=('app2b',None), out=True), "/app2a/ctr/fcn")
-        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/f2a', domain=('app2b',None), out=True), "/app2a/ctr")
-        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/f2a', domain=('app2b',None), out=True), "/app2a")
+        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/fcn',
+                         domain=('app2a', None), out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/f2a',
+                         domain=('app2a', None), out=True), "/ctr")
+        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/f2a',
+                         domain=('app2a', None), out=True), "/")
+        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/fcn',
+                         domain=('app2a', None), out=True), "/fcn")
+        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/fcn',
+                         domain=('app2b', None), out=True), "/app2a/ctr/fcn")
+        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/f2a',
+                         domain=('app2b', None), out=True), "/app2a/ctr")
+        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/f2a',
+                         domain=('app2b', None), out=True), "/app2a")
 
         self.assertEqual(filter_url('http://domain3a.com/'), '/app3/c3a/index')
-        self.assertEqual(filter_url('http://domain3a.com/abc'), '/app3/c3a/abc')
-        self.assertEqual(filter_url('http://domain3a.com/c3b'), '/app3/c3b/index')
-        self.assertEqual(filter_url('http://domain3b.com/abc'), '/app3/c3b/abc')
+        self.assertEqual(
+            filter_url('http://domain3a.com/abc'), '/app3/c3a/abc')
+        self.assertEqual(
+            filter_url('http://domain3a.com/c3b'), '/app3/c3b/index')
+        self.assertEqual(
+            filter_url('http://domain3b.com/abc'), '/app3/c3b/abc')
 
-        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn', domain=('app3','c3a'), out=True), "/fcn")
-        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn', domain=('app3','c3b'), out=True), "/c3a/fcn")
-        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn', domain=('app1',None), out=True), "/app3/c3a/fcn")
+        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn',
+                         domain=('app3', 'c3a'), out=True), "/fcn")
+        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn',
+                         domain=('app3', 'c3b'), out=True), "/c3a/fcn")
+        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn',
+                         domain=('app1', None), out=True), "/app3/c3a/fcn")
 
         self.assertEqual(filter_url('http://domain4a.com/abc'), '/app4/c4/abc')
-        self.assertEqual(filter_url('https://domain4a.com/app4/c4/fcn', domain=('app4',None), out=True), "/fcn")
+        self.assertEqual(filter_url('https://domain4a.com/app4/c4/fcn',
+                         domain=('app4', None), out=True), "/fcn")
 
         self.assertEqual(filter_url('http://domain4a.com'), '/app4/c4/f4a')
         self.assertEqual(filter_url('http://domain4b.com'), '/app4/c4/f4b')
 
         self.assertEqual(filter_url('http://localhost/abc'), '/app5/c5/abc')
-        self.assertEqual(filter_url('http:///abc'), '/app5/c5/abc') # test null host => localhost
-        self.assertEqual(filter_url('https://localhost/app5/c5/fcn', domain=('app5',None), out=True), "/fcn")
+        self.assertEqual(filter_url(
+            'http:///abc'), '/app5/c5/abc')  # test null host => localhost
+        self.assertEqual(filter_url('https://localhost/app5/c5/fcn',
+                         domain=('app5', None), out=True), "/fcn")
 
         self.assertEqual(filter_url('http://domain6.com'), '/app6/c6/f6')
         self.assertEqual(filter_url('https://domain6.com'), '/app6s/c6s/f6s')
 
-        self.assertEqual(filter_url('http://domain2.com/app3/c3a/f3', domain=('app2b',None), out=True), "/app3/c3a/f3")
-        self.assertRaises(SyntaxError, filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b',None), out=True)
+        self.assertEqual(filter_url('http://domain2.com/app3/c3a/f3',
+                         domain=('app2b', None), out=True), "/app3/c3a/f3")
+        self.assertRaises(SyntaxError, filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b', None), out=True)
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(SyntaxError, 'cross-domain conflict', filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b',None), out=True)
+            self.assertRaisesRegexp(SyntaxError, 'cross-domain conflict', filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b', None), out=True)
         except AttributeError:
             pass
-        self.assertEqual(filter_url('http://domain1.com/app1/c1/f1', domain=('app2b',None), host='domain2.com', out=True), "/app1")
-
+        self.assertEqual(filter_url('http://domain1.com/app1/c1/f1', domain=(
+            'app2b', None), host='domain2.com', out=True), "/app1")
 
     def test_router_domains_ed(self):
         '''
         Test URLs that map domains with exclusive_domain set
         '''
         routers = dict(
-            BASE = dict(
-                applications = ['app1', 'app2', 'app2A', 'app3', 'app4', 'app5', 'app6'],
-                exclusive_domain = True,
-                domains = {
+            BASE=dict(
+                applications=['app1', 'app2', 'app2A',
+                              'app3', 'app4', 'app5', 'app6'],
+                exclusive_domain=True,
+                domains={
                     #  two domains to the same app
-                    "domain1.com"     : "app1",
-                    "www.domain1.com" : "app1",
+                    "domain1.com": "app1",
+                    "www.domain1.com": "app1",
                     #  same domain, two ports, to two apps
-                    "domain2.com"      : "app2a",
-                    "domain2.com:8080" : "app2b",
+                    "domain2.com": "app2a",
+                    "domain2.com:8080": "app2b",
                     #  two domains, same app, two controllers
-                    "domain3a.com" : "app3/c3a",
-                    "domain3b.com" : "app3/c3b",
+                    "domain3a.com": "app3/c3a",
+                    "domain3b.com": "app3/c3b",
                     #  two domains, same app & controller, two functions
-                    "domain4a.com" : "app4/c4/f4a",
-                    "domain4b.com" : "app4/c4/f4b",
+                    "domain4a.com": "app4/c4/f4a",
+                    "domain4b.com": "app4/c4/f4b",
                     #  http vs https
-                    "domain6.com:80"  : "app6",
-                    "domain6.com:443" : "app6s",
+                    "domain6.com:80": "app6",
+                    "domain6.com:443": "app6s",
                 },
             ),
-            app1 =  dict( default_controller = 'c1',  default_function = 'f1',  controllers = ['c1'], exclusive_domain=True, ),
-            app2a = dict( default_controller = 'c2a', default_function = 'f2a', controllers = ['c2a'], ),
-            app2b = dict( default_controller = 'c2b', default_function = 'f2b', controllers = ['c2b'], ),
-            app3 =  dict( controllers = ['c3a', 'c3b'], ),
-            app4 =  dict( default_controller = 'c4', controllers = ['c4']),
-            app5 =  dict( default_controller = 'c5', controllers = ['c5'], domain = 'localhost' ),
-            app6 =  dict( default_controller = 'c6',  default_function = 'f6',  controllers = ['c6'], ),
-            app6s =  dict( default_controller = 'c6s',  default_function = 'f6s',  controllers = ['c6s'], ),
+            app1=dict(default_controller='c1', default_function='f1',
+                      controllers=['c1'], exclusive_domain=True, ),
+            app2a=dict(default_controller='c2a',
+                       default_function='f2a', controllers=['c2a'], ),
+            app2b=dict(default_controller='c2b',
+                       default_function='f2b', controllers=['c2b'], ),
+            app3=dict(controllers=['c3a', 'c3b'], ),
+            app4=dict(default_controller='c4', controllers=['c4']),
+            app5=dict(default_controller='c5',
+                      controllers=['c5'], domain='localhost'),
+            app6=dict(default_controller='c6',
+                      default_function='f6', controllers=['c6'], ),
+            app6s=dict(default_controller='c6s',
+                       default_function='f6s', controllers=['c6s'], ),
         )
 
         load(rdict=routers)
         self.assertEqual(filter_url('http://domain1.com/abc'), '/app1/c1/abc')
-        self.assertEqual(filter_url('http://domain1.com/c1/abc'), '/app1/c1/abc')
-        self.assertEqual(filter_url('http://domain1.com/abc.html'), '/app1/c1/abc')
-        self.assertEqual(filter_url('http://domain1.com/abc.css'), '/app1/c1/abc.css')
-        self.assertEqual(filter_url('http://domain1.com/index/abc'), "/app1/c1/index ['abc']")
-        self.assertEqual(filter_url('http://domain2.com/app1'), "/app2a/c2a/app1")
+        self.assertEqual(
+            filter_url('http://domain1.com/c1/abc'), '/app1/c1/abc')
+        self.assertEqual(
+            filter_url('http://domain1.com/abc.html'), '/app1/c1/abc')
+        self.assertEqual(
+            filter_url('http://domain1.com/abc.css'), '/app1/c1/abc.css')
+        self.assertEqual(filter_url(
+            'http://domain1.com/index/abc'), "/app1/c1/index ['abc']")
+        self.assertEqual(
+            filter_url('http://domain2.com/app1'), "/app2a/c2a/app1")
 
-        self.assertEqual(filter_url('https://domain1.com/app1/ctr/fcn', domain=('app1',None), out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://www.domain1.com/app1/ctr/fcn', domain=('app1',None), out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://domain1.com/app1/ctr/fcn',
+                         domain=('app1', None), out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://www.domain1.com/app1/ctr/fcn',
+                         domain=('app1', None), out=True), "/ctr/fcn")
 
-        self.assertEqual(filter_url('http://domain2.com/abc'), '/app2a/c2a/abc')
-        self.assertEqual(filter_url('http://domain2.com:8080/abc'), '/app2b/c2b/abc')
+        self.assertEqual(
+            filter_url('http://domain2.com/abc'), '/app2a/c2a/abc')
+        self.assertEqual(
+            filter_url('http://domain2.com:8080/abc'), '/app2b/c2b/abc')
 
-        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/fcn', domain=('app2a',None), out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/f2a', domain=('app2a',None), out=True), "/ctr")
-        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/f2a', domain=('app2a',None), out=True), "/")
-        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/fcn', domain=('app2a',None), out=True), "/fcn")
-        
-        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app2a/ctr/fcn', domain=('app2b',None), out=True)
-        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app2a/ctr/f2a', domain=('app2b',None), out=True)
-        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app2a/c2a/f2a', domain=('app2b',None), out=True)
+        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/fcn',
+                         domain=('app2a', None), out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('http://domain2.com/app2a/ctr/f2a',
+                         domain=('app2a', None), out=True), "/ctr")
+        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/f2a',
+                         domain=('app2a', None), out=True), "/")
+        self.assertEqual(filter_url('http://domain2.com/app2a/c2a/fcn',
+                         domain=('app2a', None), out=True), "/fcn")
+
+        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app2a/ctr/fcn', domain=('app2b', None), out=True)
+        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app2a/ctr/f2a', domain=('app2b', None), out=True)
+        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app2a/c2a/f2a', domain=('app2b', None), out=True)
 
         self.assertEqual(filter_url('http://domain3a.com/'), '/app3/c3a/index')
-        self.assertEqual(filter_url('http://domain3a.com/abc'), '/app3/c3a/abc')
-        self.assertEqual(filter_url('http://domain3a.com/c3b'), '/app3/c3b/index')
-        self.assertEqual(filter_url('http://domain3b.com/abc'), '/app3/c3b/abc')
+        self.assertEqual(
+            filter_url('http://domain3a.com/abc'), '/app3/c3a/abc')
+        self.assertEqual(
+            filter_url('http://domain3a.com/c3b'), '/app3/c3b/index')
+        self.assertEqual(
+            filter_url('http://domain3b.com/abc'), '/app3/c3b/abc')
 
-        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn', domain=('app3','c3a'), out=True), "/fcn")
-        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn', domain=('app3','c3b'), out=True), "/c3a/fcn")
-        
-        self.assertRaises(SyntaxError, filter_url, 'http://domain3a.com/app3/c3a/fcn', domain=('app1',None), out=True)
+        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn',
+                         domain=('app3', 'c3a'), out=True), "/fcn")
+        self.assertEqual(filter_url('http://domain3a.com/app3/c3a/fcn',
+                         domain=('app3', 'c3b'), out=True), "/c3a/fcn")
+
+        self.assertRaises(SyntaxError, filter_url, 'http://domain3a.com/app3/c3a/fcn', domain=('app1', None), out=True)
 
         self.assertEqual(filter_url('http://domain4a.com/abc'), '/app4/c4/abc')
-        self.assertEqual(filter_url('https://domain4a.com/app4/c4/fcn', domain=('app4',None), out=True), "/fcn")
+        self.assertEqual(filter_url('https://domain4a.com/app4/c4/fcn',
+                         domain=('app4', None), out=True), "/fcn")
 
         self.assertEqual(filter_url('http://domain4a.com'), '/app4/c4/f4a')
         self.assertEqual(filter_url('http://domain4b.com'), '/app4/c4/f4b')
 
         self.assertEqual(filter_url('http://localhost/abc'), '/app5/c5/abc')
-        self.assertEqual(filter_url('http:///abc'), '/app5/c5/abc') # test null host => localhost
-        self.assertEqual(filter_url('https://localhost/app5/c5/fcn', domain=('app5',None), out=True), "/fcn")
+        self.assertEqual(filter_url(
+            'http:///abc'), '/app5/c5/abc')  # test null host => localhost
+        self.assertEqual(filter_url('https://localhost/app5/c5/fcn',
+                         domain=('app5', None), out=True), "/fcn")
 
         self.assertEqual(filter_url('http://domain6.com'), '/app6/c6/f6')
         self.assertEqual(filter_url('https://domain6.com'), '/app6s/c6s/f6s')
 
-        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app3/c3a/f3', domain=('app2b',None), out=True)
-        self.assertRaises(SyntaxError, filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b',None), out=True)
+        self.assertRaises(SyntaxError, filter_url, 'http://domain2.com/app3/c3a/f3', domain=('app2b', None), out=True)
+        self.assertRaises(SyntaxError, filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b', None), out=True)
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(SyntaxError, 'cross-domain conflict', filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b',None), out=True)
+            self.assertRaisesRegexp(SyntaxError, 'cross-domain conflict', filter_url, 'http://domain1.com/app1/c1/f1', domain=('app2b', None), out=True)
         except AttributeError:
             pass
-        self.assertEqual(filter_url('http://domain1.com/app1/c1/f1', domain=('app2b',None), host='domain2.com', out=True), "/app1")
+        self.assertEqual(filter_url('http://domain1.com/app1/c1/f1', domain=(
+            'app2b', None), host='domain2.com', out=True), "/app1")
 
     def test_router_raise(self):
         '''
@@ -578,37 +761,49 @@ class TestRouter(unittest.TestCase):
         '''
         # test non-exception variants
         router_raise = dict(
-            init = dict(
-                controllers = [],
+            init=dict(
+                controllers=[],
             ),
-            welcome = dict(
-                map_hyphen = False,
+            welcome=dict(
+                map_hyphen=False,
             ),
         )
         load(rdict=router_raise)
-        self.assertEqual(filter_url('http://domain.com/ctl'),  "/init/ctl/index")
-        self.assertEqual(filter_url('http://domain.com/default/fcn'),  "/init/default/fcn")
-        self.assertEqual(filter_url('http://domain.com/default/fcn.ext'),  "/init/default/fcn.ext")
-        self.assertEqual(filter_url('http://domain.com/default/fcn/arg'),  "/init/default/fcn ['arg']")
+        self.assertEqual(
+            filter_url('http://domain.com/ctl'), "/init/ctl/index")
+        self.assertEqual(
+            filter_url('http://domain.com/default/fcn'), "/init/default/fcn")
+        self.assertEqual(filter_url(
+            'http://domain.com/default/fcn.ext'), "/init/default/fcn.ext")
+        self.assertEqual(filter_url('http://domain.com/default/fcn/arg'),
+                         "/init/default/fcn ['arg']")
         # now raise-HTTP variants
         self.assertRaises(HTTP, filter_url, 'http://domain.com/bad!ctl')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/bad!fcn')
-        self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/fcn.bad!ext')
-        self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/fcn/bad!arg')
+        self.assertRaises(
+            HTTP, filter_url, 'http://domain.com/ctl/fcn.bad!ext')
+        self.assertRaises(
+            HTTP, filter_url, 'http://domain.com/ctl/fcn/bad!arg')
         try:
             # 2.7+ only
             self.assertRaisesRegexp(HTTP, '400.*invalid controller', filter_url, 'http://domain.com/init/bad!ctl')
-            self.assertRaisesRegexp(HTTP, '400.*invalid function', filter_url, 'http://domain.com/init/ctlr/bad!fcn')
-            self.assertRaisesRegexp(HTTP, '400.*invalid extension', filter_url, 'http://domain.com/init/ctlr/fcn.bad!ext')
-            self.assertRaisesRegexp(HTTP, '400.*invalid arg', filter_url, 'http://domain.com/appc/init/fcn/bad!arg')
+            self.assertRaisesRegexp(HTTP, '400.*invalid function', filter_url,
+                                    'http://domain.com/init/ctlr/bad!fcn')
+            self.assertRaisesRegexp(HTTP, '400.*invalid extension', filter_url,
+                                    'http://domain.com/init/ctlr/fcn.bad!ext')
+            self.assertRaisesRegexp(HTTP, '400.*invalid arg', filter_url,
+                                    'http://domain.com/appc/init/fcn/bad!arg')
         except AttributeError:
             pass
 
-        self.assertEqual(filter_url('http://domain.com/welcome/default/fcn_1'),  "/welcome/default/fcn_1")
-        self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/default/fcn-1')
+        self.assertEqual(filter_url('http://domain.com/welcome/default/fcn_1'),
+                         "/welcome/default/fcn_1")
+        self.assertRaises(
+            HTTP, filter_url, 'http://domain.com/welcome/default/fcn-1')
         try:
             # 2.7+ only
-            self.assertRaisesRegexp(HTTP, '400.*invalid function', filter_url, 'http://domain.com/welcome/default/fcn-1')
+            self.assertRaisesRegexp(HTTP, '400.*invalid function', filter_url,
+                                    'http://domain.com/welcome/default/fcn-1')
         except AttributeError:
             pass
 
@@ -617,245 +812,344 @@ class TestRouter(unittest.TestCase):
         Test basic outgoing routing
         '''
         router_out = dict(
-            BASE = dict(),
-            init = dict( controllers = ['default', 'ctr'], ),
-            app = dict(),
+            BASE=dict(),
+            init=dict(controllers=['default', 'ctr'], ),
+            app=dict(),
         )
         load(rdict=router_out)
-        self.assertEqual(filter_url('https://domain.com/app/ctr/fcn', out=True), "/app/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/init/ctr/fcn', out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/init/ctr/fcn', out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/init/static/file', out=True), "/init/static/file")
-        self.assertEqual(filter_url('https://domain.com/init/static/index', out=True), "/init/static/index")
-        self.assertEqual(filter_url('https://domain.com/init/default/index', out=True), "/")
-        self.assertEqual(filter_url('https://domain.com/init/ctr/index', out=True), "/ctr")
-        self.assertEqual(filter_url('http://domain.com/init/default/fcn?query', out=True), "/fcn?query")
+        self.assertEqual(filter_url(
+            'https://domain.com/app/ctr/fcn', out=True), "/app/ctr/fcn")
+        self.assertEqual(filter_url(
+            'https://domain.com/init/ctr/fcn', out=True), "/ctr/fcn")
+        self.assertEqual(filter_url(
+            'https://domain.com/init/ctr/fcn', out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/init/static/file',
+                         out=True), "/init/static/file")
+        self.assertEqual(filter_url('https://domain.com/init/static/index',
+                         out=True), "/init/static/index")
+        self.assertEqual(filter_url(
+            'https://domain.com/init/default/index', out=True), "/")
+        self.assertEqual(
+            filter_url('https://domain.com/init/ctr/index', out=True), "/ctr")
+        self.assertEqual(filter_url('http://domain.com/init/default/fcn?query',
+                         out=True), "/fcn?query")
         self.assertEqual(filter_url('http://domain.com/init/default/fcn#anchor', out=True), "/fcn#anchor")
-        self.assertEqual(filter_url('http://domain.com/init/default/fcn?query#anchor', out=True),
+        self.assertEqual(
+            filter_url(
+                'http://domain.com/init/default/fcn?query#anchor', out=True),
             "/fcn?query#anchor")
 
         router_out['BASE']['map_static'] = True
         load(rdict=router_out)
-        self.assertEqual(filter_url('https://domain.com/init/static/file', out=True), "/static/file")
-        self.assertEqual(filter_url('https://domain.com/init/static/index', out=True), "/static/index")
+        self.assertEqual(filter_url(
+            'https://domain.com/init/static/file', out=True), "/static/file")
+        self.assertEqual(filter_url('https://domain.com/init/static/index',
+                         out=True), "/static/index")
 
         router_out['init']['map_static'] = None
         load(rdict=router_out)
-        self.assertEqual(filter_url('https://domain.com/init/static/file', out=True), "/init/static/file")
-        self.assertEqual(filter_url('https://domain.com/init/static/index', out=True), "/init/static/index")
+        self.assertEqual(filter_url('https://domain.com/init/static/file',
+                         out=True), "/init/static/file")
+        self.assertEqual(filter_url('https://domain.com/init/static/index',
+                         out=True), "/init/static/index")
 
     def test_router_functions(self):
         '''
         Test function-omission with functions=[something]
         '''
         router_functions = dict(
-            BASE = dict(
-                applications = ['init', 'app', 'app2'],
-                default_application = 'app',
+            BASE=dict(
+                applications=['init', 'app', 'app2'],
+                default_application='app',
             ),
-            init = dict(
-                controllers = ['default'],
+            init=dict(
+                controllers=['default'],
             ),
-            app = dict(
-                controllers = ['default', 'ctr'],
-                functions = dict(
+            app=dict(
+                controllers=['default', 'ctr'],
+                functions=dict(
                     default=['index', 'user', 'help'],
                     ctr=['ctrf1', 'ctrf2', 'ctrf3'],
                 ),
-                default_function = dict(
+                default_function=dict(
                     default='index',
                     ctr='ctrf1',
                 ),
             ),
-            app2 = dict(
-                controllers = ['default', 'ctr'],
-                functions = ['index', 'user', 'help'],
+            app2=dict(
+                controllers=['default', 'ctr'],
+                functions=['index', 'user', 'help'],
             ),
         )
         load(rdict=router_functions)
 
         # outbound
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=['arg1'])), "/init/f/arg1")
-        self.assertEqual(str(URL(a='init', c='default', f='index', args=['arg1'])), "/init/index/arg1")
+        self.assertEqual(str(
+            URL(a='init', c='default', f='f', args=['arg1'])), "/init/f/arg1")
+        self.assertEqual(str(URL(a='init', c='default', f='index',
+                         args=['arg1'])), "/init/index/arg1")
 
-        self.assertEqual(str(URL(a='app', c='default', f='index', args=['arg1'])), "/arg1")
-        self.assertEqual(str(URL(a='app', c='default', f='user', args=['arg1'])), "/user/arg1")
-        self.assertEqual(str(URL(a='app', c='default', f='user', args=['index'])), "/user/index")
-        self.assertEqual(str(URL(a='app', c='default', f='index', args=['index'])), "/index/index")
-        self.assertEqual(str(URL(a='app', c='default', f='index', args=['init'])), "/index/init")
-        self.assertEqual(str(URL(a='app', c='default', f='index', args=['ctr'])), "/index/ctr")
-        self.assertEqual(str(URL(a='app', c='ctr', f='index', args=['arg'])), "/ctr/index/arg")
-        self.assertEqual(str(URL(a='app', c='ctr', f='ctrf1', args=['arg'])), "/ctr/arg")
-        self.assertEqual(str(URL(a='app', c='ctr', f='ctrf1', args=['ctrf2'])), "/ctr/ctrf1/ctrf2")
+        self.assertEqual(
+            str(URL(a='app', c='default', f='index', args=['arg1'])), "/arg1")
+        self.assertEqual(str(
+            URL(a='app', c='default', f='user', args=['arg1'])), "/user/arg1")
+        self.assertEqual(str(URL(
+            a='app', c='default', f='user', args=['index'])), "/user/index")
+        self.assertEqual(str(URL(
+            a='app', c='default', f='index', args=['index'])), "/index/index")
+        self.assertEqual(str(URL(
+            a='app', c='default', f='index', args=['init'])), "/index/init")
+        self.assertEqual(str(
+            URL(a='app', c='default', f='index', args=['ctr'])), "/index/ctr")
+        self.assertEqual(str(
+            URL(a='app', c='ctr', f='index', args=['arg'])), "/ctr/index/arg")
+        self.assertEqual(
+            str(URL(a='app', c='ctr', f='ctrf1', args=['arg'])), "/ctr/arg")
+        self.assertEqual(str(URL(
+            a='app', c='ctr', f='ctrf1', args=['ctrf2'])), "/ctr/ctrf1/ctrf2")
 
-        self.assertEqual(str(URL(a='app2', c='default', f='index', args=['arg1'])), "/app2/arg1")
-        self.assertEqual(str(URL(a='app2', c='default', f='user', args=['arg1'])), "/app2/user/arg1")
-        self.assertEqual(str(URL(a='app2', c='default', f='user', args=['index'])), "/app2/user/index")
-        self.assertEqual(str(URL(a='app2', c='default', f='index', args=['index'])), "/app2/index/index")
-        self.assertEqual(str(URL(a='app2', c='default', f='index', args=['init'])), "/app2/index/init")
-        self.assertEqual(str(URL(a='app2', c='default', f='index', args=['ctr'])), "/app2/index/ctr")
+        self.assertEqual(str(URL(
+            a='app2', c='default', f='index', args=['arg1'])), "/app2/arg1")
+        self.assertEqual(str(URL(a='app2', c='default', f='user',
+                         args=['arg1'])), "/app2/user/arg1")
+        self.assertEqual(str(URL(a='app2', c='default', f='user',
+                         args=['index'])), "/app2/user/index")
+        self.assertEqual(str(URL(a='app2', c='default', f='index',
+                         args=['index'])), "/app2/index/index")
+        self.assertEqual(str(URL(a='app2', c='default', f='index',
+                         args=['init'])), "/app2/index/init")
+        self.assertEqual(str(URL(a='app2', c='default', f='index',
+                         args=['ctr'])), "/app2/index/ctr")
 
         # inbound
-        self.assertEqual(filter_url('http://d.com/arg'), "/app/default/index ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/arg'), "/app/default/index ['arg']")
         self.assertEqual(filter_url('http://d.com/user'), "/app/default/user")
-        self.assertEqual(filter_url('http://d.com/user/arg'), "/app/default/user ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/user/arg'), "/app/default/user ['arg']")
         self.assertEqual(filter_url('http://d.com/ctr'), "/app/ctr/ctrf1")
-        self.assertEqual(filter_url('http://d.com/ctr/arg'), "/app/ctr/ctrf1 ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/ctr/arg'), "/app/ctr/ctrf1 ['arg']")
 
-        self.assertEqual(filter_url('http://d.com/app2/arg'), "/app2/default/index ['arg']")
-        self.assertEqual(filter_url('http://d.com/app2/user'), "/app2/default/user")
-        self.assertEqual(filter_url('http://d.com/app2/user/arg'), "/app2/default/user ['arg']")
-        self.assertEqual(filter_url('http://d.com/app2/ctr'), "/app2/ctr/index")
-        self.assertEqual(filter_url('http://d.com/app2/ctr/index/arg'), "/app2/ctr/index ['arg']")
-        self.assertEqual(filter_url('http://d.com/app2/ctr/arg'), "/app2/ctr/arg")
+        self.assertEqual(filter_url(
+            'http://d.com/app2/arg'), "/app2/default/index ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/app2/user'), "/app2/default/user")
+        self.assertEqual(filter_url(
+            'http://d.com/app2/user/arg'), "/app2/default/user ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/app2/ctr'), "/app2/ctr/index")
+        self.assertEqual(filter_url(
+            'http://d.com/app2/ctr/index/arg'), "/app2/ctr/index ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/app2/ctr/arg'), "/app2/ctr/arg")
 
     def test_router_functions2(self):
         '''
         Test more functions=[something]
         '''
         router_functions = dict(
-           BASE = dict(
-               default_application = 'init',
-                   applications = 'INIT',
-           ),
-           init = dict(
-               #default_controller = 'default',
-                   controllers = ['default', 'ctr'],
-               #default_function = 'index',
-                   functions = ['index','user','register','basicRegister',
-                       'download','call','data','error']
-           ),
+            BASE=dict(
+                default_application='init',
+                applications='INIT',
+            ),
+            init=dict(
+                #default_controller = 'default',
+                controllers=['default', 'ctr'],
+                #default_function = 'index',
+                functions=['index', 'user', 'register', 'basicRegister',
+                           'download', 'call', 'data', 'error']
+            ),
         )
 
         load(rdict=router_functions)
 
         # outbound
-        self.assertEqual(str(URL(a='init', c='default', f='index', args=['arg1'])), "/arg1")
-        self.assertEqual(str(URL(a='init', c='default', f='user', args=['arg1'])), "/user/arg1")
-        self.assertEqual(str(URL(a='init', c='default', f='user', args=['index'])), "/user/index")
-        self.assertEqual(str(URL(a='init', c='default', f='index', args=['index'])), "/index/index")
-        self.assertEqual(str(URL(a='init', c='default', f='index', args=['init'])), "/init")
-        self.assertEqual(str(URL(a='init', c='default', f='index', args=['ctr'])), "/index/ctr")
-        self.assertEqual(str(URL(a='init', c='ctr', f='index', args=['arg'])), "/ctr/index/arg")
-        self.assertEqual(str(URL(a='init', c='ctr', f='ctrf1', args=['arg'])), "/ctr/ctrf1/arg")
-        self.assertEqual(str(URL(a='init', c='ctr', f='ctrf1', args=['ctrf2'])), "/ctr/ctrf1/ctrf2")
-        self.assertEqual(str(URL(a='init', c='default', f='register')), "/register")
+        self.assertEqual(str(
+            URL(a='init', c='default', f='index', args=['arg1'])), "/arg1")
+        self.assertEqual(str(URL(
+            a='init', c='default', f='user', args=['arg1'])), "/user/arg1")
+        self.assertEqual(str(URL(
+            a='init', c='default', f='user', args=['index'])), "/user/index")
+        self.assertEqual(str(URL(a='init', c='default', f='index',
+                         args=['index'])), "/index/index")
+        self.assertEqual(str(
+            URL(a='init', c='default', f='index', args=['init'])), "/init")
+        self.assertEqual(str(URL(
+            a='init', c='default', f='index', args=['ctr'])), "/index/ctr")
+        self.assertEqual(str(URL(
+            a='init', c='ctr', f='index', args=['arg'])), "/ctr/index/arg")
+        self.assertEqual(str(URL(
+            a='init', c='ctr', f='ctrf1', args=['arg'])), "/ctr/ctrf1/arg")
+        self.assertEqual(str(URL(a='init', c='ctr', f='ctrf1',
+                         args=['ctrf2'])), "/ctr/ctrf1/ctrf2")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='register')), "/register")
 
         # inbound
-        self.assertEqual(filter_url('http://d.com/arg'), "/init/default/index ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/arg'), "/init/default/index ['arg']")
         self.assertEqual(filter_url('http://d.com/user'), "/init/default/user")
-        self.assertEqual(filter_url('http://d.com/user/arg'), "/init/default/user ['arg']")
+        self.assertEqual(
+            filter_url('http://d.com/user/arg'), "/init/default/user ['arg']")
         self.assertEqual(filter_url('http://d.com/ctr'), "/init/ctr/index")
-        self.assertEqual(filter_url('http://d.com/ctr/ctrf1/arg'), "/init/ctr/ctrf1 ['arg']")
+        self.assertEqual(filter_url(
+            'http://d.com/ctr/ctrf1/arg'), "/init/ctr/ctrf1 ['arg']")
 
     def test_router_hyphen(self):
         '''
         Test hyphen conversion
         '''
         router_hyphen = dict(
-            BASE = dict(
-                applications = ['init', 'app1', 'app2'],
+            BASE=dict(
+                applications=['init', 'app1', 'app2'],
             ),
-            init = dict(
-                controllers = ['default'],
+            init=dict(
+                controllers=['default'],
             ),
-            app1 = dict(
-                controllers = ['default'],
-                map_hyphen = True,
+            app1=dict(
+                controllers=['default'],
+                map_hyphen=True,
             ),
-            app2 = dict(
-                controllers = ['default'],
-                map_hyphen = False,
+            app2=dict(
+                controllers=['default'],
+                map_hyphen=False,
             ),
         )
         load(rdict=router_hyphen)
-        self.assertEqual(filter_url('http://domain.com/init/default/fcn_1', out=True), "/fcn_1")
-        self.assertEqual(filter_url('http://domain.com/static/filename-with_underscore'),
+        self.assertEqual(filter_url(
+            'http://domain.com/init/default/fcn_1', out=True), "/fcn_1")
+        self.assertEqual(
+            filter_url('http://domain.com/static/filename-with_underscore'),
             "%s/applications/init/static/filename-with_underscore" % root)
-        self.assertEqual(filter_url('http://domain.com/init/static/filename-with_underscore', out=True),
+        self.assertEqual(
+            filter_url('http://domain.com/init/static/filename-with_underscore', out=True),
             "/init/static/filename-with_underscore")
 
         self.assertEqual(filter_url('http://domain.com/app2/fcn_1'),
-            "/app2/default/fcn_1")
-        self.assertEqual(filter_url('http://domain.com/app2/ctr/fcn_1', domain=('app2',None), out=True),
+                         "/app2/default/fcn_1")
+        self.assertEqual(
+            filter_url('http://domain.com/app2/ctr/fcn_1',
+                       domain=('app2', None), out=True),
             "/ctr/fcn_1")
-        self.assertEqual(filter_url('http://domain.com/app2/static/filename-with_underscore', domain=('app2',None), out=True),
+        self.assertEqual(
+            filter_url('http://domain.com/app2/static/filename-with_underscore', domain=('app2', None), out=True),
             "/app2/static/filename-with_underscore")
-        self.assertEqual(filter_url('http://domain.com/app2/static/filename-with_underscore'),
+        self.assertEqual(
+            filter_url(
+                'http://domain.com/app2/static/filename-with_underscore'),
             "%s/applications/app2/static/filename-with_underscore" % root)
 
         self.assertEqual(str(URL(a='init', c='default', f='a_b')), "/a_b")
         self.assertEqual(str(URL(a='app1', c='default', f='a_b')), "/app1/a-b")
         self.assertEqual(str(URL(a='app2', c='default', f='a_b')), "/app2/a_b")
-        self.assertEqual(str(URL(a='app1', c='static', f='a/b_c')), "/app1/static/a/b_c")
-        self.assertEqual(str(URL(a='app1', c='static/a', f='b_c')), "/app1/static/a/b_c")
-        self.assertEqual(str(URL(a='app2', c='static', f='a/b_c')), "/app2/static/a/b_c")
-        self.assertEqual(str(URL(a='app2', c='static/a', f='b_c')), "/app2/static/a/b_c")
-
+        self.assertEqual(
+            str(URL(a='app1', c='static', f='a/b_c')), "/app1/static/a/b_c")
+        self.assertEqual(
+            str(URL(a='app1', c='static/a', f='b_c')), "/app1/static/a/b_c")
+        self.assertEqual(
+            str(URL(a='app2', c='static', f='a/b_c')), "/app2/static/a/b_c")
+        self.assertEqual(
+            str(URL(a='app2', c='static/a', f='b_c')), "/app2/static/a/b_c")
 
     def test_router_lang(self):
         '''
         Test language specifications
         '''
         router_lang = dict(
-            BASE = dict(default_application = 'admin'),
-            welcome = dict(),
-            admin = dict(
-                controllers = ['default', 'ctr'],
-                languages = ['en', 'it', 'it-it'], default_language = 'en',
+            BASE=dict(default_application='admin'),
+            welcome=dict(),
+            admin=dict(
+                controllers=['default', 'ctr'],
+                languages=['en', 'it', 'it-it'], default_language='en',
             ),
-            examples = dict(
-                languages = ['en', 'it', 'it-it'], default_language = 'en',
+            examples=dict(
+                languages=['en', 'it', 'it-it'], default_language='en',
             ),
         )
         load(rdict=router_lang)
-        self.assertEqual(filter_url('http://domain.com/index/abc'), "/admin/default/index ['abc'] (en)")
-        self.assertEqual(filter_url('http://domain.com/en/abc/def'), "/admin/default/abc ['def'] (en)")
-        self.assertEqual(filter_url('http://domain.com/it/abc/def'), "/admin/default/abc ['def'] (it)")
-        self.assertEqual(filter_url('http://domain.com/it-it/abc/def'), "/admin/default/abc ['def'] (it-it)")
-        self.assertEqual(filter_url('http://domain.com/index/a%20bc'), "/admin/default/index ['a bc'] (en)")
-        self.assertEqual(filter_url('http://domain.com/static/file'), "%s/applications/admin/static/file" % root)
-        self.assertEqual(filter_url('http://domain.com/en/static/file'), "%s/applications/admin/static/file" % root)
+        self.assertEqual(filter_url('http://domain.com/index/abc'),
+                         "/admin/default/index ['abc'] (en)")
+        self.assertEqual(filter_url('http://domain.com/en/abc/def'),
+                         "/admin/default/abc ['def'] (en)")
+        self.assertEqual(filter_url('http://domain.com/it/abc/def'),
+                         "/admin/default/abc ['def'] (it)")
+        self.assertEqual(filter_url('http://domain.com/it-it/abc/def'),
+                         "/admin/default/abc ['def'] (it-it)")
+        self.assertEqual(filter_url('http://domain.com/index/a%20bc'),
+                         "/admin/default/index ['a bc'] (en)")
+        self.assertEqual(filter_url('http://domain.com/static/file'),
+                         "%s/applications/admin/static/file" % root)
+        self.assertEqual(filter_url('http://domain.com/en/static/file'),
+                         "%s/applications/admin/static/file" % root)
         self.assertEqual(filter_url('http://domain.com/examples/en/static/file'), "%s/applications/examples/static/en/file" % root)
-        self.assertEqual(filter_url('http://domain.com/examples/static/file'), "%s/applications/examples/static/en/file" % root)
+        self.assertEqual(filter_url('http://domain.com/examples/static/file'),
+                         "%s/applications/examples/static/en/file" % root)
         self.assertEqual(filter_url('http://domain.com/examples/it/static/file'), "%s/applications/examples/static/it/file" % root)
         self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'), "%s/applications/examples/static/file" % root)
 
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='en', out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='it', out=True), "/it/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='it-it', out=True), "/it-it/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='en', out=True), "/admin/en/static/file")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='it', out=True), "/admin/it/static/file")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='it-it', out=True), "/admin/it-it/static/file")
-        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn', lang='it', out=True), "/welcome/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn', lang='es', out=True), "/welcome/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='en', out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='it', out=True), "/it/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='it-it', out=True), "/it-it/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='en', out=True), "/admin/en/static/file")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='it', out=True), "/admin/it/static/file")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='it-it', out=True), "/admin/it-it/static/file")
+        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn',
+                         lang='it', out=True), "/welcome/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn',
+                         lang='es', out=True), "/welcome/ctr/fcn")
 
         router_lang['admin']['map_static'] = True
         load(rdict=router_lang)
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='en', out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='it', out=True), "/it/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='it-it', out=True), "/it-it/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='en', out=True), "/static/file")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='it', out=True), "/it/static/file")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='it-it', out=True), "/it-it/static/file")
-        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn', lang='it', out=True), "/welcome/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn', lang='es', out=True), "/welcome/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='en', out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='it', out=True), "/it/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='it-it', out=True), "/it-it/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='en', out=True), "/static/file")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='it', out=True), "/it/static/file")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='it-it', out=True), "/it-it/static/file")
+        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn',
+                         lang='it', out=True), "/welcome/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn',
+                         lang='es', out=True), "/welcome/ctr/fcn")
 
         router_lang['admin']['map_static'] = False
         router_lang['examples']['map_static'] = False
         load(rdict=router_lang)
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='en', out=True), "/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='it', out=True), "/it/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn', lang='it-it', out=True), "/it-it/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='en', out=True), "/admin/static/en/file")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='it', out=True), "/admin/static/it/file")
-        self.assertEqual(filter_url('https://domain.com/admin/static/file', lang='it-it', out=True), "/admin/static/it-it/file")
-        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn', lang='it', out=True), "/welcome/ctr/fcn")
-        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn', lang='es', out=True), "/welcome/ctr/fcn")
-        self.assertEqual(filter_url('http://domain.com/static/file'), "%s/applications/admin/static/file" % root)
-        self.assertEqual(filter_url('http://domain.com/en/static/file'), "%s/applications/admin/static/file" % root)
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='en', out=True), "/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='it', out=True), "/it/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
+                         lang='it-it', out=True), "/it-it/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='en', out=True), "/admin/static/en/file")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='it', out=True), "/admin/static/it/file")
+        self.assertEqual(filter_url('https://domain.com/admin/static/file',
+                         lang='it-it', out=True), "/admin/static/it-it/file")
+        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn',
+                         lang='it', out=True), "/welcome/ctr/fcn")
+        self.assertEqual(filter_url('https://domain.com/welcome/ctr/fcn',
+                         lang='es', out=True), "/welcome/ctr/fcn")
+        self.assertEqual(filter_url('http://domain.com/static/file'),
+                         "%s/applications/admin/static/file" % root)
+        self.assertEqual(filter_url('http://domain.com/en/static/file'),
+                         "%s/applications/admin/static/file" % root)
         self.assertEqual(filter_url('http://domain.com/examples/en/static/file'), "%s/applications/examples/static/en/file" % root)
-        self.assertEqual(filter_url('http://domain.com/examples/static/file'), "%s/applications/examples/static/en/file" % root)
+        self.assertEqual(filter_url('http://domain.com/examples/static/file'),
+                         "%s/applications/examples/static/en/file" % root)
         self.assertEqual(filter_url('http://domain.com/examples/it/static/file'), "%s/applications/examples/static/it/file" % root)
         self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'), "%s/applications/examples/static/file" % root)
 
@@ -868,40 +1162,46 @@ class TestRouter(unittest.TestCase):
         Test get_effective_router
         '''
         router_get_effective = dict(
-            BASE = dict(
-                default_application = 'a1',
-                applications = ['a1', 'a2'],
+            BASE=dict(
+                default_application='a1',
+                applications=['a1', 'a2'],
             ),
-            a1 = dict(
-                controllers = ['c1a', 'c1b', 'default'],
+            a1=dict(
+                controllers=['c1a', 'c1b', 'default'],
             ),
-            a2 = dict(
-                default_controller = 'c2',
-                controllers = [],
+            a2=dict(
+                default_controller='c2',
+                controllers=[],
             ),
-            a3 = dict(
-                default_controller = 'c2',
-                controllers = ['c1'],
+            a3=dict(
+                default_controller='c2',
+                controllers=['c1'],
             ),
-            a4 = dict(
-                default_function = 'f1',
-                functions = ['f2'],
+            a4=dict(
+                default_function='f1',
+                functions=['f2'],
             ),
         )
         load(rdict=router_get_effective)
-        self.assertEqual(get_effective_router('BASE').applications, set(['a1','a2']))
-        self.assertEqual(get_effective_router('BASE').default_application, 'a1')
+        self.assertEqual(
+            get_effective_router('BASE').applications, set(['a1', 'a2']))
+        self.assertEqual(
+            get_effective_router('BASE').default_application, 'a1')
         self.assertEqual(get_effective_router('BASE').domains, {})
         self.assertEqual(get_effective_router('a1').applications, None)
         self.assertEqual(get_effective_router('a1').default_application, None)
         self.assertEqual(get_effective_router('a1').domains, None)
-        self.assertEqual(get_effective_router('a1').default_controller, "default")
+        self.assertEqual(
+            get_effective_router('a1').default_controller, "default")
         self.assertEqual(get_effective_router('a2').default_application, None)
         self.assertEqual(get_effective_router('a2').default_controller, "c2")
-        self.assertEqual(get_effective_router('a1').controllers, set(['c1a', 'c1b', 'default', 'static']))
+        self.assertEqual(get_effective_router(
+            'a1').controllers, set(['c1a', 'c1b', 'default', 'static']))
         self.assertEqual(get_effective_router('a2').controllers, set())
-        self.assertEqual(get_effective_router('a3').controllers, set(['c1', 'c2', 'static']))
-        self.assertEqual(get_effective_router('a4').functions, dict(default=set(['f1', 'f2'])))
+        self.assertEqual(get_effective_router(
+            'a3').controllers, set(['c1', 'c2', 'static']))
+        self.assertEqual(get_effective_router(
+            'a4').functions, dict(default=set(['f1', 'f2'])))
         self.assertEqual(get_effective_router('xx'), None)
 
     def test_router_error(self):
@@ -932,16 +1232,16 @@ class TestRouter(unittest.TestCase):
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/#static')
 
         router_static = dict(
-            BASE = dict(
-                file_match = r'([-+=@$%#\w]+[./]?)+$',   # legal static path
+            BASE=dict(
+                file_match=r'([-+=@$%#\w]+[./]?)+$',   # legal static path
             ),
         )
         load(rdict=router_static)
         self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static'), "%s/applications/welcome/static/path/to/#static" % root)
 
         router_static = dict(
-            BASE = dict(
-                file_match = r'[-+=@$%#.\w]+$',   # legal static path element
+            BASE=dict(
+                file_match=r'[-+=@$%#.\w]+$',   # legal static path element
             ),
         )
         load(rdict=router_static)
@@ -963,57 +1263,81 @@ class TestRouter(unittest.TestCase):
         '''
         load(rdict=dict())
         self.assertEqual(filter_url('http://domain.com/init/default/f/arg1'),
-            "/init/default/f ['arg1']")
+                         "/init/default/f ['arg1']")
         self.assertEqual(filter_url('http://domain.com/init/default/f/arg1/'),
-            "/init/default/f ['arg1']")
+                         "/init/default/f ['arg1']")
         self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//'),
-            "/init/default/f ['arg1', '']")
+                         "/init/default/f ['arg1', '']")
         self.assertEqual(filter_url('http://domain.com/init/default/f//arg1'),
-            "/init/default/f ['', 'arg1']")
-        self.assertEqual(filter_url('http://domain.com/init/default/f/arg1/arg2'),
+                         "/init/default/f ['', 'arg1']")
+        self.assertEqual(
+            filter_url('http://domain.com/init/default/f/arg1/arg2'),
             "/init/default/f ['arg1', 'arg2']")
-        self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//arg2'),
+        self.assertEqual(
+            filter_url('http://domain.com/init/default/f/arg1//arg2'),
             "/init/default/f ['arg1', '', 'arg2']")
-        self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//arg3/'),
+        self.assertEqual(
+            filter_url('http://domain.com/init/default/f/arg1//arg3/'),
             "/init/default/f ['arg1', '', 'arg3']")
-        self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//arg3//'),
+        self.assertEqual(
+            filter_url('http://domain.com/init/default/f/arg1//arg3//'),
             "/init/default/f ['arg1', '', 'arg3', '']")
 
-        self.assertEqual(filter_url('http://domain.com/init/default/f', out=True), "/f")
-        self.assertEqual(map_url_out(None, None, 'init', 'default', 'f', None, None, None, None, None), "/f")
-        self.assertEqual(map_url_out(None, None, 'init', 'default', 'f', [], None, None, None, None), "/f")
-        self.assertEqual(map_url_out(None, None, 'init', 'default', 'f', ['arg1'], None, None, None, None), "/f")
-        self.assertEqual(map_url_out(None, None, 'init', 'default', 'f', ['arg1', ''], None, None, None, None), "/f")
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=None)), "/f")
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=['arg1'])), "/f/arg1")
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=['arg1', ''])), "/f/arg1//")
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=['arg1', '', 'arg3'])), "/f/arg1//arg3")
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=['ar g'])), "/f/ar%20g")
-        self.assertEqual(str(URL(a='init', c='default', f='f', args=['årg'])), "/f/%C3%A5rg")
-        self.assertEqual(str(URL(a='init', c='default', f='fünc')), "/f\xc3\xbcnc")
+        self.assertEqual(
+            filter_url('http://domain.com/init/default/f', out=True), "/f")
+        self.assertEqual(map_url_out(None, None, 'init', 'default',
+                         'f', None, None, None, None, None), "/f")
+        self.assertEqual(map_url_out(None, None, 'init', 'default',
+                         'f', [], None, None, None, None), "/f")
+        self.assertEqual(map_url_out(None, None, 'init', 'default',
+                         'f', ['arg1'], None, None, None, None), "/f")
+        self.assertEqual(map_url_out(None, None, 'init', 'default',
+                         'f', ['arg1', ''], None, None, None, None), "/f")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='f', args=None)), "/f")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='f', args=['arg1'])), "/f/arg1")
+        self.assertEqual(str(URL(
+            a='init', c='default', f='f', args=['arg1', ''])), "/f/arg1//")
+        self.assertEqual(str(URL(a='init', c='default', f='f',
+                         args=['arg1', '', 'arg3'])), "/f/arg1//arg3")
+        self.assertEqual(str(
+            URL(a='init', c='default', f='f', args=['ar g'])), "/f/ar%20g")
+        self.assertEqual(str(
+            URL(a='init', c='default', f='f', args=['årg'])), "/f/%C3%A5rg")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='fünc')), "/f\xc3\xbcnc")
 
     def test_routes_anchor(self):
         '''
         Test URL with anchor
         '''
-        self.assertEqual(str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
         load(rdict=dict())
-        self.assertEqual(str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
         args = ['a1', 'a2']
-        self.assertEqual(str(URL(a='a', c='c', f='f', args=args, anchor='anchor')),
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', args=args, anchor='anchor')),
             "/a/c/f/a1/a2#anchor")
         vars = dict(v1=1, v2=2)
-        self.assertEqual(str(URL(a='a', c='c', f='f', vars=vars, anchor='anchor')),
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', vars=vars, anchor='anchor')),
             "/a/c/f?v1=1&v2=2#anchor")
-        self.assertEqual(str(URL(a='a', c='c', f='f', args=args, vars=vars, anchor='anchor')),
+        self.assertEqual(
+            str(URL(
+                a='a', c='c', f='f', args=args, vars=vars, anchor='anchor')),
             "/a/c/f/a1/a2?v1=1&v2=2#anchor")
         self.assertEqual(str(URL(a='init', c='default', f='index')),
-            "/")
+                         "/")
         self.assertEqual(str(URL(a='init', c='default', f='f')),
-            "/f")
-        self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
+                         "/f")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='index', anchor='anchor')),
             "/#anchor")
-        self.assertEqual(str(URL(a='init', c='default', f='f', anchor='anchor')),
+        self.assertEqual(
+            str(URL(a='init', c='default', f='f', anchor='anchor')),
             "/f#anchor")
 
     def test_router_prefix(self):
@@ -1021,29 +1345,32 @@ class TestRouter(unittest.TestCase):
         Test path_prefix
         '''
         router_path_prefix = dict(
-            BASE = dict(
-                default_application = 'a1',
-                applications = ['a1', 'a2'],
-                path_prefix = '/path/to/apps',
+            BASE=dict(
+                default_application='a1',
+                applications=['a1', 'a2'],
+                path_prefix='/path/to/apps',
             ),
-            a1 = dict(
-                controllers = ['c1a', 'c1b', 'default'],
+            a1=dict(
+                controllers=['c1a', 'c1b', 'default'],
             ),
-            a2 = dict(
-                default_controller = 'c2',
-                controllers = [],
+            a2=dict(
+                default_controller='c2',
+                controllers=[],
             ),
         )
         load(rdict=router_path_prefix)
         self.assertEqual(str(URL(a='a1', c='c1a', f='f')),
-            "/path/to/apps/c1a/f")
+                         "/path/to/apps/c1a/f")
         self.assertEqual(str(URL(a='a2', c='c', f='f')),
-            "/path/to/apps/a2/c/f")
+                         "/path/to/apps/a2/c/f")
         self.assertEqual(str(URL(a='a2', c='c2', f='f')),
-            "/path/to/apps/a2/c2/f")
-        self.assertEqual(filter_url('http://domain.com/a1/'), "/a1/default/index")
-        self.assertEqual(filter_url('http://domain.com/path/to/apps/a1/'), "/a1/default/index")
-        self.assertEqual(filter_url('http://domain.com/path/to/a1/'), "/a1/default/path ['to', 'a1']")
+                         "/path/to/apps/a2/c2/f")
+        self.assertEqual(
+            filter_url('http://domain.com/a1/'), "/a1/default/index")
+        self.assertEqual(filter_url(
+            'http://domain.com/path/to/apps/a1/'), "/a1/default/index")
+        self.assertEqual(filter_url(
+            'http://domain.com/path/to/a1/'), "/a1/default/path ['to', 'a1']")
 
     def test_router_absolute(self):
         '''
@@ -1053,37 +1380,46 @@ class TestRouter(unittest.TestCase):
         r = Storage()
         r.env = Storage()
         r.env.http_host = 'domain.com'
-        r.env.wsgi_url_scheme = 'httpx' # distinguish incoming scheme
+        r.env.wsgi_url_scheme = 'httpx'  # distinguish incoming scheme
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f')), "/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host=True)),
-            "httpx://domain.com/a/c/f")
+                         "httpx://domain.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host='host.com')),
-            "httpx://host.com/a/c/f")
+                         "httpx://host.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True)),
-            "httpx://domain.com/a/c/f")
+                         "httpx://domain.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False)),
-            "/a/c/f")
+                         "/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='https')),
-            "https://domain.com/a/c/f")
+                         "https://domain.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='wss')),
-            "wss://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, host=True)),
+                         "wss://domain.com/a/c/f")
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=True, host=True)),
             "httpx://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='https', host=True)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme='https', host=True)),
             "https://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False, host=True)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=False, host=True)),
             "httpx://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, host='host.com')),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=True, host='host.com')),
             "httpx://host.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False, host='host.com')),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=False, host='host.com')),
             "httpx://host.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', port=1234)),
+                         "httpx://domain.com:1234/a/c/f")
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=True, port=1234)),
             "httpx://domain.com:1234/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, port=1234)),
-            "httpx://domain.com:1234/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host='host.com', port=1234)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', host='host.com', port=1234)),
             "httpx://host.com:1234/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='wss', host='host.com', port=1234)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme='wss',
+                host='host.com', port=1234)),
             "wss://host.com:1234/a/c/f")
 
     def test_request_uri(self):
@@ -1092,15 +1428,20 @@ class TestRouter(unittest.TestCase):
         '''
         load(rdict=dict())
 
-        self.assertEqual(filter_url('http://domain.com/abc', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/abc', env=True).request_uri,
             '/init/default/abc')
-        self.assertEqual(filter_url('http://domain.com/abc?def', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/abc?def', env=True).request_uri,
             '/init/default/abc?def')
-        self.assertEqual(filter_url('http://domain.com/index/abc', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/index/abc', env=True).request_uri,
             "/init/default/index/abc")
-        self.assertEqual(filter_url('http://domain.com/abc/def', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/abc/def', env=True).request_uri,
             "/init/default/abc/def")
-        self.assertEqual(filter_url('http://domain.com/index/a%20bc', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/index/a%20bc', env=True).request_uri,
             "/init/default/index/a%20bc")
 
     def test_request_collide(self):
@@ -1108,12 +1449,12 @@ class TestRouter(unittest.TestCase):
         Test controller-app name collision: admin vs welcome/admin
         '''
         router_collide = dict(
-            BASE  = dict(
-                domains = {
-                    'ex.domain.com' : 'examples',
-                    'ad.domain.com' : 'admin',
-                    'welcome.com' : 'welcome',
-                    'www.welcome.com' : 'welcome',
+            BASE=dict(
+                domains={
+                    'ex.domain.com': 'examples',
+                    'ad.domain.com': 'admin',
+                    'welcome.com': 'welcome',
+                    'www.welcome.com': 'welcome',
                 },
                 exclusive_domain=True,
             ),
@@ -1121,33 +1462,47 @@ class TestRouter(unittest.TestCase):
         load(rdict=router_collide)
 
         # basic inbound
-        self.assertEqual(filter_url('http://ex.domain.com'), '/examples/default/exdef')
-        self.assertEqual(filter_url('http://ad.domain.com'), '/admin/default/index')
-        self.assertEqual(filter_url('http://welcome.com'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://www.welcome.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://ex.domain.com'), '/examples/default/exdef')
+        self.assertEqual(
+            filter_url('http://ad.domain.com'), '/admin/default/index')
+        self.assertEqual(
+            filter_url('http://welcome.com'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://www.welcome.com'), '/welcome/default/index')
         # basic outbound
         self.assertEqual(filter_url('http://ex.domain.com/examples/default/exdef', domain='examples', out=True), "/")
-        self.assertEqual(filter_url('http://ad.domain.com/admin/default/index', domain='admin', out=True), "/")
-        self.assertEqual(filter_url('http://welcome.com/welcome/default/index', domain='welcome', out=True), "/")
+        self.assertEqual(filter_url('http://ad.domain.com/admin/default/index',
+                         domain='admin', out=True), "/")
+        self.assertEqual(filter_url('http://welcome.com/welcome/default/index',
+                         domain='welcome', out=True), "/")
         self.assertEqual(filter_url('http://www.welcome.com/welcome/default/index', domain='welcome', out=True), "/")
 
         # inbound
-        self.assertEqual(filter_url('http://welcome.com/admin'), '/welcome/admin/index')
-        self.assertEqual(filter_url('http://welcome.com/f1'), '/welcome/default/f1')
-        self.assertEqual(filter_url('http://ad.domain.com/shell'), '/admin/shell/index')
-        self.assertEqual(filter_url('http://ad.domain.com/f1'), '/admin/default/f1')
+        self.assertEqual(
+            filter_url('http://welcome.com/admin'), '/welcome/admin/index')
+        self.assertEqual(
+            filter_url('http://welcome.com/f1'), '/welcome/default/f1')
+        self.assertEqual(
+            filter_url('http://ad.domain.com/shell'), '/admin/shell/index')
+        self.assertEqual(
+            filter_url('http://ad.domain.com/f1'), '/admin/default/f1')
         # outbound
-        self.assertEqual(filter_url('http://welcome.com/welcome/other/index', domain='welcome', out=True), "/other")
-        self.assertEqual(filter_url('http://welcome.com/welcome/admin/index', domain='welcome', out=True), "/admin")
-        self.assertEqual(filter_url('http://ad.domain.com/admin/shell/index', domain='admin', out=True), "/shell")
-        self.assertEqual(filter_url('http://ad.domain.com/admin/default/f1', domain='admin', out=True), "/f1")
+        self.assertEqual(filter_url('http://welcome.com/welcome/other/index',
+                         domain='welcome', out=True), "/other")
+        self.assertEqual(filter_url('http://welcome.com/welcome/admin/index',
+                         domain='welcome', out=True), "/admin")
+        self.assertEqual(filter_url('http://ad.domain.com/admin/shell/index',
+                         domain='admin', out=True), "/shell")
+        self.assertEqual(filter_url('http://ad.domain.com/admin/default/f1',
+                         domain='admin', out=True), "/f1")
         router_collide['BASE']['exclusive_domain'] = False
         load(rdict=router_collide)
-        self.assertEqual(filter_url('http://welcome.com/welcome/admin/index', domain='welcome', out=True), "/welcome/admin")
+        self.assertEqual(filter_url('http://welcome.com/welcome/admin/index',
+                         domain='welcome', out=True), "/welcome/admin")
 
 
 if __name__ == '__main__':
     setUpModule()       # pre-2.7
     unittest.main()
     tearDownModule()
-
diff --git a/gluon/tests/test_routes.py b/gluon/tests/test_routes.py
index 6bca6fda..675371ab 100644
--- a/gluon/tests/test_routes.py
+++ b/gluon/tests/test_routes.py
@@ -10,9 +10,9 @@ import tempfile
 import logging
 
 if os.path.isdir('gluon'):
-    sys.path.append(os.path.realpath('gluon')) # running from web2py base
+    sys.path.append(os.path.realpath('gluon'))  # running from web2py base
 else:
-    sys.path.append(os.path.realpath('../')) # running from gluon/tests/
+    sys.path.append(os.path.realpath('../'))  # running from gluon/tests/
     os.environ['web2py_path'] = os.path.realpath('../../')  # for settings
 
 from rewrite import load, filter_url, filter_err, get_effective_router, regex_filter_out, regex_select
@@ -26,6 +26,7 @@ logger = None
 oldcwd = None
 root = None
 
+
 def setUpModule():
     def make_apptree():
         "build a temporary applications tree"
@@ -39,13 +40,16 @@ def setUpModule():
                 os.mkdir(abspath('applications', app, subdir))
         #  applications/admin/controllers/*.py
         for ctr in ('appadmin', 'default', 'gae', 'mercurial', 'shell', 'wizard'):
-            open(abspath('applications', 'admin', 'controllers', '%s.py' % ctr), 'w').close()
+            open(abspath('applications', 'admin',
+                 'controllers', '%s.py' % ctr), 'w').close()
         #  applications/examples/controllers/*.py
         for ctr in ('ajax_examples', 'appadmin', 'default', 'global', 'spreadsheet'):
-            open(abspath('applications', 'examples', 'controllers', '%s.py' % ctr), 'w').close()
+            open(abspath('applications', 'examples',
+                 'controllers', '%s.py' % ctr), 'w').close()
         #  applications/welcome/controllers/*.py
         for ctr in ('appadmin', 'default'):
-            open(abspath('applications', 'welcome', 'controllers', '%s.py' % ctr), 'w').close()
+            open(abspath('applications', 'welcome',
+                 'controllers', '%s.py' % ctr), 'w').close()
         #  create an app-specific routes.py for examples app
         routes = open(abspath('applications', 'examples', 'routes.py'), 'w')
         routes.write("default_function='exdef'\n")
@@ -55,7 +59,8 @@ def setUpModule():
     if oldcwd is None:  # do this only once
         oldcwd = os.getcwd()
         if not os.path.isdir('gluon'):
-            os.chdir(os.path.realpath('../../'))    # run from web2py base directory
+            os.chdir(os.path.realpath(
+                '../../'))    # run from web2py base directory
         import main   # for initialization after chdir
         global logger
         logger = logging.getLogger('web2py.rewrite')
@@ -64,6 +69,7 @@ def setUpModule():
         root = global_settings.applications_parent
         make_apptree()
 
+
 def tearDownModule():
     global oldcwd
     if oldcwd is not None:
@@ -78,16 +84,26 @@ class TestRoutes(unittest.TestCase):
         """ Tests a null routes table """
         load(data='')
         # incoming
-        self.assertEqual(filter_url('http://domain.com'), '/init/default/index')
-        self.assertEqual(filter_url('http://domain.com/'), '/init/default/index')
-        self.assertEqual(filter_url('http://domain.com/abc'), '/abc/default/index')
-        self.assertEqual(filter_url('http://domain.com/abc/'), '/abc/default/index')
-        self.assertEqual(filter_url('http://domain.com/abc/def'), "/abc/def/index")
-        self.assertEqual(filter_url('http://domain.com/abc/def/'), "/abc/def/index")
-        self.assertEqual(filter_url('http://domain.com/abc/def/ghi'), "/abc/def/ghi")
-        self.assertEqual(filter_url('http://domain.com/abc/def/ghi/'), "/abc/def/ghi")
-        self.assertEqual(filter_url('http://domain.com/abc/def/ghi/jkl'), "/abc/def/ghi ['jkl']")
-        self.assertEqual(filter_url('http://domain.com/abc/def/ghi/j%20kl'), "/abc/def/ghi ['j_kl']")
+        self.assertEqual(
+            filter_url('http://domain.com'), '/init/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/'), '/init/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/abc'), '/abc/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/abc/'), '/abc/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/abc/def'), "/abc/def/index")
+        self.assertEqual(
+            filter_url('http://domain.com/abc/def/'), "/abc/def/index")
+        self.assertEqual(
+            filter_url('http://domain.com/abc/def/ghi'), "/abc/def/ghi")
+        self.assertEqual(
+            filter_url('http://domain.com/abc/def/ghi/'), "/abc/def/ghi")
+        self.assertEqual(filter_url(
+            'http://domain.com/abc/def/ghi/jkl'), "/abc/def/ghi ['jkl']")
+        self.assertEqual(filter_url(
+            'http://domain.com/abc/def/ghi/j%20kl'), "/abc/def/ghi ['j_kl']")
         self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static'), "%s/applications/welcome/static/path/to/static" % root)
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
         try:
@@ -96,9 +112,11 @@ class TestRoutes(unittest.TestCase):
         except AttributeError:
             pass
         # outgoing
-        self.assertEqual(filter_url('http://domain.com/init/default/index', out=True), '/init/default/index')
+        self.assertEqual(filter_url('http://domain.com/init/default/index',
+                         out=True), '/init/default/index')
         self.assertEqual(filter_url('http://domain.com/init/default/index/arg1', out=True), '/init/default/index/arg1')
-        self.assertEqual(filter_url('http://domain.com/init/default/abc', out=True), '/init/default/abc')
+        self.assertEqual(filter_url('http://domain.com/init/default/abc',
+                         out=True), '/init/default/abc')
 
     def test_routes_query(self):
         """ Test query appending """
@@ -125,8 +143,10 @@ routes_app = [
 ]
 '''
         load(data=data)
-        self.assertEqual(filter_url('http://domain.com/welcome'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/examples'), '/examples/default/exdef')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome'), '/welcome/default/index')
+        self.assertEqual(filter_url(
+            'http://domain.com/examples'), '/examples/default/exdef')
 
     def test_routes_defapp(self):
         """ Test the default-application function """
@@ -135,12 +155,17 @@ default_application = 'defapp'
 '''
         load(data=data)
         # incoming
-        self.assertEqual(filter_url('http://domain.com'), '/defapp/default/index')
-        self.assertEqual(filter_url('http://domain.com/'), '/defapp/default/index')
-        self.assertEqual(filter_url('http://domain.com/welcome'), '/welcome/default/index')
-        self.assertEqual(filter_url('http://domain.com/app'), '/app/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com'), '/defapp/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/'), '/defapp/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/welcome'), '/welcome/default/index')
+        self.assertEqual(
+            filter_url('http://domain.com/app'), '/app/default/index')
         self.assertEqual(filter_url('http://domain.com/welcome/default/index/abc'), "/welcome/default/index ['abc']")
-        self.assertEqual(filter_url('http://domain.com/welcome/static/abc'), '%s/applications/welcome/static/abc' % root)
+        self.assertEqual(filter_url('http://domain.com/welcome/static/abc'),
+                         '%s/applications/welcome/static/abc' % root)
         self.assertEqual(filter_url('http://domain.com/defapp/static/path/to/static'), "%s/applications/defapp/static/path/to/static" % root)
 
     def test_routes_raise(self):
@@ -149,15 +174,21 @@ default_application = 'defapp'
         '''
         # test non-exception variants
         load(data='')
-        self.assertEqual(filter_url('http://domain.com/init'),  "/init/default/index")
-        self.assertEqual(filter_url('http://domain.com/init/default'),  "/init/default/index")
-        self.assertEqual(filter_url('http://domain.com/init/default/fcn.ext'),  "/init/default/fcn.ext")
-        self.assertEqual(filter_url('http://domain.com/init/default/fcn/arg'),  "/init/default/fcn ['arg']")
+        self.assertEqual(
+            filter_url('http://domain.com/init'), "/init/default/index")
+        self.assertEqual(filter_url(
+            'http://domain.com/init/default'), "/init/default/index")
+        self.assertEqual(filter_url('http://domain.com/init/default/fcn.ext'),
+                         "/init/default/fcn.ext")
+        self.assertEqual(filter_url('http://domain.com/init/default/fcn/arg'),
+                         "/init/default/fcn ['arg']")
         # now raise-HTTP variants
         self.assertRaises(HTTP, filter_url, 'http://domain.com/bad!ctl')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/bad!fcn')
-        self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/fcn.bad!ext')
-        self.assertRaises(HTTP, filter_url, 'http://domain.com/ctl/fcn/bad!arg')
+        self.assertRaises(
+            HTTP, filter_url, 'http://domain.com/ctl/fcn.bad!ext')
+        self.assertRaises(
+            HTTP, filter_url, 'http://domain.com/ctl/fcn/bad!arg')
         try:
             # 2.7+ only
             self.assertRaisesRegexp(HTTP, '400 BAD REQUEST \[invalid path\]', filter_url, 'http://domain.com/init/bad!ctl')
@@ -167,7 +198,8 @@ default_application = 'defapp'
         except AttributeError:
             pass
 
-        self.assertEqual(filter_url('http://domain.com/welcome/default/fcn_1'),  "/welcome/default/fcn_1")
+        self.assertEqual(filter_url('http://domain.com/welcome/default/fcn_1'),
+                         "/welcome/default/fcn_1")
         #self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/default/fcn-1')
         #try:
         #    # 2.7+ only
@@ -194,17 +226,26 @@ default_application = 'defapp'
     ('/favicon.ico', '/welcome/static/favicon.ico'),
     ('/admin$anything', '/admin$anything'),
     ('.*:https?://(.*\\.)?domain1.com:$method /', '/app1/default'),
-    ('.*:https?://(.*\\.)?domain1.com:$method /static/$anything', '/app1/static/$anything'),
-    ('.*:https?://(.*\\.)?domain1.com:$method /appadmin/$anything', '/app1/appadmin/$anything'),
-    ('.*:https?://(.*\\.)?domain1.com:$method /$anything', '/app1/default/$anything'),
+    ('.*:https?://(.*\\.)?domain1.com:$method /static/$anything',
+     '/app1/static/$anything'),
+    ('.*:https?://(.*\\.)?domain1.com:$method /appadmin/$anything',
+     '/app1/appadmin/$anything'),
+    ('.*:https?://(.*\\.)?domain1.com:$method /$anything',
+     '/app1/default/$anything'),
     ('.*:https?://(.*\\.)?domain2.com:$method /', '/app2/default'),
-    ('.*:https?://(.*\\.)?domain2.com:$method /static/$anything', '/app2/static/$anything'),
-    ('.*:https?://(.*\\.)?domain2.com:$method /appadmin/$anything', '/app2/appadmin/$anything'),
-    ('.*:https?://(.*\\.)?domain2.com:$method /$anything', '/app2/default/$anything'),
+    ('.*:https?://(.*\\.)?domain2.com:$method /static/$anything',
+     '/app2/static/$anything'),
+    ('.*:https?://(.*\\.)?domain2.com:$method /appadmin/$anything',
+     '/app2/appadmin/$anything'),
+    ('.*:https?://(.*\\.)?domain2.com:$method /$anything',
+     '/app2/default/$anything'),
     ('.*:https?://(.*\\.)?domain3.com:$method /', '/app3/defcon3'),
-    ('.*:https?://(.*\\.)?domain3.com:$method /static/$anything', '/app3/static/$anything'),
-    ('.*:https?://(.*\\.)?domain3.com:$method /appadmin/$anything', '/app3/appadmin/$anything'),
-    ('.*:https?://(.*\\.)?domain3.com:$method /$anything', '/app3/defcon3/$anything'),
+    ('.*:https?://(.*\\.)?domain3.com:$method /static/$anything',
+     '/app3/static/$anything'),
+    ('.*:https?://(.*\\.)?domain3.com:$method /appadmin/$anything',
+     '/app3/appadmin/$anything'),
+    ('.*:https?://(.*\\.)?domain3.com:$method /$anything',
+     '/app3/defcon3/$anything'),
     ('/', '/welcome/default'),
     ('/welcome/default/$anything', '/welcome/default/$anything'),
     ('/welcome/$anything', '/welcome/default/$anything'),
@@ -228,47 +269,69 @@ routes_out = [
     ]
 '''
         load(data=data)
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1'),
             "/welcome/default/f ['arg1']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1/'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1/'),
             "/welcome/default/f ['arg1']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1//'),
             "/welcome/default/f ['arg1', '']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f//arg1'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f//arg1'),
             "/welcome/default/f ['', 'arg1']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1/arg2'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1/arg2'),
             "/welcome/default/f ['arg1', 'arg2']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg2'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1//arg2'),
             "/welcome/default/f ['arg1', '', 'arg2']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg3/'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1//arg3/'),
             "/welcome/default/f ['arg1', '', 'arg3']")
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg3//'),
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f/arg1//arg3//'),
             "/welcome/default/f ['arg1', '', 'arg3', '']")
 
-        self.assertEqual(filter_url('http://domain.com/welcome/default/f', out=True), "/f")
+        self.assertEqual(
+            filter_url('http://domain.com/welcome/default/f', out=True), "/f")
         self.assertEqual(regex_filter_out('/welcome/default/f'), "/f")
-        self.assertEqual(str(URL(a='welcome', c='default', f='f', args=None)), "/f")
-        self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['arg1'])), "/f/arg1")
-        self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['arg1', ''])), "/f/arg1//")
-        self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['arg1', '', 'arg3'])), "/f/arg1//arg3")
-        self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['ar g'])), "/f/ar%20g")
-        self.assertEqual(str(URL(a='welcome', c='default', f='f', args=['årg'])), "/f/%C3%A5rg")
-        self.assertEqual(str(URL(a='welcome', c='default', f='fünc')), "/f\xc3\xbcnc")
+        self.assertEqual(
+            str(URL(a='welcome', c='default', f='f', args=None)), "/f")
+        self.assertEqual(str(
+            URL(a='welcome', c='default', f='f', args=['arg1'])), "/f/arg1")
+        self.assertEqual(str(URL(
+            a='welcome', c='default', f='f', args=['arg1', ''])), "/f/arg1//")
+        self.assertEqual(str(URL(a='welcome', c='default', f='f',
+                         args=['arg1', '', 'arg3'])), "/f/arg1//arg3")
+        self.assertEqual(str(
+            URL(a='welcome', c='default', f='f', args=['ar g'])), "/f/ar%20g")
+        self.assertEqual(str(URL(
+            a='welcome', c='default', f='f', args=['årg'])), "/f/%C3%A5rg")
+        self.assertEqual(
+            str(URL(a='welcome', c='default', f='fünc')), "/f\xc3\xbcnc")
 
     def test_routes_anchor(self):
         '''
         Test URL with anchor
         '''
-        self.assertEqual(str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
         load(data='')
-        self.assertEqual(str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', anchor='anchor')), "/a/c/f#anchor")
         args = ['a1', 'a2']
-        self.assertEqual(str(URL(a='a', c='c', f='f', args=args, anchor='anchor')),
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', args=args, anchor='anchor')),
             "/a/c/f/a1/a2#anchor")
         vars = dict(v1=1, v2=2)
-        self.assertEqual(str(URL(a='a', c='c', f='f', vars=vars, anchor='anchor')),
+        self.assertEqual(
+            str(URL(a='a', c='c', f='f', vars=vars, anchor='anchor')),
             "/a/c/f?v1=1&v2=2#anchor")
-        self.assertEqual(str(URL(a='a', c='c', f='f', args=args, vars=vars, anchor='anchor')),
+        self.assertEqual(
+            str(URL(
+                a='a', c='c', f='f', args=args, vars=vars, anchor='anchor')),
             "/a/c/f/a1/a2?v1=1&v2=2#anchor")
 
         data = r'''routes_out = [
@@ -276,8 +339,9 @@ routes_out = [
         ]'''
         load(data=data)
         self.assertEqual(str(URL(a='init', c='default', f='index')),
-            "/")
-        self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
+                         "/")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='index', anchor='anchor')),
             "/init/default/index#anchor")
 
         data = r'''routes_out = [
@@ -285,8 +349,9 @@ routes_out = [
         ]'''
         load(data=data)
         self.assertEqual(str(URL(a='init', c='default', f='index')),
-            "/")
-        self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
+                         "/")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='index', anchor='anchor')),
             "/#anchor")
 
         data = r'''routes_out = [
@@ -294,13 +359,17 @@ routes_out = [
         ]'''
         load(data=data)
         self.assertEqual(str(URL(a='init', c='default', f='index')),
-            "/")
-        self.assertEqual(str(URL(a='init', c='default', f='index', anchor='anchor')),
+                         "/")
+        self.assertEqual(
+            str(URL(a='init', c='default', f='index', anchor='anchor')),
             "/#anchor")
         query = dict(var='abc')
-        self.assertEqual(str(URL(a='init', c='default', f='index', vars=query)),
+        self.assertEqual(
+            str(URL(a='init', c='default', f='index', vars=query)),
             "/?var=abc")
-        self.assertEqual(str(URL(a='init', c='default', f='index', vars=query, anchor='anchor')),
+        self.assertEqual(
+            str(URL(a='init', c='default', f='index',
+                vars=query, anchor='anchor')),
             "/?var=abc#anchor")
 
     def test_routes_absolute(self):
@@ -311,37 +380,46 @@ routes_out = [
         r = Storage()
         r.env = Storage()
         r.env.http_host = 'domain.com'
-        r.env.wsgi_url_scheme = 'httpx' # distinguish incoming scheme
+        r.env.wsgi_url_scheme = 'httpx'  # distinguish incoming scheme
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f')), "/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host=True)),
-            "httpx://domain.com/a/c/f")
+                         "httpx://domain.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host='host.com')),
-            "httpx://host.com/a/c/f")
+                         "httpx://host.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True)),
-            "httpx://domain.com/a/c/f")
+                         "httpx://domain.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False)),
-            "/a/c/f")
+                         "/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='https')),
-            "https://domain.com/a/c/f")
+                         "https://domain.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='wss')),
-            "wss://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, host=True)),
+                         "wss://domain.com/a/c/f")
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=True, host=True)),
             "httpx://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='https', host=True)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme='https', host=True)),
             "https://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False, host=True)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=False, host=True)),
             "httpx://domain.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, host='host.com')),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=True, host='host.com')),
             "httpx://host.com/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=False, host='host.com')),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=False, host='host.com')),
             "httpx://host.com/a/c/f")
         self.assertEqual(str(URL(r=r, a='a', c='c', f='f', port=1234)),
+                         "httpx://domain.com:1234/a/c/f")
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme=True, port=1234)),
             "httpx://domain.com:1234/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme=True, port=1234)),
-            "httpx://domain.com:1234/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', host='host.com', port=1234)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', host='host.com', port=1234)),
             "httpx://host.com:1234/a/c/f")
-        self.assertEqual(str(URL(r=r, a='a', c='c', f='f', scheme='wss', host='host.com', port=1234)),
+        self.assertEqual(
+            str(URL(r=r, a='a', c='c', f='f', scheme='wss',
+                host='host.com', port=1234)),
             "wss://host.com:1234/a/c/f")
 
     def test_request_uri(self):
@@ -354,13 +432,17 @@ routes_out = [
     ]
 '''
         load(data=data)
-        self.assertEqual(filter_url('http://domain.com/abc', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/abc', env=True).request_uri,
             '/init/default/abc')
-        self.assertEqual(filter_url('http://domain.com/abc?def', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/abc?def', env=True).request_uri,
             '/init/default/abc?def')
-        self.assertEqual(filter_url('http://domain.com/index/abc', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/index/abc', env=True).request_uri,
             "/init/default/index/abc")
-        self.assertEqual(filter_url('http://domain.com/index/a%20bc', env=True).request_uri,
+        self.assertEqual(
+            filter_url('http://domain.com/index/a%20bc', env=True).request_uri,
             "/init/default/index/a bc")
 
 
@@ -368,4 +450,3 @@ if __name__ == '__main__':
     setUpModule()       # pre-2.7
     unittest.main()
     tearDownModule()
-
diff --git a/gluon/tests/test_storage.py b/gluon/tests/test_storage.py
index 6d35860b..828137e0 100644
--- a/gluon/tests/test_storage.py
+++ b/gluon/tests/test_storage.py
@@ -39,7 +39,6 @@ class TestStorage(unittest.TestCase):
         s.d = list()
         self.assertTrue(s.d is s['d'])
 
-
     def test_store_none(self):
         """ Test Storage store-None handling
             s.key = None deletes an item
@@ -59,7 +58,6 @@ class TestStorage(unittest.TestCase):
         self.assertTrue('a' in s)
         self.assertTrue(s.a is None)
 
-
     def test_item(self):
         """ Tests Storage item handling """
 
@@ -76,4 +74,3 @@ class TestStorage(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_template.py b/gluon/tests/test_template.py
index bba6cded..20fadbcd 100644
--- a/gluon/tests/test_template.py
+++ b/gluon/tests/test_template.py
@@ -14,15 +14,17 @@ else:
 import unittest
 from template import render
 
+
 class TestVirtualFields(unittest.TestCase):
 
     def testRun(self):
         self.assertEqual(render(content='{{for i in range(n):}}{{=i}}{{pass}}',
-                      context=dict(n=3)), '012')
+                                context=dict(n=3)), '012')
         self.assertEqual(render(content='{{if n>2:}}ok{{pass}}',
-                      context=dict(n=3)), 'ok')
-        self.assertEqual(render(content='{{try:}}{{n/0}}{{except:}}fail{{pass}}',
-                      context=dict(n=3)), 'fail')
+                                context=dict(n=3)), 'ok')
+        self.assertEqual(
+            render(content='{{try:}}{{n/0}}{{except:}}fail{{pass}}',
+                   context=dict(n=3)), 'fail')
         self.assertEqual(render(content='{{="<&>"}}'), '&lt;&amp;&gt;')
         self.assertEqual(render(content='"abc"'), '"abc"')
         self.assertEqual(render(content='"a\'bc"'), '"a\'bc"')
@@ -38,13 +40,18 @@ class TestVirtualFields(unittest.TestCase):
         self.assertEqual(render(content='{{ ="abc" }}'), 'abc')
         self.assertEqual(render(content='{{pass\n="abc" }}'), 'abc')
         # = recognized only at the beginning of a physical line
-        self.assertEqual(render(content='{{xyz = "xyz"\n="abc"\n="def"\n=xyz }}'), 'abcdefxyz')
+        self.assertEqual(render(
+            content='{{xyz = "xyz"\n="abc"\n="def"\n=xyz }}'), 'abcdefxyz')
         # = in python blocks
         self.assertEqual(render(content='{{if True:\n="abc"\npass }}'), 'abc')
-        self.assertEqual(render(content='{{if True:\n="abc"\npass\n="def" }}'), 'abcdef')
-        self.assertEqual(render(content='{{if False:\n="abc"\npass\n="def" }}'), 'def')
-        self.assertEqual(render(content='{{if True:\n="abc"\nelse:\n="def"\npass }}'), 'abc')
-        self.assertEqual(render(content='{{if False:\n="abc"\nelse:\n="def"\npass }}'), 'def')
+        self.assertEqual(
+            render(content='{{if True:\n="abc"\npass\n="def" }}'), 'abcdef')
+        self.assertEqual(
+            render(content='{{if False:\n="abc"\npass\n="def" }}'), 'def')
+        self.assertEqual(render(
+            content='{{if True:\n="abc"\nelse:\n="def"\npass }}'), 'abc')
+        self.assertEqual(render(
+            content='{{if False:\n="abc"\nelse:\n="def"\npass }}'), 'def')
         # codeblock-leading = handles internal newlines, escaped or not
         self.assertEqual(render(content='{{=list((1,2,3))}}'), '[1, 2, 3]')
         self.assertEqual(render(content='{{=list((1,2,\\\n3))}}'), '[1, 2, 3]')
@@ -52,10 +59,11 @@ class TestVirtualFields(unittest.TestCase):
         # ...but that means no more = operators in the codeblock
         self.assertRaises(SyntaxError, render, content='{{="abc"\n="def" }}')
         # = embedded in codeblock won't handle newlines in its argument
-        self.assertEqual(render(content='{{pass\n=list((1,2,\\\n3))}}'), '[1, 2, 3]')
-        self.assertRaises(SyntaxError, render, content='{{pass\n=list((1,2,\n3))}}')
+        self.assertEqual(
+            render(content='{{pass\n=list((1,2,\\\n3))}}'), '[1, 2, 3]')
+        self.assertRaises(
+            SyntaxError, render, content='{{pass\n=list((1,2,\n3))}}')
 
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_utils.py b/gluon/tests/test_utils.py
index 7c0465dc..97d4d2b2 100644
--- a/gluon/tests/test_utils.py
+++ b/gluon/tests/test_utils.py
@@ -25,4 +25,3 @@ class TestUtils(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tests/test_web.py b/gluon/tests/test_web.py
index 53e965dd..d50087e2 100644
--- a/gluon/tests/test_web.py
+++ b/gluon/tests/test_web.py
@@ -13,6 +13,7 @@ else:
 import unittest
 from contrib.webclient import WebClient
 
+
 class TestWeb(unittest.TestCase):
     def testWebClient(self):
         client = WebClient('http://127.0.0.1:8000/welcome/default/')
@@ -20,13 +21,13 @@ class TestWeb(unittest.TestCase):
         client.get('index')
 
         # register
-        data = dict(first_name = 'Homer',
-                    last_name = 'Simpson',
-                    email = 'homer@web2py.com',
-                    password = 'test',
-                    password_two = 'test',
-                    _formname = 'register')
-        client.post('user/register',data = data)
+        data = dict(first_name='Homer',
+                    last_name='Simpson',
+                    email='homer@web2py.com',
+                    password='test',
+                    password_two='test',
+                    _formname='register')
+        client.post('user/register', data=data)
 
         # logout
         client.get('user/logout')
@@ -34,21 +35,22 @@ class TestWeb(unittest.TestCase):
         # login again
         data = dict(email='homer@web2py.com',
                     password='test',
-                    _formname = 'login')
-        client.post('user/login',data = data)
+                    _formname='login')
+        client.post('user/login', data=data)
 
         # check registration and login were successful
         client.get('index')
         self.assertTrue('Welcome Homer' in client.text)
 
         client = WebClient('http://127.0.0.1:8000/admin/default/')
-        client.post('index',data=dict(password='hello'))
+        client.post('index', data=dict(password='hello'))
         client.get('site')
         client.get('design/welcome')
 
+
 class TestStaticCacheControl(unittest.TestCase):
     def testWebClient(self):
-        s=WebClient('http://127.0.0.1:8000/welcome/')
+        s = WebClient('http://127.0.0.1:8000/welcome/')
         s.get('static/js/web2py.js')
         assert('expires' not in s.headers)
         assert(not s.headers['cache-control'].startswith('max-age'))
@@ -60,4 +62,3 @@ class TestStaticCacheControl(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/gluon/tools.py b/gluon/tools.py
index 75eac67c..a323a3ff 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -53,23 +53,26 @@ logger = logging.getLogger("web2py")
 
 DEFAULT = lambda: None
 
-def getarg(position,default=None):
+
+def getarg(position, default=None):
     args = current.request.args
-    if position<0 and len(args)>=-position:
+    if position < 0 and len(args) >= -position:
         return args[position]
-    elif position>=0 and len(args)>position:
+    elif position >= 0 and len(args) > position:
         return args[position]
     else:
         return default
 
-def callback(actions,form,tablename=None):
+
+def callback(actions, form, tablename=None):
     if actions:
-        if tablename and isinstance(actions,dict):
+        if tablename and isinstance(actions, dict):
             actions = actions.get(tablename, [])
-        if not isinstance(actions,(list, tuple)):
+        if not isinstance(actions, (list, tuple)):
             actions = [actions]
         [action(form) for action in actions]
 
+
 def validators(*a):
     b = []
     for item in a:
@@ -79,12 +82,14 @@ def validators(*a):
             b.append(item)
     return b
 
-def call_or_redirect(f,*args):
+
+def call_or_redirect(f, *args):
     if callable(f):
         redirect(f(*args))
     else:
         redirect(f)
 
+
 def replace_id(url, form):
     if url:
         url = url.replace('[id]', str(form.vars.id))
@@ -92,6 +97,7 @@ def replace_id(url, form):
             return url
     return URL(url)
 
+
 class Mail(object):
     """
     Class for configuring and sending emails with alternative text / html
@@ -154,7 +160,7 @@ class Mail(object):
             filename=None,
             content_id=None,
             content_type=None,
-            encoding='utf-8'):
+                encoding='utf-8'):
             if isinstance(payload, str):
                 if filename is None:
                     filename = os.path.basename(payload)
@@ -268,7 +274,7 @@ class Mail(object):
         encoding='utf-8',
         raw=False,
         headers={}
-        ):
+    ):
         """
         Sends an email using data specified in constructor
 
@@ -341,8 +347,8 @@ class Mail(object):
         """
 
         def encode_header(key):
-            if [c for c in key if 32>ord(c) or ord(c)>127]:
-                return Header.Header(key.encode('utf-8'),'utf-8')
+            if [c for c in key if 32 > ord(c) or ord(c) > 127]:
+                return Header.Header(key.encode('utf-8'), 'utf-8')
             else:
                 return key
 
@@ -370,7 +376,7 @@ class Mail(object):
             # unreadable mail contents.
             payload_in = MIMEText.MIMEText(text)
         if to:
-            if not isinstance(to, (list,tuple)):
+            if not isinstance(to, (list, tuple)):
                 to = [to]
         else:
             raise Exception('Target receiver address not specified')
@@ -385,7 +391,7 @@ class Mail(object):
         elif isinstance(message, (list, tuple)):
             text, html = message
         elif message.strip().startswith('<html') and message.strip().endswith('</html>'):
-            text = self.settings.server=='gae' and message or None
+            text = self.settings.server == 'gae' and message or None
             html = message
         else:
             text = message
@@ -398,13 +404,14 @@ class Mail(object):
                     text = text.decode(encoding).encode('utf-8')
                 else:
                     text = text.read().decode(encoding).encode('utf-8')
-                attachment.attach(MIMEText.MIMEText(text,_charset='utf-8'))
+                attachment.attach(MIMEText.MIMEText(text, _charset='utf-8'))
             if not html is None:
                 if isinstance(html, basestring):
                     html = html.decode(encoding).encode('utf-8')
                 else:
                     html = html.read().decode(encoding).encode('utf-8')
-                attachment.attach(MIMEText.MIMEText(html, 'html',_charset='utf-8'))
+                attachment.attach(
+                    MIMEText.MIMEText(html, 'html', _charset='utf-8'))
             payload_in.attach(attachment)
         if (attachments is None) or raw:
             pass
@@ -414,7 +421,6 @@ class Mail(object):
         else:
             payload_in.attach(attachments)
 
-
         #######################################################
         #                      CIPHER                         #
         #######################################################
@@ -431,7 +437,7 @@ class Mail(object):
                 import os
                 os.environ['GNUPGHOME'] = self.settings.gpg_home
             if not sign and not encrypt:
-                self.error="No sign and no encrypt is set but cipher type to gpg"
+                self.error = "No sign and no encrypt is set but cipher type to gpg"
                 return False
 
             # need a python-pyme package and gpgme lib
@@ -443,7 +449,7 @@ class Mail(object):
             if sign:
                 import string
                 core.check_version(None)
-                pin=string.replace(payload_in.as_string(),'\n','\r\n')
+                pin = string.replace(payload_in.as_string(), '\n', '\r\n')
                 plain = core.Data(pin)
                 sig = core.Data()
                 c = core.Context()
@@ -454,29 +460,30 @@ class Mail(object):
                     if sigkey.can_sign:
                         c.signers_add(sigkey)
                 if not c.signers_enum(0):
-                    self.error='No key for signing [%s]' % self.settings.sender
+                    self.error = 'No key for signing [%s]' % self.settings.sender
                     return False
-                c.set_passphrase_cb(lambda x,y,z: sign_passphrase)
+                c.set_passphrase_cb(lambda x, y, z: sign_passphrase)
                 try:
                     # make a signature
-                    c.op_sign(plain,sig,mode.DETACH)
-                    sig.seek(0,0)
+                    c.op_sign(plain, sig, mode.DETACH)
+                    sig.seek(0, 0)
                     # make it part of the email
-                    payload=MIMEMultipart.MIMEMultipart('signed',
-                                                        boundary=None,
-                                                        _subparts=None,
-                                                        **dict(micalg="pgp-sha1",
-                                                               protocol="application/pgp-signature"))
+                    payload = MIMEMultipart.MIMEMultipart('signed',
+                                                          boundary=None,
+                                                          _subparts=None,
+                                                          **dict(
+                                                          micalg="pgp-sha1",
+                                                          protocol="application/pgp-signature"))
                     # insert the origin payload
                     payload.attach(payload_in)
                     # insert the detached signature
-                    p=MIMEBase.MIMEBase("application",'pgp-signature')
+                    p = MIMEBase.MIMEBase("application", 'pgp-signature')
                     p.set_payload(sig.read())
                     payload.attach(p)
                     # it's just a trick to handle the no encryption case
-                    payload_in=payload
+                    payload_in = payload
                 except errors.GPGMEError, ex:
-                    self.error="GPG error: %s" % ex.getstring()
+                    self.error = "GPG error: %s" % ex.getstring()
                     return False
             ############################################
             #                  encrypt                 #
@@ -488,36 +495,36 @@ class Mail(object):
                 c = core.Context()
                 c.set_armor(1)
                 # collect the public keys for encryption
-                recipients=[]
-                rec=to[:]
+                recipients = []
+                rec = to[:]
                 if cc:
                     rec.extend(cc)
                 if bcc:
                     rec.extend(bcc)
                 for addr in rec:
-                    c.op_keylist_start(addr,0)
+                    c.op_keylist_start(addr, 0)
                     r = c.op_keylist_next()
                     if r is None:
-                        self.error='No key for [%s]' % addr
+                        self.error = 'No key for [%s]' % addr
                         return False
                     recipients.append(r)
                 try:
                     # make the encryption
                     c.op_encrypt(recipients, 1, plain, cipher)
-                    cipher.seek(0,0)
+                    cipher.seek(0, 0)
                     # make it a part of the email
-                    payload=MIMEMultipart.MIMEMultipart('encrypted',
-                                                        boundary=None,
-                                                        _subparts=None,
-                                                        **dict(protocol="application/pgp-encrypted"))
-                    p=MIMEBase.MIMEBase("application",'pgp-encrypted')
+                    payload = MIMEMultipart.MIMEMultipart('encrypted',
+                                                          boundary=None,
+                                                          _subparts=None,
+                                                          **dict(protocol="application/pgp-encrypted"))
+                    p = MIMEBase.MIMEBase("application", 'pgp-encrypted')
                     p.set_payload("Version: 1\r\n")
                     payload.attach(p)
-                    p=MIMEBase.MIMEBase("application",'octet-stream')
+                    p = MIMEBase.MIMEBase("application", 'octet-stream')
                     p.set_payload(cipher.read())
                     payload.attach(p)
                 except errors.GPGMEError, ex:
-                    self.error="GPG error: %s" % ex.getstring()
+                    self.error = "GPG error: %s" % ex.getstring()
                     return False
         #######################################################
         #                       X.509                         #
@@ -543,16 +550,17 @@ class Mail(object):
             except Exception, e:
                 self.error = "Can't load M2Crypto module"
                 return False
-            msg_bio = BIO.MemoryBuffer( payload_in.as_string() )
+            msg_bio = BIO.MemoryBuffer(payload_in.as_string())
             s = SMIME.SMIME()
 
             #                   SIGN
             if sign:
                 #key for signing
                 try:
-                    s.load_key( x509_sign_keyfile, x509_sign_certfile, callback = lambda x: sign_passphrase )
+                    s.load_key(x509_sign_keyfile, x509_sign_certfile,
+                               callback=lambda x: sign_passphrase)
                 except Exception, e:
-                    self.error = "Something went wrong on certificate / private key loading: <%s>" % str( e )
+                    self.error = "Something went wrong on certificate / private key loading: <%s>" % str(e)
                     return False
                 try:
                     if x509_nocerts:
@@ -561,10 +569,12 @@ class Mail(object):
                         flags = 0
                     if not encrypt:
                         flags += SMIME.PKCS7_DETACHED
-                    p7 = s.sign( msg_bio, flags = flags )
-                    msg_bio = BIO.MemoryBuffer( payload_in.as_string() ) # Recreate coz sign() has consumed it.
+                    p7 = s.sign(msg_bio, flags=flags)
+                    msg_bio = BIO.MemoryBuffer(payload_in.as_string(
+                    ))  # Recreate coz sign() has consumed it.
                 except Exception, e:
-                    self.error = "Something went wrong on signing: <%s> %s" % ( str( e ), str( flags ) )
+                    self.error = "Something went wrong on signing: <%s> %s" % (
+                        str(e), str(flags))
                     return False
 
             #                   ENCRYPT
@@ -586,8 +596,8 @@ class Mail(object):
                     else:
                         tmp_bio.write(payload_in.as_string())
                     p7 = s.encrypt(tmp_bio)
-                except Exception,e:
-                    self.error="Something went wrong on encrypting: <%s>" %str(e)
+                except Exception, e:
+                    self.error = "Something went wrong on encrypting: <%s>" % str(e)
                     return False
 
             #                 Final stage in sign and encryption
@@ -601,11 +611,11 @@ class Mail(object):
                     out.write('\r\n')
                     out.write(payload_in.as_string())
             out.close()
-            st=str(out.read())
-            payload=message_from_string(st)
+            st = str(out.read())
+            payload = message_from_string(st)
         else:
             # no cryptography process as usual
-            payload=payload_in
+            payload = payload_in
 
         sender = sender % dict(sender=self.settings.sender)
         payload['From'] = encoded_or_raw(sender.decode(encoding))
@@ -622,15 +632,15 @@ class Mail(object):
         payload['Subject'] = encoded_or_raw(subject.decode(encoding))
         payload['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S +0000",
                                         time.gmtime())
-        for k,v in headers.iteritems():
+        for k, v in headers.iteritems():
             payload[k] = encoded_or_raw(v.decode(encoding))
         result = {}
         try:
             if self.settings.server == 'logging':
-                logger.warn('email not sent\n%s\nFrom: %s\nTo: %s\nSubject: %s\n\n%s\n%s\n' % \
-                                ('-'*40,sender,
-                                 ', '.join(to),subject,
-                                 text or html,'-'*40))
+                logger.warn('email not sent\n%s\nFrom: %s\nTo: %s\nSubject: %s\n\n%s\n%s\n' %
+                            ('-' * 40, sender,
+                             ', '.join(to), subject,
+                             text or html, '-' * 40))
             elif self.settings.server == 'gae':
                 xcc = dict()
                 if cc:
@@ -640,17 +650,20 @@ class Mail(object):
                 if reply_to:
                     xcc['reply_to'] = reply_to
                 from google.appengine.api import mail
-                attachments = attachments and [(a.my_filename,a.my_payload) for a in attachments if not raw]
+                attachments = attachments and [(a.my_filename, a.my_payload) for a in attachments if not raw]
                 if attachments:
-                    result = mail.send_mail(sender=self.settings.sender, to=origTo,
-                                            subject=subject, body=text, html=html,
-                                            attachments=attachments, **xcc)
+                    result = mail.send_mail(
+                        sender=self.settings.sender, to=origTo,
+                        subject=subject, body=text, html=html,
+                        attachments=attachments, **xcc)
                 elif html and (not raw):
-                    result = mail.send_mail(sender=self.settings.sender, to=origTo,
-                                            subject=subject, body=text, html=html, **xcc)
+                    result = mail.send_mail(
+                        sender=self.settings.sender, to=origTo,
+                        subject=subject, body=text, html=html, **xcc)
                 else:
-                    result = mail.send_mail(sender=self.settings.sender, to=origTo,
-                                            subject=subject, body=text, **xcc)
+                    result = mail.send_mail(
+                        sender=self.settings.sender, to=origTo,
+                        subject=subject, body=text, **xcc)
             else:
                 smtp_args = self.settings.server.split(':')
                 if self.settings.ssl:
@@ -662,8 +675,9 @@ class Mail(object):
                     server.starttls()
                     server.ehlo()
                 if self.settings.login:
-                    server.login(*self.settings.login.split(':',1))
-                result = server.sendmail(self.settings.sender, to, payload.as_string())
+                    server.login(*self.settings.login.split(':', 1))
+                result = server.sendmail(
+                    self.settings.sender, to, payload.as_string())
                 server.quit()
         except Exception, e:
             logger.warn('Mail.send failure:%s' % e)
@@ -700,9 +714,9 @@ class Recaptcha(DIV):
         use_ssl=False,
         error=None,
         error_message='invalid',
-        label = 'Verify:',
-        options = ''
-        ):
+        label='Verify:',
+        options=''
+    ):
         self.request_vars = request and request.vars or current.request.vars
         self.remote_addr = request.env.remote_addr
         self.public_key = public_key
@@ -728,8 +742,8 @@ class Recaptcha(DIV):
         private_key = self.private_key
         remoteip = self.remote_addr
         if not (recaptcha_response_field and recaptcha_challenge_field
-                 and len(recaptcha_response_field)
-                 and len(recaptcha_challenge_field)):
+                and len(recaptcha_response_field)
+                and len(recaptcha_challenge_field)):
             self.errors['captcha'] = self.error_message
             return False
         params = urllib.urlencode({
@@ -737,12 +751,12 @@ class Recaptcha(DIV):
             'remoteip': remoteip,
             'challenge': recaptcha_challenge_field,
             'response': recaptcha_response_field,
-            })
+        })
         request = urllib2.Request(
             url=self.VERIFY_SERVER,
             data=params,
             headers={'Content-type': 'application/x-www-form-urlencoded',
-                        'User-agent': 'reCAPTCHA Python'})
+                     'User-agent': 'reCAPTCHA Python'})
         httpresp = urllib2.urlopen(request)
         return_values = httpresp.read().splitlines()
         httpresp.close()
@@ -768,11 +782,15 @@ class Recaptcha(DIV):
         captcha = DIV(
             SCRIPT("var RecaptchaOptions = {%s};" % self.options),
             SCRIPT(_type="text/javascript",
-                   _src="%s/challenge?k=%s%s" % (server,public_key,error_param)),
-            TAG.noscript(IFRAME(_src="%s/noscript?k=%s%s" % (server,public_key,error_param),
-                                _height="300",_width="500",_frameborder="0"), BR(),
-                         INPUT(_type='hidden', _name='recaptcha_response_field',
-                               _value='manual_challenge')), _id='recaptcha')
+                   _src="%s/challenge?k=%s%s" % (server, public_key, error_param)),
+            TAG.noscript(
+                IFRAME(
+                    _src="%s/noscript?k=%s%s" % (
+                        server, public_key, error_param),
+                    _height="300", _width="500", _frameborder="0"), BR(),
+                INPUT(
+                    _type='hidden', _name='recaptcha_response_field',
+                    _value='manual_challenge')), _id='recaptcha')
         if not self.errors.captcha:
             return XML(captcha).xml()
         else:
@@ -782,166 +800,167 @@ class Recaptcha(DIV):
 
 def addrow(form, a, b, c, style, _id, position=-1):
     if style == "divs":
-        form[0].insert(position, DIV(DIV(LABEL(a),_class='w2p_fl'),
+        form[0].insert(position, DIV(DIV(LABEL(a), _class='w2p_fl'),
                                      DIV(b, _class='w2p_fw'),
                                      DIV(c, _class='w2p_fc'),
-                                     _id = _id))
+                                     _id=_id))
     elif style == "table2cols":
-        form[0].insert(position, TR(TD(LABEL(a),_class='w2p_fl'),
-                                    TD(c,_class='w2p_fc')))
-        form[0].insert(position+1, TR(TD(b,_class='w2p_fw'),
-                                      _colspan=2, _id = _id))
+        form[0].insert(position, TR(TD(LABEL(a), _class='w2p_fl'),
+                                    TD(c, _class='w2p_fc')))
+        form[0].insert(position + 1, TR(TD(b, _class='w2p_fw'),
+                                        _colspan=2, _id=_id))
     elif style == "ul":
-        form[0].insert(position, LI(DIV(LABEL(a),_class='w2p_fl'),
+        form[0].insert(position, LI(DIV(LABEL(a), _class='w2p_fl'),
                                     DIV(b, _class='w2p_fw'),
                                     DIV(c, _class='w2p_fc'),
-                                    _id = _id))
+                                    _id=_id))
     elif style == "bootstrap":
-        form[0].insert(position, DIV(LABEL(a,_class='control-label'),
-                                    DIV(b,SPAN(c, _class='inline-help'),_class='controls'),
-                                    _class='control-group',_id = _id))
+        form[0].insert(position, DIV(LABEL(a, _class='control-label'),
+                                     DIV(b, SPAN(c, _class='inline-help'),
+                                         _class='controls'),
+                                     _class='control-group', _id=_id))
     else:
-        form[0].insert(position, TR(TD(LABEL(a),_class='w2p_fl'),
-                                    TD(b,_class='w2p_fw'),
-                                    TD(c,_class='w2p_fc'),_id = _id))
+        form[0].insert(position, TR(TD(LABEL(a), _class='w2p_fl'),
+                                    TD(b, _class='w2p_fw'),
+                                    TD(c, _class='w2p_fc'), _id=_id))
 
 
 class Auth(object):
 
     default_settings = dict(
-        hideerror = False,
-        password_min_length = 4,
-        cas_maps = None,
-        reset_password_requires_verification = False,
-        registration_requires_verification = False,
-        registration_requires_approval = False,
-        login_after_registration = False,
-        login_after_password_change = True,
-        alternate_requires_registration = False,
-        create_user_groups = "user_%(id)s",
-        everybody_group_id = None,
-        login_captcha = None,
-        register_captcha = None,
-        retrieve_username_captcha = None,
-        retrieve_password_captcha = None,
-        captcha = None,
-        expiration = 3600,            # one hour
-        long_expiration = 3600*30*24, # one month
-        remember_me_form = True,
-        allow_basic_login = False,
-        allow_basic_login_only = False,
-        on_failed_authentication = lambda x: redirect(x),
-        formstyle = "table3cols",
-        label_separator =  ": ",
-        password_field = 'password',
-        table_user_name = 'auth_user',
-        table_group_name = 'auth_group',
-        table_membership_name = 'auth_membership',
-        table_permission_name = 'auth_permission',
-        table_event_name = 'auth_event',
-        table_cas_name = 'auth_cas',
-        table_user = None,
-        table_group = None,
-        table_membership = None,
-        table_permission = None,
-        table_event = None,
-        table_cas = None,
-        showid = False,
-        use_username = False,
-        login_email_validate = True,
-        login_userfield = None,
-        logout_onlogout = None,
-        register_fields = None,
-        register_verify_password = True,
-        profile_fields = None,
-        email_case_sensitive = True,
-        username_case_sensitive = True,
-        )
+        hideerror=False,
+        password_min_length=4,
+        cas_maps=None,
+        reset_password_requires_verification=False,
+        registration_requires_verification=False,
+        registration_requires_approval=False,
+        login_after_registration=False,
+        login_after_password_change=True,
+        alternate_requires_registration=False,
+        create_user_groups="user_%(id)s",
+        everybody_group_id=None,
+        login_captcha=None,
+        register_captcha=None,
+        retrieve_username_captcha=None,
+        retrieve_password_captcha=None,
+        captcha=None,
+        expiration=3600,            # one hour
+        long_expiration=3600 * 30 * 24,  # one month
+        remember_me_form=True,
+        allow_basic_login=False,
+        allow_basic_login_only=False,
+        on_failed_authentication=lambda x: redirect(x),
+        formstyle="table3cols",
+        label_separator=": ",
+        password_field='password',
+        table_user_name='auth_user',
+        table_group_name='auth_group',
+        table_membership_name='auth_membership',
+        table_permission_name='auth_permission',
+        table_event_name='auth_event',
+        table_cas_name='auth_cas',
+        table_user=None,
+        table_group=None,
+        table_membership=None,
+        table_permission=None,
+        table_event=None,
+        table_cas=None,
+        showid=False,
+        use_username=False,
+        login_email_validate=True,
+        login_userfield=None,
+        logout_onlogout=None,
+        register_fields=None,
+        register_verify_password=True,
+        profile_fields=None,
+        email_case_sensitive=True,
+        username_case_sensitive=True,
+    )
         # ## these are messages that can be customized
     default_messages = dict(
-        login_button = 'Login',
-        register_button = 'Register',
-        password_reset_button = 'Request reset password',
-        password_change_button = 'Change password',
-        profile_save_button = 'Save profile',
-        submit_button = 'Submit',
-        verify_password = 'Verify Password',
-        delete_label = 'Check to delete',
-        function_disabled = 'Function disabled',
-        access_denied = 'Insufficient privileges',
-        registration_verifying = 'Registration needs verification',
-        registration_pending = 'Registration is pending approval',
-        login_disabled = 'Login disabled by administrator',
-        logged_in = 'Logged in',
-        email_sent = 'Email sent',
-        unable_to_send_email = 'Unable to send email',
-        email_verified = 'Email verified',
-        logged_out = 'Logged out',
-        registration_successful = 'Registration successful',
-        invalid_email = 'Invalid email',
-        unable_send_email = 'Unable to send email',
-        invalid_login = 'Invalid login',
-        invalid_user = 'Invalid user',
-        invalid_password = 'Invalid password',
-        is_empty = "Cannot be empty",
-        mismatched_password = "Password fields don't match",
-        verify_email = 'Click on the link %(link)s to verify your email',
-        verify_email_subject = 'Email verification',
-        username_sent = 'Your username was emailed to you',
-        new_password_sent = 'A new password was emailed to you',
-        password_changed = 'Password changed',
-        retrieve_username = 'Your username is: %(username)s',
-        retrieve_username_subject = 'Username retrieve',
-        retrieve_password = 'Your password is: %(password)s',
-        retrieve_password_subject = 'Password retrieve',
-        reset_password = \
-            'Click on the link %(link)s to reset your password',
-        reset_password_subject = 'Password reset',
-        invalid_reset_password = 'Invalid reset password',
-        profile_updated = 'Profile updated',
-        new_password = 'New password',
-        old_password = 'Old password',
-        group_description = 'Group uniquely assigned to user %(id)s',
-        register_log = 'User %(id)s Registered',
-        login_log = 'User %(id)s Logged-in',
-        login_failed_log = None,
-        logout_log = 'User %(id)s Logged-out',
-        profile_log = 'User %(id)s Profile updated',
-        verify_email_log = 'User %(id)s Verification email sent',
-        retrieve_username_log = 'User %(id)s Username retrieved',
-        retrieve_password_log = 'User %(id)s Password retrieved',
-        reset_password_log = 'User %(id)s Password reset',
-        change_password_log = 'User %(id)s Password changed',
-        add_group_log = 'Group %(group_id)s created',
-        del_group_log = 'Group %(group_id)s deleted',
-        add_membership_log = None,
-        del_membership_log = None,
-        has_membership_log = None,
-        add_permission_log = None,
-        del_permission_log = None,
-        has_permission_log = None,
-        impersonate_log = 'User %(id)s is impersonating %(other_id)s',
-        label_first_name = 'First name',
-        label_last_name = 'Last name',
-        label_username = 'Username',
-        label_email = 'E-mail',
-        label_password = 'Password',
-        label_registration_key = 'Registration key',
-        label_reset_password_key = 'Reset Password key',
-        label_registration_id = 'Registration identifier',
-        label_role = 'Role',
-        label_description = 'Description',
-        label_user_id = 'User ID',
-        label_group_id = 'Group ID',
-        label_name = 'Name',
-        label_table_name = 'Object or table name',
-        label_record_id = 'Record ID',
-        label_time_stamp = 'Timestamp',
-        label_client_ip = 'Client IP',
-        label_origin = 'Origin',
-        label_remember_me = "Remember me (for 30 days)",
-        verify_password_comment = 'please input your password again',
-        )
+        login_button='Login',
+        register_button='Register',
+        password_reset_button='Request reset password',
+        password_change_button='Change password',
+        profile_save_button='Save profile',
+        submit_button='Submit',
+        verify_password='Verify Password',
+        delete_label='Check to delete',
+        function_disabled='Function disabled',
+        access_denied='Insufficient privileges',
+        registration_verifying='Registration needs verification',
+        registration_pending='Registration is pending approval',
+        login_disabled='Login disabled by administrator',
+        logged_in='Logged in',
+        email_sent='Email sent',
+        unable_to_send_email='Unable to send email',
+        email_verified='Email verified',
+        logged_out='Logged out',
+        registration_successful='Registration successful',
+        invalid_email='Invalid email',
+        unable_send_email='Unable to send email',
+        invalid_login='Invalid login',
+        invalid_user='Invalid user',
+        invalid_password='Invalid password',
+        is_empty="Cannot be empty",
+        mismatched_password="Password fields don't match",
+        verify_email='Click on the link %(link)s to verify your email',
+        verify_email_subject='Email verification',
+        username_sent='Your username was emailed to you',
+        new_password_sent='A new password was emailed to you',
+        password_changed='Password changed',
+        retrieve_username='Your username is: %(username)s',
+        retrieve_username_subject='Username retrieve',
+        retrieve_password='Your password is: %(password)s',
+        retrieve_password_subject='Password retrieve',
+        reset_password=
+        'Click on the link %(link)s to reset your password',
+        reset_password_subject='Password reset',
+        invalid_reset_password='Invalid reset password',
+        profile_updated='Profile updated',
+        new_password='New password',
+        old_password='Old password',
+        group_description='Group uniquely assigned to user %(id)s',
+        register_log='User %(id)s Registered',
+        login_log='User %(id)s Logged-in',
+        login_failed_log=None,
+        logout_log='User %(id)s Logged-out',
+        profile_log='User %(id)s Profile updated',
+        verify_email_log='User %(id)s Verification email sent',
+        retrieve_username_log='User %(id)s Username retrieved',
+        retrieve_password_log='User %(id)s Password retrieved',
+        reset_password_log='User %(id)s Password reset',
+        change_password_log='User %(id)s Password changed',
+        add_group_log='Group %(group_id)s created',
+        del_group_log='Group %(group_id)s deleted',
+        add_membership_log=None,
+        del_membership_log=None,
+        has_membership_log=None,
+        add_permission_log=None,
+        del_permission_log=None,
+        has_permission_log=None,
+        impersonate_log='User %(id)s is impersonating %(other_id)s',
+        label_first_name='First name',
+        label_last_name='Last name',
+        label_username='Username',
+        label_email='E-mail',
+        label_password='Password',
+        label_registration_key='Registration key',
+        label_reset_password_key='Reset Password key',
+        label_registration_id='Registration identifier',
+        label_role='Role',
+        label_description='Description',
+        label_user_id='User ID',
+        label_group_id='Group ID',
+        label_name='Name',
+        label_table_name='Object or table name',
+        label_record_id='Record ID',
+        label_time_stamp='Timestamp',
+        label_client_ip='Client IP',
+        label_origin='Origin',
+        label_remember_me="Remember me (for 30 days)",
+        verify_password_comment='please input your password again',
+    )
 
     """
     Class for authentication, authorization, role based access control.
@@ -1031,22 +1050,24 @@ class Auth(object):
     def get_or_create_key(filename=None, alg='sha512'):
         request = current.request
         if not filename:
-            filename = os.path.join(request.folder,'private','auth.key')
+            filename = os.path.join(request.folder, 'private', 'auth.key')
         if os.path.exists(filename):
-            key = open(filename,'r').read().strip()
+            key = open(filename, 'r').read().strip()
         else:
-            key = alg+':'+web2py_uuid()
-            open(filename,'w').write(key)
+            key = alg + ':' + web2py_uuid()
+            open(filename, 'w').write(key)
         return key
 
     def url(self, f=None, args=None, vars=None, scheme=False):
-        if args is None: args=[]
-        if vars is None: vars={}
+        if args is None:
+            args = []
+        if vars is None:
+            vars = {}
         return URL(c=self.settings.controller,
-                   f=f, args=args, vars=vars,scheme=scheme)
+                   f=f, args=args, vars=vars, scheme=scheme)
 
     def here(self):
-        return URL(args=current.request.args,vars=current.request.vars)
+        return URL(args=current.request.args, vars=current.request.vars)
 
     def __init__(self, environment=None, db=None, mailer=True,
                  hmac_key=None, controller='default', function='user',
@@ -1062,7 +1083,7 @@ class Auth(object):
         - cas_provider (delegate authentication to the URL, CAS2)
         """
         ## next two lines for backward compatibility
-        if not db and environment and isinstance(environment,DAL):
+        if not db and environment and isinstance(environment, DAL):
             db = environment
         self.db = db
         self.environment = current
@@ -1076,40 +1097,41 @@ class Auth(object):
                 datetime.timedelta(days=0, seconds=auth.expiration) > request.now:
             self.user = auth.user
             # this is a trick to speed up sessions
-            if (request.now - auth.last_visit).seconds > (auth.expiration/10):
+            if (request.now - auth.last_visit).seconds > (auth.expiration / 10):
                 auth.last_visit = request.now
         else:
             self.user = None
-            if session.auth: del session.auth
+            if session.auth:
+                del session.auth
         # ## what happens after login?
 
         self.next = current.request.vars._next
-        if isinstance(self.next,(list,tuple)):
+        if isinstance(self.next, (list, tuple)):
             self.next = self.next[0]
-        url_index = URL(controller,'index')
-        url_login = URL(controller,function,args='login')
+        url_index = URL(controller, 'index')
+        url_login = URL(controller, function, args='login')
         # ## what happens after registration?
 
         settings = self.settings = Settings()
         settings.update(Auth.default_settings)
         settings.update(
-            cas_domains = [request.env.http_host],
-            cas_provider = cas_provider,
-            cas_actions = dict(login ='login',
-                               validate ='validate',
-                               servicevalidate ='serviceValidate',
-                               proxyvalidate ='proxyValidate',
-                               logout ='logout'),
-            extra_fields = {},
-            actions_disabled = [],
-            controller = controller,
-            function = function,
-            login_url = url_login,
-            logged_url = URL(controller, function, args='profile'),
-            download_url = URL(controller,'download'),
-            mailer = (mailer==True) and Mail() or mailer,
-            on_failed_authorization = \
-                URL(controller,function, args='not_authorized'),
+            cas_domains=[request.env.http_host],
+            cas_provider=cas_provider,
+            cas_actions=dict(login='login',
+                             validate='validate',
+                             servicevalidate='serviceValidate',
+                             proxyvalidate='proxyValidate',
+                             logout='logout'),
+            extra_fields={},
+            actions_disabled=[],
+            controller=controller,
+            function=function,
+            login_url=url_login,
+            logged_url=URL(controller, function, args='profile'),
+            download_url=URL(controller, 'download'),
+            mailer=(mailer == True) and Mail() or mailer,
+            on_failed_authorization =
+            URL(controller, function, args='not_authorized'),
             login_next = url_index,
             login_onvalidation = [],
             login_onaccept = [],
@@ -1136,7 +1158,7 @@ class Auth(object):
             reset_password_onvalidation = [],
             reset_password_onaccept = [],
             hmac_key = hmac_key,
-            )
+        )
         settings.lock_keys = True
 
         # ## these are messages that can be customized
@@ -1146,7 +1168,7 @@ class Auth(object):
 
         # for "remember me" option
         response = current.response
-        if auth  and  auth.remember:
+        if auth and auth.remember:
             # when user wants to be logged in for longer
             response.cookies[response.session_id_name]["expires"] = \
                 auth.expiration
@@ -1156,21 +1178,26 @@ class Auth(object):
             self.signature = None
 
     def _get_user_id(self):
-       "accessor for auth.user_id"
-       return self.user and self.user.id or None
+        "accessor for auth.user_id"
+        return self.user and self.user.id or None
 
     user_id = property(_get_user_id, doc="user.id or None")
 
     def table_user(self):
         return self.db[self.settings.table_user_name]
+
     def table_group(self):
         return self.db[self.settings.table_group_name]
+
     def table_membership(self):
         return self.db[self.settings.table_membership_name]
+
     def table_permission(self):
         return self.db[self.settings.table_permission_name]
+
     def table_event(self):
         return self.db[self.settings.table_event_name]
+
     def table_cas(self):
         return self.db[self.settings.table_cas_name]
 
@@ -1191,19 +1218,19 @@ class Auth(object):
         request = current.request
         args = request.args
         if not args:
-            redirect(self.url(args='login',vars=request.vars))
+            redirect(self.url(args='login', vars=request.vars))
         elif args[0] in self.settings.actions_disabled:
             raise HTTP(404)
-        if args[0] in ('login','logout','register','verify_email',
-                       'retrieve_username','retrieve_password',
-                       'reset_password','request_reset_password',
-                       'change_password','profile','groups',
-                       'impersonate','not_authorized'):
-            if len(request.args) >= 2 and args[0]=='impersonate':
-                return getattr(self,args[0])(request.args[1])
+        if args[0] in ('login', 'logout', 'register', 'verify_email',
+                       'retrieve_username', 'retrieve_password',
+                       'reset_password', 'request_reset_password',
+                       'change_password', 'profile', 'groups',
+                       'impersonate', 'not_authorized'):
+            if len(request.args) >= 2 and args[0] == 'impersonate':
+                return getattr(self, args[0])(request.args[1])
             else:
-                return getattr(self,args[0])()
-        elif args[0]=='cas' and not self.settings.cas_provider:
+                return getattr(self, args[0])()
+        elif args[0] == 'cas' and not self.settings.cas_provider:
             if args(1) == self.settings.cas_actions['login']:
                 return self.cas_login(version=2)
             elif args(1) == self.settings.cas_actions['validate']:
@@ -1218,7 +1245,7 @@ class Auth(object):
             raise HTTP(404)
 
     def navbar(self, prefix='Welcome', action=None,
-               separators=(' [ ',' | ',' ] '), user_identifier=DEFAULT,
+               separators=(' [ ', ' | ', ' ] '), user_identifier=DEFAULT,
                referrer_actions=DEFAULT, mode='default'):
         referrer_actions = [] if not referrer_actions else referrer_actions
         request = current.request
@@ -1230,14 +1257,14 @@ class Auth(object):
             prefix = prefix.strip() + ' '
         if not action:
             action = self.url(self.settings.function)
-        s1,s2,s3 = separators
+        s1, s2, s3 = separators
         if URL() == action:
             next = ''
         else:
             next = '?_next=' + urllib.quote(URL(args=request.args,
                                                 vars=request.get_vars))
         href = lambda function: '%s/%s%s' % (action, function,
-            next if referrer_actions is DEFAULT or function in referrer_actions else '')
+                                             next if referrer_actions is DEFAULT or function in referrer_actions else '')
 
         if self.user_id:
             if user_identifier is DEFAULT:
@@ -1254,20 +1281,26 @@ class Auth(object):
                       (action, urllib.quote(self.settings.logout_next)))
             profile = A(T('Profile'), _href=href('profile'))
             password = A(T('Password'), _href=href('change_password'))
-            bar = SPAN(prefix, user_identifier, s1, logout, s3, _class='auth_navbar')
+            bar = SPAN(
+                prefix, user_identifier, s1, logout, s3, _class='auth_navbar')
 
             if asdropdown:
-                logout = LI(A(I(_class='icon-off'), ' '+T('Logout'), _href='%s/logout?_next=%s' %
-                      (action, urllib.quote(self.settings.logout_next)))) # the space before T('Logout') is intentional. It creates a gap between icon and text
-                profile = LI(A(I(_class='icon-user'), ' '+T('Profile'), _href=href('profile')))
-                password = LI(A(I(_class='icon-lock'), ' '+T('Password'), _href=href('change_password')))
-                bar = UL(logout,_class='dropdown-menu') # logout will be the last item in list
+                logout = LI(A(I(_class='icon-off'), ' ' + T('Logout'), _href='%s/logout?_next=%s' %
+                              (action, urllib.quote(self.settings.logout_next))))  # the space before T('Logout') is intentional. It creates a gap between icon and text
+                profile = LI(A(I(_class='icon-user'), ' ' +
+                             T('Profile'), _href=href('profile')))
+                password = LI(A(I(_class='icon-lock'), ' ' +
+                              T('Password'), _href=href('change_password')))
+                bar = UL(logout, _class='dropdown-menu')
+                         # logout will be the last item in list
 
             if not 'profile' in self.settings.actions_disabled:
-                if not asdropdown: bar.insert(-1, s2)
+                if not asdropdown:
+                    bar.insert(-1, s2)
                 bar.insert(-1, profile)
             if not 'change_password' in self.settings.actions_disabled:
-                if not asdropdown: bar.insert(-1, s2)
+                if not asdropdown:
+                    bar.insert(-1, s2)
                 bar.insert(-1, password)
         else:
             login = A(T('Login'), _href=href('login'))
@@ -1279,32 +1312,39 @@ class Auth(object):
             bar = SPAN(s1, login, s3, _class='auth_navbar')
 
             if asdropdown:
-                login = LI(A(I(_class='icon-off'), ' '+T('Login'), _href=href('login'))) #the space before T('Login') is intentional. It creates a gap between icon and text
-                register = LI(A(I(_class='icon-user'), ' '+T('Register'), _href=href('register')))
-                retrieve_username = LI(A(I(_class='icon-edit'), ' '+T('Forgot username?'), _href=href('retrieve_username')))
-                lost_password = LI(A(I(_class='icon-lock'), ' '+T('Lost password?'), _href=href('request_reset_password')))
-                bar = UL(login,_class='dropdown-menu') # login will be the last item in list
+                login = LI(A(I(_class='icon-off'), ' ' + T('Login'), _href=href('login')))  # the space before T('Login') is intentional. It creates a gap between icon and text
+                register = LI(A(I(_class='icon-user'),
+                              ' ' + T('Register'), _href=href('register')))
+                retrieve_username = LI(A(I(_class='icon-edit'), ' ' + T(
+                    'Forgot username?'), _href=href('retrieve_username')))
+                lost_password = LI(A(I(_class='icon-lock'), ' ' + T(
+                    'Lost password?'), _href=href('request_reset_password')))
+                bar = UL(login, _class='dropdown-menu')
+                         # login will be the last item in list
 
             if not 'register' in self.settings.actions_disabled:
-                if not asdropdown: bar.insert(-1, s2)
+                if not asdropdown:
+                    bar.insert(-1, s2)
                 bar.insert(-1, register)
             if self.settings.use_username and not 'retrieve_username' \
                     in self.settings.actions_disabled:
-                if not asdropdown: bar.insert(-1, s2)
+                if not asdropdown:
+                    bar.insert(-1, s2)
                 bar.insert(-1, retrieve_username)
             if not 'request_reset_password' \
                     in self.settings.actions_disabled:
-                if not asdropdown: bar.insert(-1, s2)
+                if not asdropdown:
+                    bar.insert(-1, s2)
                 bar.insert(-1, lost_password)
 
         if asdropdown:
-            bar.insert(-1, LI('',_class='divider'))
+            bar.insert(-1, LI('', _class='divider'))
             if self.user_id:
                 bar = LI(A(prefix, user_identifier, _href='#'),
-                         bar,_class='dropdown')
+                         bar, _class='dropdown')
             else:
                 bar = LI(A(T('Login'), _href='#'),
-                         bar,_class='dropdown')
+                         bar, _class='dropdown')
         return bar
 
     def __get_migrate(self, tablename, migrate=True):
@@ -1318,7 +1358,7 @@ class Auth(object):
 
     def enable_record_versioning(self,
                                  tables,
-                                 archive_db = None,
+                                 archive_db=None,
                                  archive_names='%(tablename)s_archive',
                                  current_record='current_record'):
         """
@@ -1351,9 +1391,9 @@ class Auth(object):
         for table in tables:
             if 'modified_on' in table.fields():
                 table._enable_record_versioning(
-                    archive_db = archive_db,
-                    archive_name = archive_names,
-                    current_record = current_record)
+                    archive_db=archive_db,
+                    archive_name=archive_names,
+                    current_record=current_record)
 
     def define_signature(self):
         db = self.db
@@ -1361,21 +1401,23 @@ class Auth(object):
         request = current.request
         T = current.T
         reference_user = 'reference %s' % settings.table_user_name
-        def lazy_user (auth = self):
+
+        def lazy_user(auth=self):
             return auth.user_id
-        def represent(id,record=None,s=settings):
+
+        def represent(id, record=None, s=settings):
             try:
                 user = s.table_user(id)
                 return '%(first_name)s %(last_name)s' % user
             except:
                 return id
         self.signature = db.Table(
-            self.db,'auth_signature',
-            Field('is_active','boolean',
+            self.db, 'auth_signature',
+            Field('is_active', 'boolean',
                   default=True,
                   readable=False, writable=False,
                   label=T('Is Active')),
-            Field('created_on','datetime',
+            Field('created_on', 'datetime',
                   default=request.now,
                   writable=False, readable=False,
                   label=T('Created On')),
@@ -1384,14 +1426,14 @@ class Auth(object):
                   default=lazy_user, represent=represent,
                   writable=False, readable=False,
                   label=T('Created By')),
-            Field('modified_on','datetime',
-                  update=request.now,default=request.now,
-                  writable=False,readable=False,
+            Field('modified_on', 'datetime',
+                  update=request.now, default=request.now,
+                  writable=False, readable=False,
                   label=T('Modified On')),
             Field('modified_by',
-                  reference_user,represent=represent,
-                  default=lazy_user,update=lazy_user,
-                  writable=False,readable=False,
+                  reference_user, represent=represent,
+                  default=lazy_user, update=lazy_user,
+                  writable=False, readable=False,
                   label=T('Modified By')))
 
     def define_tables(self, username=None, signature=None,
@@ -1418,11 +1460,11 @@ class Auth(object):
             settings.use_username = username
         if not self.signature:
             self.define_signature()
-        if signature==True:
+        if signature == True:
             signature_list = [self.signature]
         elif not signature:
             signature_list = []
-        elif isinstance(signature,self.db.Table):
+        elif isinstance(signature, self.db.Table):
             signature_list = [signature]
         else:
             signature_list = signature
@@ -1433,34 +1475,34 @@ class Auth(object):
             IS_EMAIL(error_message=self.messages.invalid_email),
             IS_NOT_IN_DB(db, '%s.email' % settings.table_user_name)]
         if not settings.email_case_sensitive:
-            is_unique_email.insert(1,IS_LOWER())
+            is_unique_email.insert(1, IS_LOWER())
         if not settings.table_user_name in db.tables:
             passfield = settings.password_field
             extra_fields = settings.extra_fields.get(
-                settings.table_user_name,[])+signature_list
+                settings.table_user_name, []) + signature_list
             if username or settings.cas_provider:
                 is_unique_username = \
                     [IS_MATCH('[\w\.\-]+'),
-                     IS_NOT_IN_DB(db,'%s.username' % settings.table_user_name)]
+                     IS_NOT_IN_DB(db, '%s.username' % settings.table_user_name)]
                 if not settings.username_case_sensitive:
-                    is_unique_username.insert(1,IS_LOWER())
+                    is_unique_username.insert(1, IS_LOWER())
                 table = db.define_table(
                     settings.table_user_name,
                     Field('first_name', length=128, default='',
                           label=self.messages.label_first_name,
-                          requires = is_not_empty),
+                          requires=is_not_empty),
                     Field('last_name', length=128, default='',
                           label=self.messages.label_last_name,
-                          requires = is_not_empty),
+                          requires=is_not_empty),
                     Field('email', length=512, default='',
                           label=self.messages.label_email,
-                          requires = is_unique_email),
+                          requires=is_unique_email),
                     Field('username', length=128, default='',
                           label=self.messages.label_username,
                           requires=is_unique_username),
                     Field(passfield, 'password', length=512,
                           readable=False, label=self.messages.label_password,
-                          requires = [is_crypted]),
+                          requires=[is_crypted]),
                     Field('registration_key', length=512,
                           writable=False, readable=False, default='',
                           label=self.messages.label_registration_key),
@@ -1481,16 +1523,16 @@ class Auth(object):
                     settings.table_user_name,
                     Field('first_name', length=128, default='',
                           label=self.messages.label_first_name,
-                          requires = is_not_empty),
+                          requires=is_not_empty),
                     Field('last_name', length=128, default='',
                           label=self.messages.label_last_name,
-                          requires = is_not_empty),
+                          requires=is_not_empty),
                     Field('email', length=512, default='',
                           label=self.messages.label_email,
-                          requires = is_unique_email),
+                          requires=is_unique_email),
                     Field(passfield, 'password', length=512,
                           readable=False, label=self.messages.label_password,
-                          requires = [is_crypted]),
+                          requires=[is_crypted]),
                     Field('registration_key', length=512,
                           writable=False, readable=False, default='',
                           label=self.messages.label_registration_key),
@@ -1509,31 +1551,31 @@ class Auth(object):
         reference_table_user = 'reference %s' % settings.table_user_name
         if not settings.table_group_name in db.tables:
             extra_fields = settings.extra_fields.get(
-                settings.table_group_name,[])+signature_list
+                settings.table_group_name, []) + signature_list
             table = db.define_table(
                 settings.table_group_name,
                 Field('role', length=512, default='',
-                        label=self.messages.label_role,
-                      requires = IS_NOT_IN_DB(
-                        db, '%s.role'% settings.table_group_name)),
+                      label=self.messages.label_role,
+                      requires=IS_NOT_IN_DB(
+                      db, '%s.role' % settings.table_group_name)),
                 Field('description', 'text',
-                        label=self.messages.label_description),
+                      label=self.messages.label_description),
                 *extra_fields,
                 **dict(
                     migrate=self.__get_migrate(
                         settings.table_group_name, migrate),
                     fake_migrate=fake_migrate,
-                    format = '%(role)s (%(id)s)'))
+                    format='%(role)s (%(id)s)'))
         reference_table_group = 'reference %s' % settings.table_group_name
         if not settings.table_membership_name in db.tables:
             extra_fields = settings.extra_fields.get(
-                settings.table_membership_name,[])+signature_list
+                settings.table_membership_name, []) + signature_list
             table = db.define_table(
                 settings.table_membership_name,
                 Field('user_id', reference_table_user,
-                        label=self.messages.label_user_id),
+                      label=self.messages.label_user_id),
                 Field('group_id', reference_table_group,
-                        label=self.messages.label_group_id),
+                      label=self.messages.label_group_id),
                 *extra_fields,
                 **dict(
                     migrate=self.__get_migrate(
@@ -1541,7 +1583,7 @@ class Auth(object):
                     fake_migrate=fake_migrate))
         if not settings.table_permission_name in db.tables:
             extra_fields = settings.extra_fields.get(
-                settings.table_permission_name,[])+signature_list
+                settings.table_permission_name, []) + signature_list
             table = db.define_table(
                 settings.table_permission_name,
                 Field('group_id', reference_table_group,
@@ -1551,23 +1593,23 @@ class Auth(object):
                       requires=is_not_empty),
                 Field('table_name', length=512,
                       label=self.messages.label_table_name),
-                Field('record_id', 'integer',default=0,
+                Field('record_id', 'integer', default=0,
                       label=self.messages.label_record_id,
-                      requires = IS_INT_IN_RANGE(0, 10 ** 9)),
+                      requires=IS_INT_IN_RANGE(0, 10 ** 9)),
                 *extra_fields,
                 **dict(
                     migrate=self.__get_migrate(
                         settings.table_permission_name, migrate),
                     fake_migrate=fake_migrate))
         if not settings.table_event_name in db.tables:
-            table  = db.define_table(
+            table = db.define_table(
                 settings.table_event_name,
                 Field('time_stamp', 'datetime',
-                        default=current.request.now,
-                        label=self.messages.label_time_stamp),
+                      default=current.request.now,
+                      label=self.messages.label_time_stamp),
                 Field('client_ip',
-                        default=current.request.client,
-                        label=self.messages.label_client_ip),
+                      default=current.request.client,
+                      label=self.messages.label_client_ip),
                 Field('user_id', reference_table_user, default=None,
                       label=self.messages.label_user_id),
                 Field('origin', default='auth', length=512,
@@ -1576,7 +1618,7 @@ class Auth(object):
                 Field('description', 'text', default='',
                       label=self.messages.label_description,
                       requires=is_not_empty),
-                *settings.extra_fields.get(settings.table_event_name,[]),
+                *settings.extra_fields.get(settings.table_event_name, []),
                 **dict(
                     migrate=self.__get_migrate(
                         settings.table_event_name, migrate),
@@ -1584,15 +1626,15 @@ class Auth(object):
         now = current.request.now
         if settings.cas_domains:
             if not settings.table_cas_name in db.tables:
-                table  = db.define_table(
+                table = db.define_table(
                     settings.table_cas_name,
                     Field('user_id', reference_table_user, default=None,
                           label=self.messages.label_user_id),
-                    Field('created_on','datetime',default=now),
-                    Field('service',requires=IS_URL()),
+                    Field('created_on', 'datetime', default=now),
+                    Field('service', requires=IS_URL()),
                     Field('ticket'),
                     Field('renew', 'boolean', default=False),
-                    *settings.extra_fields.get(settings.table_cas_name,[]),
+                    *settings.extra_fields.get(settings.table_cas_name, []),
                     **dict(
                         migrate=self.__get_migrate(
                             settings.table_cas_name, migrate),
@@ -1606,25 +1648,25 @@ class Auth(object):
             if settings.cas_domains:
                 settings.table_cas = db[settings.table_cas_name]
 
-        if settings.cas_provider: ### THIS IS NOT LAZY
+        if settings.cas_provider:  # THIS IS NOT LAZY
             settings.actions_disabled = \
-                ['profile','register','change_password',
-                 'request_reset_password','retrieve_username']
+                ['profile', 'register', 'change_password',
+                 'request_reset_password', 'retrieve_username']
             from gluon.contrib.login_methods.cas_auth import CasAuth
             maps = settings.cas_maps
             if not maps:
                 table_user = self.table_user()
-                maps = dict((name,lambda v,n=name:v.get(n,None)) for name in \
-                                table_user.fields if name!='id' \
-                                and table_user[name].readable)
+                maps = dict((name, lambda v, n=name: v.get(n, None)) for name in
+                            table_user.fields if name != 'id'
+                            and table_user[name].readable)
                 maps['registration_id'] = \
-                    lambda v,p=settings.cas_provider:'%s/%s' % (p,v['user'])
+                    lambda v, p=settings.cas_provider: '%s/%s' % (p, v['user'])
             actions = [settings.cas_actions['login'],
                        settings.cas_actions['servicevalidate'],
                        settings.cas_actions['logout']]
             settings.login_form = CasAuth(
-                casversion = 2,
-                urlbase = settings.cas_provider,
+                casversion=2,
+                urlbase=settings.cas_provider,
                 actions=actions,
                 maps=maps)
         return self
@@ -1656,13 +1698,14 @@ class Auth(object):
         user = None
         checks = []
         # make a guess about who this user is
-        for fieldname in ['registration_id','username','email']:
+        for fieldname in ['registration_id', 'username', 'email']:
             if fieldname in table_user.fields() and \
-                    keys.get(fieldname,None):
+                    keys.get(fieldname, None):
                 checks.append(fieldname)
                 value = keys[fieldname]
-                user = table_user(**{fieldname:value})
-                if user: break
+                user = table_user(**{fieldname: value})
+                if user:
+                    break
         if not checks:
             return None
         if not 'registration_id' in keys:
@@ -1672,8 +1715,8 @@ class Auth(object):
         if 'registration_id' in checks \
                 and user \
                 and user.registration_id \
-                and user.registration_id!=keys.get('registration_id',None):
-            user = None # THINK MORE ABOUT THIS? DO WE TRUST OPENID PROVIDER?
+                and user.registration_id != keys.get('registration_id', None):
+            user = None  # THINK MORE ABOUT THIS? DO WE TRUST OPENID PROVIDER?
         if user:
             update_keys = dict(registration_id=keys['registration_id'])
             for key in update_fields:
@@ -1682,10 +1725,10 @@ class Auth(object):
             user.update_record(**update_keys)
         elif checks:
             if not 'first_name' in keys and 'first_name' in table_user.fields:
-                guess = keys.get('email','anonymous').split('@')[0]
-                keys['first_name'] = keys.get('username',guess)
+                guess = keys.get('email', 'anonymous').split('@')[0]
+                keys['first_name'] = keys.get('username', guess)
             user_id = table_user.insert(**table_user._filter_fields(keys))
-            user =  self.user = table_user[user_id]
+            user = self.user = table_user[user_id]
             if self.settings.create_user_groups:
                 group_id = self.add_group(
                     self.settings.create_user_groups % user)
@@ -1701,24 +1744,25 @@ class Auth(object):
         and returns basic_allowed,basic_accepted,user
         """
         if not self.settings.allow_basic_login:
-            return (False,False,False)
+            return (False, False, False)
         basic = current.request.env.http_authorization
         if not basic or not basic[:6].lower() == 'basic ':
             return (True, False, False)
         (username, password) = base64.b64decode(basic[6:]).split(':')
         return (True, True, self.login_bare(username, password))
 
-    def login_user(self,user):
+    def login_user(self, user):
         """
         login the user = db.auth_user(id)
         """
-        user = Storage(self.table_user()._filter_fields(user,id=True))
-        if 'password' in user: del user.password
+        user = Storage(self.table_user()._filter_fields(user, id=True))
+        if 'password' in user:
+            del user.password
         current.session.auth = Storage(
-            user = user,
-            last_visit = current.request.now,
-            expiration = self.settings.expiration,
-            hmac_key = web2py_uuid())
+            user=user,
+            last_visit=current.request.now,
+            expiration=self.settings.expiration,
+            hmac_key=web2py_uuid())
         self.user = user
         self.update_groups()
 
@@ -1737,7 +1781,7 @@ class Auth(object):
             userfield = 'email'
         passfield = self.settings.password_field
         user = self.db(table_user[userfield] == username).select().first()
-        if user and user.get(passfield,False):
+        if user and user.get(passfield, False):
             password = table_user[passfield].validate(password)[0]
             if not user.registration_key and password == user[passfield]:
                 self.login_user(user)
@@ -1757,7 +1801,7 @@ class Auth(object):
         onaccept=DEFAULT,
         log=DEFAULT,
         version=2,
-        ):
+    ):
         request = current.request
         response = current.response
         session = current.session
@@ -1765,13 +1809,14 @@ class Auth(object):
         session._cas_service = request.vars.service or session._cas_service
         if not request.env.http_host in self.settings.cas_domains or \
                 not session._cas_service:
-            raise HTTP(403,'not authorized')
+            raise HTTP(403, 'not authorized')
+
         def allow_access(interactivelogin=False):
-            row = table(service=session._cas_service,user_id=self.user.id)
+            row = table(service=session._cas_service, user_id=self.user.id)
             if row:
                 ticket = row.ticket
             else:
-                ticket = 'ST-'+web2py_uuid()
+                ticket = 'ST-' + web2py_uuid()
                 table.insert(service=session._cas_service,
                              user_id=self.user.id,
                              ticket=ticket,
@@ -1780,25 +1825,27 @@ class Auth(object):
             service = session._cas_service
             del session._cas_service
             if 'warn' in request.vars and not interactivelogin:
-                response.headers['refresh'] = "5;URL=%s"%service+"?ticket="+ticket
-                return A("Continue to %s"%service,
-                    _href=service+"?ticket="+ticket)
+                response.headers[
+                    'refresh'] = "5;URL=%s" % service + "?ticket=" + ticket
+                return A("Continue to %s" % service,
+                         _href=service + "?ticket=" + ticket)
             else:
-                redirect(service+"?ticket="+ticket)
+                redirect(service + "?ticket=" + ticket)
         if self.is_logged_in() and not 'renew' in request.vars:
             return allow_access()
         elif not self.is_logged_in() and 'gateway' in request.vars:
             redirect(service)
-        def cas_onaccept(form, onaccept=onaccept):
-            if not onaccept is DEFAULT: onaccept(form)
-            return allow_access(interactivelogin=True)
-        return self.login(next,onvalidation,cas_onaccept,log)
 
+        def cas_onaccept(form, onaccept=onaccept):
+            if not onaccept is DEFAULT:
+                onaccept(form)
+            return allow_access(interactivelogin=True)
+        return self.login(next, onvalidation, cas_onaccept, log)
 
     def cas_validate(self, version=2, proxy=False):
         request = current.request
         db, table = self.db, self.table_cas()
-        current.response.headers['Content-Type']='text'
+        current.response.headers['Content-Type'] = 'text'
         ticket = request.vars.ticket
         renew = 'renew' in request.vars
         row = table(ticket=ticket)
@@ -1816,32 +1863,33 @@ class Auth(object):
                 user = self.table_user()(row.user_id)
                 row.delete_record()
                 success = True
+
         def build_response(body):
-            return '<?xml version="1.0" encoding="UTF-8"?>\n'+\
+            return '<?xml version="1.0" encoding="UTF-8"?>\n' +\
                 TAG['cas:serviceResponse'](
-                body,**{'_xmlns:cas':'http://www.yale.edu/tp/cas'}).xml()
+                    body, **{'_xmlns:cas': 'http://www.yale.edu/tp/cas'}).xml()
         if success:
             if version == 1:
                 message = 'yes\n%s' % user[userfield]
-            else: # assume version 2
-                username = user.get('username',user[userfield])
+            else:  # assume version 2
+                username = user.get('username', user[userfield])
                 message = build_response(
                     TAG['cas:authenticationSuccess'](
                         TAG['cas:user'](username),
-                        *[TAG['cas:'+field.name](user[field.name]) \
-                              for field in self.table_user() \
-                              if field.readable]))
+                        *[TAG['cas:' + field.name](user[field.name])
+                          for field in self.table_user()
+                          if field.readable]))
         else:
-           if version == 1:
-               message = 'no\n'
-           elif row:
-               message = build_response(TAG['cas:authenticationFailure']())
-           else:
-               message = build_response(
-                   TAG['cas:authenticationFailure'](
-                       'Ticket %s not recognized' % ticket,
-                       _code='INVALID TICKET'))
-        raise HTTP(200,message)
+            if version == 1:
+                message = 'no\n'
+            elif row:
+                message = build_response(TAG['cas:authenticationFailure']())
+            else:
+                message = build_response(
+                    TAG['cas:authenticationFailure'](
+                        'Ticket %s not recognized' % ticket,
+                        _code='INVALID TICKET'))
+        raise HTTP(200, message)
 
     def login(
         self,
@@ -1849,7 +1897,7 @@ class Auth(object):
         onvalidation=DEFAULT,
         onaccept=DEFAULT,
         log=DEFAULT,
-        ):
+    ):
         """
         returns a login form
 
@@ -1878,8 +1926,10 @@ class Auth(object):
         session = current.session
 
         passfield = self.settings.password_field
-        try: table_user[passfield].requires[-1].min_length = 0
-        except: pass
+        try:
+            table_user[passfield].requires[-1].min_length = 0
+        except:
+            pass
 
         ### use session for federated login
         if self.next:
@@ -1897,56 +1947,56 @@ class Auth(object):
         if log is DEFAULT:
             log = self.messages.login_log
 
-        user = None # default
+        user = None  # default
 
         # do we use our own login form, or from a central source?
         if self.settings.login_form == self:
             form = SQLFORM(
                 table_user,
                 fields=[username, passfield],
-                hidden = dict(_next=next),
+                hidden=dict(_next=next),
                 showid=self.settings.showid,
                 submit_button=self.messages.login_button,
                 delete_label=self.messages.delete_label,
                 formstyle=self.settings.formstyle,
                 separator=self.settings.label_separator
-                )
+            )
 
             if self.settings.remember_me_form:
                 ## adds a new input checkbox "remember me for longer"
                 if self.settings.formstyle != 'bootstrap':
-                    addrow(form,XML("&nbsp;"),
-                               DIV(XML("&nbsp;"),
-                                   INPUT(_type='checkbox',
-                                         _class='checkbox',
-                                         _id="auth_user_remember",
+                    addrow(form, XML("&nbsp;"),
+                           DIV(XML("&nbsp;"),
+                               INPUT(_type='checkbox',
+                                     _class='checkbox',
+                                     _id="auth_user_remember",
                                          _name="remember",
-                                        ),
-                                    XML("&nbsp;&nbsp;"),
-                                    LABEL(
-                                          self.messages.label_remember_me,
-                                          _for="auth_user_remember",
-                                        )),"",
-                               self.settings.formstyle,
-                               'auth_user_remember__row')
+                                     ),
+                               XML("&nbsp;&nbsp;"),
+                               LABEL(
+                               self.messages.label_remember_me,
+                               _for="auth_user_remember",
+                               )), "",
+                           self.settings.formstyle,
+                           'auth_user_remember__row')
                 elif self.settings.formstyle == 'bootstrap':
                     addrow(form,
                            "",
                            LABEL(
-                                 INPUT(_type='checkbox',
-                                       _id="auth_user_remember",
-                                       _name="remember"),
-                                 self.messages.label_remember_me,
-                                 _class="checkbox"),
-                            "",
-                            self.settings.formstyle,
-                            'auth_user_remember__row')
+                               INPUT(_type='checkbox',
+                                     _id="auth_user_remember",
+                                     _name="remember"),
+                               self.messages.label_remember_me,
+                               _class="checkbox"),
+                           "",
+                           self.settings.formstyle,
+                           'auth_user_remember__row')
 
             captcha = self.settings.login_captcha or \
-                (self.settings.login_captcha!=False and self.settings.captcha)
+                (self.settings.login_captcha != False and self.settings.captcha)
             if captcha:
                 addrow(form, captcha.label, captcha, captcha.comment,
-                       self.settings.formstyle,'captcha__row')
+                       self.settings.formstyle, 'captcha__row')
             accepted_form = False
 
             if form.accepts(request, session,
@@ -1956,14 +2006,15 @@ class Auth(object):
 
                 accepted_form = True
                 # check for username in db
-                user = self.db(table_user[username] == form.vars[username]).select().first()
+                user = self.db(table_user[username]
+                               == form.vars[username]).select().first()
                 if user:
                     # user in db, check if registration pending or disabled
                     temp_user = user
                     if temp_user.registration_key == 'pending':
                         response.flash = self.messages.registration_pending
                         return form
-                    elif temp_user.registration_key in ('disabled','blocked'):
+                    elif temp_user.registration_key in ('disabled', 'blocked'):
                         response.flash = self.messages.login_disabled
                         return form
                     elif not temp_user.registration_key is None and \
@@ -2008,7 +2059,8 @@ class Auth(object):
                                    request.post_vars)
                     # invalid login
                     session.flash = self.messages.invalid_login
-                    redirect(self.url(args=request.args,vars=request.get_vars))
+                    redirect(
+                        self.url(args=request.args, vars=request.get_vars))
 
         else:
             # use a central authentication server
@@ -2017,8 +2069,9 @@ class Auth(object):
 
             if cas_user:
                 cas_user[passfield] = None
-                user = self.get_or_create_user(table_user._filter_fields(cas_user))
-            elif hasattr(cas,'login_form'):
+                user = self.get_or_create_user(
+                    table_user._filter_fields(cas_user))
+            elif hasattr(cas, 'login_form'):
                 return cas.login_form()
             else:
                 # we need to pass through login again before going on
@@ -2032,7 +2085,7 @@ class Auth(object):
             # user wants to be logged in for longer
             self.login_user(user)
             session.auth.expiration = \
-                request.vars.get('remember',False) and \
+                request.vars.get('remember', False) and \
                 self.settings.long_expiration or \
                 self.settings.expiration
             session.auth.remember = 'remember' in request.vars
@@ -2042,15 +2095,15 @@ class Auth(object):
         # how to continue
         if self.settings.login_form == self:
             if accepted_form:
-                callback(onaccept,form)
+                callback(onaccept, form)
                 if next == session._auth_next:
-                     session._auth_next = None
+                    session._auth_next = None
                 next = replace_id(next, form)
                 redirect(next)
             table_user[username].requires = old_requires
             return form
         elif user:
-            callback(onaccept,None)
+            callback(onaccept, None)
         if next == session._auth_next:
             del session._auth_next
         redirect(next)
@@ -2090,7 +2143,7 @@ class Auth(object):
         onvalidation=DEFAULT,
         onaccept=DEFAULT,
         log=DEFAULT,
-        ):
+    ):
         """
         returns a registration form
 
@@ -2133,13 +2186,13 @@ class Auth(object):
                     table_user[username].requires += (unique_validator, )
         elif not isinstance(table_user[username].requires, IS_NOT_IN_DB):
             table_user[username].requires = [table_user[username].requires,
-                unique_validator]
+                                             unique_validator]
 
         passfield = self.settings.password_field
         formstyle = self.settings.formstyle
         form = SQLFORM(table_user,
-                       fields = self.settings.register_fields,
-                       hidden = dict(_next=next),
+                       fields=self.settings.register_fields,
+                       hidden=dict(_next=next),
                        showid=self.settings.showid,
                        submit_button=self.messages.register_button,
                        delete_label=self.messages.delete_label,
@@ -2148,47 +2201,54 @@ class Auth(object):
                        )
         if self.settings.register_verify_password:
             for i, row in enumerate(form[0].components):
-                item = row.element('input',_name=passfield)
+                item = row.element('input', _name=passfield)
                 if item:
                     form.custom.widget.password_two = \
-                        INPUT(_name="password_two",  _type="password",
+                        INPUT(_name="password_two", _type="password",
                               requires=IS_EXPR(
-                            'value==%s' % \
-                                repr(request.vars.get(passfield, None)),
-                            error_message=self.messages.mismatched_password))
+                              'value==%s' %
+                              repr(request.vars.get(passfield, None)),
+                              error_message=self.messages.mismatched_password))
 
-                    if formstyle == 'bootstrap' :
-                        form.custom.widget.password_two['_class'] = 'input-xlarge'
+                    if formstyle == 'bootstrap':
+                        form.custom.widget.password_two[
+                            '_class'] = 'input-xlarge'
 
-                    addrow(form, self.messages.verify_password + self.settings.label_separator,
-                           form.custom.widget.password_two,
-                           self.messages.verify_password_comment,
+                    addrow(
+                        form, self.messages.verify_password +
+                        self.settings.label_separator,
+                        form.custom.widget.password_two,
+                        self.messages.verify_password_comment,
                            formstyle,
                            '%s_%s__row' % (table_user, 'password_two'),
-                           position=i+1)
+                           position=i + 1)
                     break
         captcha = self.settings.register_captcha or self.settings.captcha
         if captcha:
-            addrow(form, captcha.label, captcha, captcha.comment,self.settings.formstyle, 'captcha__row')
+            addrow(form, captcha.label, captcha,
+                   captcha.comment, self.settings.formstyle, 'captcha__row')
 
         table_user.registration_key.default = key = web2py_uuid()
         if form.accepts(request, session, formname='register',
-                        onvalidation=onvalidation,hideerror=self.settings.hideerror):
+                        onvalidation=onvalidation, hideerror=self.settings.hideerror):
             description = self.messages.group_description % form.vars
             if self.settings.create_user_groups:
-                group_id = self.add_group(self.settings.create_user_groups % form.vars, description)
+                group_id = self.add_group(
+                    self.settings.create_user_groups % form.vars, description)
                 self.add_membership(group_id, form.vars.id)
             if self.settings.everybody_group_id:
-                self.add_membership(self.settings.everybody_group_id, form.vars.id)
+                self.add_membership(
+                    self.settings.everybody_group_id, form.vars.id)
             if self.settings.registration_requires_verification:
-                link = self.url('user',args=('verify_email',key),scheme=True)
+                link = self.url(
+                    'user', args=('verify_email', key), scheme=True)
 
                 if not self.settings.mailer or \
                    not self.settings.mailer.send(
                     to=form.vars.email,
                     subject=self.messages.verify_email_subject,
-                    message=self.messages.verify_email \
-                        % dict(key=key,link=link)):
+                    message=self.messages.verify_email
+                        % dict(key=key, link=link)):
                     self.db.rollback()
                     response.flash = self.messages.unable_send_email
                     return form
@@ -2197,7 +2257,7 @@ class Auth(object):
                not self.settings.registration_requires_verification:
                 table_user[form.vars.id] = dict(registration_key='pending')
                 session.flash = self.messages.registration_pending
-            elif (not self.settings.registration_requires_verification or \
+            elif (not self.settings.registration_requires_verification or
                       self.settings.login_after_registration):
                 if not self.settings.registration_requires_verification:
                     table_user[form.vars.id] = dict(registration_key='')
@@ -2208,9 +2268,9 @@ class Auth(object):
                 self.login_user(user)
                 session.flash = self.messages.logged_in
             self.log_event(log, form.vars)
-            callback(onaccept,form)
+            callback(onaccept, form)
             if not next:
-                next = self.url(args = request.args)
+                next = self.url(args=request.args)
             else:
                 next = replace_id(next, form)
             redirect(next)
@@ -2246,10 +2306,10 @@ class Auth(object):
         if not user:
             redirect(self.settings.login_url)
         if self.settings.registration_requires_approval:
-            user.update_record(registration_key = 'pending')
+            user.update_record(registration_key='pending')
             current.session.flash = self.messages.registration_pending
         else:
-            user.update_record(registration_key = '')
+            user.update_record(registration_key='')
             current.session.flash = self.messages.email_verified
         # make sure session has same user.registrato_key as db record
         if current.session.auth and current.session.auth.user:
@@ -2261,7 +2321,7 @@ class Auth(object):
         if onaccept is DEFAULT:
             onaccept = self.settings.verify_email_onaccept
         self.log_event(log, user)
-        callback(onaccept,user)
+        callback(onaccept, user)
         redirect(next)
 
     def retrieve_username(
@@ -2287,7 +2347,7 @@ class Auth(object):
         response = current.response
         session = current.session
         captcha = self.settings.retrieve_username_captcha or \
-                (self.settings.retrieve_username_captcha!=False and self.settings.captcha)
+                (self.settings.retrieve_username_captcha != False and self.settings.captcha)
         if not self.settings.mailer:
             response.flash = self.messages.function_disabled
             return ''
@@ -2304,7 +2364,7 @@ class Auth(object):
             error_message=self.messages.invalid_email)]
         form = SQLFORM(table_user,
                        fields=['email'],
-                       hidden = dict(_next=next),
+                       hidden=dict(_next=next),
                        showid=self.settings.showid,
                        submit_button=self.messages.submit_button,
                        delete_label=self.messages.delete_label,
@@ -2312,11 +2372,12 @@ class Auth(object):
                        separator=self.settings.label_separator
                        )
         if captcha:
-            addrow(form, captcha.label, captcha, captcha.comment,self.settings.formstyle, 'captcha__row')
+            addrow(form, captcha.label, captcha,
+                   captcha.comment, self.settings.formstyle, 'captcha__row')
 
         if form.accepts(request, session,
                         formname='retrieve_username', dbio=False,
-                        onvalidation=onvalidation,hideerror=self.settings.hideerror):
+                        onvalidation=onvalidation, hideerror=self.settings.hideerror):
             user = table_user(email=form.vars.email)
             if not user:
                 current.session.flash = \
@@ -2329,9 +2390,9 @@ class Auth(object):
                      % dict(username=username))
             session.flash = self.messages.email_sent
             self.log_event(log, user)
-            callback(onaccept,form)
+            callback(onaccept, form)
             if not next:
-                next = self.url(args = request.args)
+                next = self.url(args=request.args)
             else:
                 next = replace_id(next, form)
             redirect(next)
@@ -2342,13 +2403,13 @@ class Auth(object):
         import string
         import random
         password = ''
-        specials=r'!#$*'
-        for i in range(0,3):
+        specials = r'!#$*'
+        for i in range(0, 3):
             password += random.choice(string.lowercase)
             password += random.choice(string.uppercase)
             password += random.choice(string.digits)
             password += random.choice(specials)
-        return ''.join(random.sample(password,len(password)))
+        return ''.join(random.sample(password, len(password)))
 
     def reset_password_deprecated(
         self,
@@ -2385,7 +2446,7 @@ class Auth(object):
             error_message=self.messages.invalid_email)]
         form = SQLFORM(table_user,
                        fields=['email'],
-                       hidden = dict(_next=next),
+                       hidden=dict(_next=next),
                        showid=self.settings.showid,
                        submit_button=self.messages.submit_button,
                        delete_label=self.messages.delete_label,
@@ -2394,34 +2455,34 @@ class Auth(object):
                        )
         if form.accepts(request, session,
                         formname='retrieve_password', dbio=False,
-                        onvalidation=onvalidation,hideerror=self.settings.hideerror):
+                        onvalidation=onvalidation, hideerror=self.settings.hideerror):
             user = table_user(email=form.vars.email)
             if not user:
                 current.session.flash = \
                     self.messages.invalid_email
                 redirect(self.url(args=request.args))
-            elif user.registration_key in ('pending','disabled','blocked'):
+            elif user.registration_key in ('pending', 'disabled', 'blocked'):
                 current.session.flash = \
                     self.messages.registration_pending
                 redirect(self.url(args=request.args))
             password = self.random_password()
             passfield = self.settings.password_field
             d = dict(
-                passfield = str(table_user[passfield].validate(password)[0]),
-                registration_key = '')
+                passfield=str(table_user[passfield].validate(password)[0]),
+                registration_key='')
             user.update_record(**d)
             if self.settings.mailer and \
                self.settings.mailer.send(to=form.vars.email,
                         subject=self.messages.retrieve_password_subject,
-                        message=self.messages.retrieve_password \
+                        message=self.messages.retrieve_password
                         % dict(password=password)):
                 session.flash = self.messages.email_sent
             else:
                 session.flash = self.messages.unable_to_send_email
             self.log_event(log, user)
-            callback(onaccept,form)
+            callback(onaccept, form)
             if not next:
-                next = self.url(args = request.args)
+                next = self.url(args=request.args)
             else:
                 next = replace_id(next, form)
             redirect(next)
@@ -2453,9 +2514,11 @@ class Auth(object):
         try:
             key = request.vars.key or getarg(-1)
             t0 = int(key.split('-')[0])
-            if time.time()-t0 > 60*60*24: raise Exception
+            if time.time() - t0 > 60 * 60 * 24:
+                raise Exception
             user = table_user(reset_password_key=key)
-            if not user: raise Exception
+            if not user:
+                raise Exception
         except Exception:
             session.flash = self.messages.invalid_reset_password
             redirect(next)
@@ -2466,19 +2529,20 @@ class Auth(object):
                   requires=self.table_user()[passfield].requires),
             Field('new_password2', 'password',
                   label=self.messages.verify_password,
-                  requires=[IS_EXPR('value==%s' % repr(request.vars.new_password),
+                  requires=[IS_EXPR(
+                      'value==%s' % repr(request.vars.new_password),
                                     self.messages.mismatched_password)]),
             submit_button=self.messages.password_reset_button,
-            hidden = dict(_next=next),
+            hidden=dict(_next=next),
             formstyle=self.settings.formstyle,
             separator=self.settings.label_separator
         )
-        if form.accepts(request,session,
+        if form.accepts(request, session,
                         hideerror=self.settings.hideerror):
             user.update_record(
-                **{passfield:str(form.vars.new_password),
-                   'registration_key':'',
-                   'reset_password_key':''})
+                **{passfield: str(form.vars.new_password),
+                   'registration_key': '',
+                   'reset_password_key': ''})
             session.flash = self.messages.password_changed
             if self.settings.login_after_password_change:
                 self.login_user(user)
@@ -2504,7 +2568,7 @@ class Auth(object):
         response = current.response
         session = current.session
         captcha = self.settings.retrieve_password_captcha or \
-                (self.settings.retrieve_password_captcha!=False and self.settings.captcha)
+                (self.settings.retrieve_password_captcha != False and self.settings.captcha)
 
         if next is DEFAULT:
             next = self.next or self.settings.request_reset_password_next
@@ -2523,7 +2587,7 @@ class Auth(object):
                      error_message=self.messages.invalid_email)]
         form = SQLFORM(table_user,
                        fields=['email'],
-                       hidden = dict(_next=next),
+                       hidden=dict(_next=next),
                        showid=self.settings.showid,
                        submit_button=self.messages.password_reset_button,
                        delete_label=self.messages.delete_label,
@@ -2531,7 +2595,8 @@ class Auth(object):
                        separator=self.settings.label_separator
                        )
         if captcha:
-            addrow(form, captcha.label, captcha, captcha.comment, self.settings.formstyle,'captcha__row')
+            addrow(form, captcha.label, captcha,
+                   captcha.comment, self.settings.formstyle, 'captcha__row')
         if form.accepts(request, session,
                         formname='reset_password', dbio=False,
                         onvalidation=onvalidation,
@@ -2540,7 +2605,7 @@ class Auth(object):
             if not user:
                 session.flash = self.messages.invalid_email
                 redirect(self.url(args=request.args))
-            elif user.registration_key in ('pending','disabled','blocked'):
+            elif user.registration_key in ('pending', 'disabled', 'blocked'):
                 session.flash = self.messages.registration_pending
                 redirect(self.url(args=request.args))
             if self.email_reset_password(user):
@@ -2548,25 +2613,25 @@ class Auth(object):
             else:
                 session.flash = self.messages.unable_to_send_email
             self.log_event(log, user)
-            callback(onaccept,form)
+            callback(onaccept, form)
             if not next:
-                next = self.url(args = request.args)
+                next = self.url(args=request.args)
             else:
                 next = replace_id(next, form)
             redirect(next)
         # old_requires = table_user.email.requires
         return form
 
-    def email_reset_password(self,user):
-        reset_password_key = str(int(time.time()))+'-' + web2py_uuid()
+    def email_reset_password(self, user):
+        reset_password_key = str(int(time.time())) + '-' + web2py_uuid()
         link = self.url('user',
-                        args=('reset_password',reset_password_key),
+                        args=('reset_password', reset_password_key),
                         scheme=True)
         if self.settings.mailer.send(
             to=user.email,
             subject=self.messages.reset_password_subject,
-            message=self.messages.reset_password % \
-                dict(key=reset_password_key,link=link)):
+            message=self.messages.reset_password %
+                dict(key=reset_password_key, link=link)):
             user.update_record(reset_password_key=reset_password_key)
             return True
         return False
@@ -2579,9 +2644,9 @@ class Auth(object):
         log=DEFAULT,
         ):
         if self.settings.reset_password_requires_verification:
-            return self.request_reset_password(next,onvalidation,onaccept,log)
+            return self.request_reset_password(next, onvalidation, onaccept, log)
         else:
-            return self.reset_password_deprecated(next,onvalidation,onaccept,log)
+            return self.reset_password_deprecated(next, onvalidation, onaccept, log)
 
     def change_password(
         self,
@@ -2624,11 +2689,12 @@ class Auth(object):
                 requires=table_user[passfield].requires),
             Field('new_password2', 'password',
                 label=self.messages.verify_password,
-                requires=[IS_EXPR('value==%s' % repr(request.vars.new_password),
+                requires=[IS_EXPR(
+                    'value==%s' % repr(request.vars.new_password),
                               self.messages.mismatched_password)]),
             submit_button=self.messages.password_change_button,
-            hidden = dict(_next=next),
-            formstyle = self.settings.formstyle,
+            hidden=dict(_next=next),
+            formstyle=self.settings.formstyle,
             separator=self.settings.label_separator
         )
         if form.accepts(request, session,
@@ -2643,7 +2709,7 @@ class Auth(object):
                 s.update(**d)
                 session.flash = self.messages.password_changed
                 self.log_event(log, self.user)
-                callback(onaccept,form)
+                callback(onaccept, form)
                 if not next:
                     next = self.url(args=request.args)
                 else:
@@ -2684,13 +2750,13 @@ class Auth(object):
         form = SQLFORM(
             table_user,
             self.user.id,
-            fields = self.settings.profile_fields,
-            hidden = dict(_next=next),
-            showid = self.settings.showid,
-            submit_button = self.messages.profile_save_button,
-            delete_label = self.messages.delete_label,
-            upload = self.settings.download_url,
-            formstyle = self.settings.formstyle,
+            fields=self.settings.profile_fields,
+            hidden=dict(_next=next),
+            showid=self.settings.showid,
+            submit_button=self.messages.profile_save_button,
+            delete_label=self.messages.delete_label,
+            upload=self.settings.download_url,
+            formstyle=self.settings.formstyle,
             separator=self.settings.label_separator
             )
         if form.accepts(request, session,
@@ -2698,8 +2764,8 @@ class Auth(object):
                         onvalidation=onvalidation, hideerror=self.settings.hideerror):
             self.user.update(table_user._filter_fields(form.vars))
             session.flash = self.messages.profile_updated
-            self.log_event(log,self.user)
-            callback(onaccept,form)
+            self.log_event(log, self.user)
+            callback(onaccept, form)
             if not next:
                 next = self.url(args=request.args)
             else:
@@ -2745,7 +2811,7 @@ class Auth(object):
                 for callback in self.settings.login_onaccept:
                     callback(form)
             log = self.messages.impersonate_log
-            self.log_event(log,dict(id=current_id, other_id=auth.user.id))
+            self.log_event(log, dict(id=current_id, other_id=auth.user.id))
         elif user_id in (0, '0'):
             if self.is_impersonating():
                 session.clear()
@@ -2764,7 +2830,8 @@ class Auth(object):
             current.session.auth.user_groups = self.user_groups
         table_group = self.table_group()
         table_membership = self.table_membership()
-        memberships = self.db(table_membership.user_id==self.user.id).select()
+        memberships = self.db(
+            table_membership.user_id == self.user.id).select()
         for membership in memberships:
             group = table_group(membership.group_id)
             if group:
@@ -2778,11 +2845,12 @@ class Auth(object):
         if not self.is_logged_in():
             redirect(self.settings.login_url)
         table_membership = self.table_membership()
-        memberships = self.db(table_membership.user_id==self.user.id).select()
+        memberships = self.db(
+            table_membership.user_id == self.user.id).select()
         table = TABLE()
         for membership in memberships:
             table_group = self.db[self.settings.table_group_name]
-            groups = self.db(table_group.id==membership.group_id).select()
+            groups = self.db(table_group.id == membership.group_id).select()
             if groups:
                 group = groups[0]
                 table.append(TR(H3(group.role, '(%s)' % group.id)))
@@ -2796,7 +2864,7 @@ class Auth(object):
         you can change the view for this page to make it look as you like
         """
         if current.request.ajax:
-            raise HTTP(403,'ACCESS DENIED')
+            raise HTTP(403, 'ACCESS DENIED')
         return 'ACCESS DENIED'
 
     def requires(self, condition, requires_login=True, otherwise=None):
@@ -2808,7 +2876,7 @@ class Auth(object):
 
             def f(*a, **b):
 
-                basic_allowed,basic_accepted,user = self.basic()
+                basic_allowed, basic_accepted, user = self.basic()
                 user = user or self.user
                 if requires_login:
                     if not user:
@@ -2818,16 +2886,16 @@ class Auth(object):
                             redirect(otherwise)
                         elif self.settings.allow_basic_login_only or \
                                 basic_accepted or current.request.is_restful:
-                            raise HTTP(403,"Not authorized")
+                            raise HTTP(403, "Not authorized")
                         elif current.request.ajax:
-                            return A('login',_href=self.settings.login_url)
+                            return A('login', _href=self.settings.login_url)
                         else:
                             next = self.here()
                             current.session.flash = current.response.flash
                             return call_or_redirect(
                                 self.settings.on_failed_authentication,
-                                self.settings.login_url+\
-                                    '?_next='+urllib.quote(next))
+                                self.settings.login_url +
+                                    '?_next=' + urllib.quote(next))
 
                 if callable(condition):
                     flag = condition()
@@ -2845,13 +2913,13 @@ class Auth(object):
 
         return decorator
 
-    def requires_login(self,otherwise=None):
+    def requires_login(self, otherwise=None):
         """
         decorator that prevents access to action if not logged in
         """
-        return self.requires(True,otherwise=otherwise)
+        return self.requires(True, otherwise=otherwise)
 
-    def requires_membership(self, role=None, group_id=None,otherwise=None):
+    def requires_membership(self, role=None, group_id=None, otherwise=None):
         """
         decorator that prevents access to action if not logged in or
         if user logged in is not a member of group_id.
@@ -2859,7 +2927,7 @@ class Auth(object):
         group_id is calculated.
         """
         return self.requires(lambda: self.has_membership(
-                group_id=group_id, role=role),otherwise=otherwise)
+                group_id=group_id, role=role), otherwise=otherwise)
 
     def requires_permission(self, name, table_name='', record_id=0,
                             otherwise=None):
@@ -2869,9 +2937,9 @@ class Auth(object):
         has 'name' access to 'table_name', 'record_id'.
         """
         return self.requires(lambda: self.has_permission(
-                name, table_name, record_id),otherwise=otherwise)
+                name, table_name, record_id), otherwise=otherwise)
 
-    def requires_signature(self,otherwise=None):
+    def requires_signature(self, otherwise=None):
         """
         decorator that prevents access to action if not logged in or
         if user logged in is not a member of group_id.
@@ -2879,7 +2947,7 @@ class Auth(object):
         group_id is calculated.
         """
         return self.requires(lambda: URL.verify(
-                current.request,user_signature=True),otherwise=otherwise)
+                current.request, user_signature=True), otherwise=otherwise)
 
     def add_group(self, role, description=''):
         """
@@ -2900,7 +2968,7 @@ class Auth(object):
         self.db(self.table_membership().group_id == group_id).delete()
         self.db(self.table_permission().group_id == group_id).delete()
         self.update_groups()
-        self.log_event(self.messages.del_group_log,dict(group_id=group_id))
+        self.log_event(self.messages.del_group_log, dict(group_id=group_id))
 
     def id_group(self, role):
         """
@@ -2911,7 +2979,7 @@ class Auth(object):
             return None
         return rows[0].id
 
-    def user_group(self, user_id = None):
+    def user_group(self, user_id=None):
         """
         returns the group_id of the group uniquely associated to this user
         i.e. role=user:[user_id]
@@ -2925,7 +2993,6 @@ class Auth(object):
             user = self.user
         return self.settings.create_user_groups % user
 
-
     def has_membership(self, group_id=None, user_id=None, role=None):
         """
         checks if user is member of group_id or role
@@ -2935,7 +3002,7 @@ class Auth(object):
         try:
             group_id = int(group_id)
         except:
-            group_id = self.id_group(group_id) # interpret group_id as a role
+            group_id = self.id_group(group_id)  # interpret group_id as a role
         if not user_id and self.user:
             user_id = self.user.id
         membership = self.table_membership()
@@ -2945,7 +3012,7 @@ class Auth(object):
         else:
             r = False
         self.log_event(self.messages.has_membership_log,
-                       dict(user_id=user_id,group_id=group_id, check=r))
+                       dict(user_id=user_id, group_id=group_id, check=r))
         return r
 
     def add_membership(self, group_id=None, user_id=None, role=None):
@@ -2958,11 +3025,11 @@ class Auth(object):
         try:
             group_id = int(group_id)
         except:
-            group_id = self.id_group(group_id) # interpret group_id as a role
+            group_id = self.id_group(group_id)  # interpret group_id as a role
         if not user_id and self.user:
             user_id = self.user.id
         membership = self.table_membership()
-        record = membership(user_id = user_id,group_id = group_id)
+        record = membership(user_id=user_id, group_id=group_id)
         if record:
             return record.id
         else:
@@ -2983,7 +3050,7 @@ class Auth(object):
             user_id = self.user.id
         membership = self.table_membership()
         self.log_event(self.messages.del_membership_log,
-                       dict(user_id=user_id,group_id=group_id))
+                       dict(user_id=user_id, group_id=group_id))
         ret = self.db(membership.user_id
                       == user_id)(membership.group_id
                                   == group_id).delete()
@@ -3006,8 +3073,9 @@ class Auth(object):
 
         if not group_id and self.settings.everybody_group_id and \
                 self.has_permission(
-            name,table_name,record_id,user_id=None,
-            group_id=self.settings.everybody_group_id): return True
+            name, table_name, record_id, user_id=None,
+            group_id=self.settings.everybody_group_id):
+                return True
 
         if not user_id and not group_id and self.user:
             user_id = self.user.id
@@ -3056,9 +3124,8 @@ class Auth(object):
         permission = self.table_permission()
         if group_id == 0:
             group_id = self.user_group()
-        record = self.db(permission.group_id==group_id)(permission.name==name)\
-            (permission.table_name==str(table_name))\
-            (permission.record_id==long(record_id)).select().first()
+        record = self.db(permission.group_id == group_id)(permission.name == name)(permission.table_name == str(table_name))(
+                permission.record_id == long(record_id)).select().first()
         if record:
             id = record.id
         else:
@@ -3104,25 +3171,25 @@ class Auth(object):
         """
         if not user_id:
             user_id = self.user_id
-        if isinstance(table,str) and table in self.db.tables():
+        if isinstance(table, str) and table in self.db.tables():
             table = self.db[table]
-        if not isinstance(table,str) and\
+        if not isinstance(table, str) and\
                 self.has_permission(name, table, 0, user_id):
             return table.id > 0
         db = self.db
         membership = self.table_membership()
         permission = self.table_permission()
         query = table.id.belongs(
-            db(membership.user_id == user_id)\
-                (membership.group_id == permission.group_id)\
-                (permission.name == name)\
-                (permission.table_name == table)\
+            db(membership.user_id == user_id)
+                (membership.group_id == permission.group_id)
+                (permission.name == name)
+                (permission.table_name == table)
                 ._select(permission.record_id))
         if self.settings.everybody_group_id:
-            query|=table.id.belongs(
-                db(permission.group_id==self.settings.everybody_group_id)\
-                    (permission.name == name)\
-                    (permission.table_name == table)\
+            query |= table.id.belongs(
+                db(permission.group_id == self.settings.everybody_group_id)
+                    (permission.name == name)
+                    (permission.table_name == table)
                     ._select(permission.record_id))
         return query
 
@@ -3192,16 +3259,16 @@ class Auth(object):
             if not archive_table_name in table._db:
                 table._db.define_table(
                     archive_table_name,
-                    Field(current_record,table),
+                    Field(current_record, table),
                     *[field.clone(unique=False) for field in table])
             archive_table = table._db[archive_table_name]
-        new_record = {current_record:form.vars.id}
+        new_record = {current_record: form.vars.id}
         for fieldname in archive_table.fields:
-            if not fieldname in ['id',current_record]:
+            if not fieldname in ['id', current_record]:
                 if archive_current and fieldname in form.vars:
-                    new_record[fieldname]=form.vars[fieldname]
+                    new_record[fieldname] = form.vars[fieldname]
                 elif form.record and fieldname in form.record:
-                    new_record[fieldname]=form.record[fieldname]
+                    new_record[fieldname] = form.record[fieldname]
         if fields:
             new_record.update(fields)
         id = archive_table.insert(**new_record)
@@ -3215,8 +3282,8 @@ class Auth(object):
              force_prefix='',
              restrict_search=False,
              resolve=True):
-        if not hasattr(self,'_wiki'):
-            self._wiki = Wiki(self,render=render,
+        if not hasattr(self, '_wiki'):
+            self._wiki = Wiki(self, render=render,
                               manage_permissions=manage_permissions,
                               force_prefix=force_prefix,
                               restrict_search=restrict_search,
@@ -3228,6 +3295,7 @@ class Auth(object):
         if resolve:
             return self._wiki.read(slug)['content'] if slug else self._wiki()
 
+
 class Crud(object):
 
     def url(self, f=None, args=None, vars=None):
@@ -3235,16 +3303,18 @@ class Crud(object):
         this should point to the controller that exposes
         download and crud
         """
-        if args is None: args=[]
-        if vars is None: vars={}
+        if args is None:
+            args = []
+        if vars is None:
+            vars = {}
         return URL(c=self.settings.controller, f=f, args=args, vars=vars)
 
     def __init__(self, environment, db=None, controller='default'):
         self.db = db
-        if not db and environment and isinstance(environment,DAL):
+        if not db and environment and isinstance(environment, DAL):
             self.db = environment
         elif not db:
-            raise SyntaxError, "must pass db as first or second argument"
+            raise SyntaxError("must pass db as first or second argument")
         self.environment = current
         settings = self.settings = Settings()
         settings.auth = None
@@ -3301,10 +3371,10 @@ class Crud(object):
         if args[0] == 'create':
             return self.create(table)
         elif args[0] == 'select':
-            return self.select(table,linkto=self.url(args='read'))
+            return self.select(table, linkto=self.url(args='read'))
         elif args[0] == 'search':
-            form, rows = self.search(table,linkto=self.url(args='read'))
-            return DIV(form,SQLTABLE(rows))
+            form, rows = self.search(table, linkto=self.url(args='read'))
+            return DIV(form, SQLTABLE(rows))
         elif args[0] == 'read':
             return self.read(table, args(2))
         elif args[0] == 'update':
@@ -3316,7 +3386,7 @@ class Crud(object):
 
     def log_event(self, message, vars):
         if self.settings.logger:
-            self.settings.logger.log_event(message, vars, origin = 'crud')
+            self.settings.logger.log_event(message, vars, origin='crud')
 
     def has_permission(self, name, table, record=0):
         if not self.settings.auth:
@@ -3329,12 +3399,12 @@ class Crud(object):
 
     def tables(self):
         return TABLE(*[TR(A(name,
-                            _href=self.url(args=('select',name)))) \
+                            _href=self.url(args=('select', name))))
                            for name in self.db.tables])
 
     @staticmethod
-    def archive(form,archive_table=None,current_record='current_record'):
-        return Auth.archive(form,archive_table=archive_table,
+    def archive(form, archive_table=None, current_record='current_record'):
+        return Auth.archive(form, archive_table=archive_table,
                             current_record=current_record)
 
     def update(
@@ -3410,26 +3480,27 @@ class Crud(object):
         captcha = self.settings.update_captcha or self.settings.captcha
         if record and captcha:
             addrow(form, captcha.label, captcha, captcha.comment,
-                         self.settings.formstyle,'captcha__row')
+                         self.settings.formstyle, 'captcha__row')
         captcha = self.settings.create_captcha or self.settings.captcha
         if not record and captcha:
             addrow(form, captcha.label, captcha, captcha.comment,
-                         self.settings.formstyle,'captcha__row')
-        if not request.extension in ('html','load'):
+                         self.settings.formstyle, 'captcha__row')
+        if not request.extension in ('html', 'load'):
             (_session, _formname) = (None, None)
         else:
-            (_session, _formname) = (session, '%s/%s' % (table._tablename, form.record_id))
+            (_session, _formname) = (
+                session, '%s/%s' % (table._tablename, form.record_id))
         if not formname is DEFAULT:
             _formname = formname
         keepvalues = self.settings.keepvalues
         if request.vars.delete_this_record:
             keepvalues = False
-        if isinstance(onvalidation,StorageList):
-            onvalidation=onvalidation.get(table._tablename, [])
+        if isinstance(onvalidation, StorageList):
+            onvalidation = onvalidation.get(table._tablename, [])
         if form.accepts(request, _session, formname=_formname,
                         onvalidation=onvalidation, keepvalues=keepvalues,
                         hideerror=self.settings.hideerror,
-                        detect_record_change = self.settings.detect_record_change):
+                        detect_record_change=self.settings.detect_record_change):
             self.accepted = True
             response.flash = message
             if log:
@@ -3437,19 +3508,19 @@ class Crud(object):
             if request.vars.delete_this_record:
                 self.deleted = True
                 message = self.messages.record_deleted
-                callback(ondelete,form,table._tablename)
+                callback(ondelete, form, table._tablename)
             response.flash = message
-            callback(onaccept,form,table._tablename)
-            if not request.extension in ('html','load'):
+            callback(onaccept, form, table._tablename)
+            if not request.extension in ('html', 'load'):
                 raise HTTP(200, 'RECORD CREATED/UPDATED')
-            if isinstance(next, (list, tuple)): ### fix issue with 2.6
-               next = next[0]
-            if next: # Only redirect when explicit
+            if isinstance(next, (list, tuple)):  # fix issue with 2.6
+                next = next[0]
+            if next:  # Only redirect when explicit
                 next = replace_id(next, form)
                 session.flash = response.flash
                 redirect(next)
-        elif not request.extension in ('html','load'):
-            raise HTTP(401,serializers.json(dict(errors=form.errors)))
+        elif not request.extension in ('html', 'load'):
+            raise HTTP(401, serializers.json(dict(errors=form.errors)))
         return form
 
     def create(
@@ -3509,7 +3580,7 @@ class Crud(object):
             formstyle=self.settings.formstyle,
             separator=self.settings.label_separator
             )
-        if not current.request.extension in ('html','load'):
+        if not current.request.extension in ('html', 'load'):
             return table._filter_fields(form.record, id=True)
         return form
 
@@ -3540,9 +3611,9 @@ class Crud(object):
             message = self.messages.record_deleted
         record = table[record_id]
         if record:
-            callback(self.settings.delete_onvalidation,record)
+            callback(self.settings.delete_onvalidation, record)
             del table[record_id]
-            callback(self.settings.delete_onaccept,record,table._tablename)
+            callback(self.settings.delete_onaccept, record, table._tablename)
             session.flash = message
         redirect(next)
 
@@ -3567,8 +3638,8 @@ class Crud(object):
         if not fields:
             fields = [field for field in table if field.readable]
         else:
-            fields = [table[f] if isinstance(f,str) else f for f in fields]
-        rows = self.db(query).select(*fields,**dict(orderby=orderby,
+            fields = [table[f] if isinstance(f, str) else f for f in fields]
+        rows = self.db(query).select(*fields, **dict(orderby=orderby,
                                                     limitby=limitby))
         return rows
 
@@ -3583,18 +3654,18 @@ class Crud(object):
         **attr
         ):
         headers = headers or {}
-        rows = self.rows(table,query,fields,orderby,limitby)
+        rows = self.rows(table, query, fields, orderby, limitby)
         if not rows:
-            return None # Nicer than an empty table.
+            return None  # Nicer than an empty table.
         if not 'upload' in attr:
             attr['upload'] = self.url('download')
-        if not current.request.extension in ('html','load'):
+        if not current.request.extension in ('html', 'load'):
             return rows.as_list()
         if not headers:
-            if isinstance(table,str):
+            if isinstance(table, str):
                 table = self.db[table]
-            headers = dict((str(k),k.label) for k in table)
-        return SQLTABLE(rows,headers=headers,**attr)
+            headers = dict((str(k), k.label) for k in table)
+        return SQLTABLE(rows, headers=headers, **attr)
 
     def get_format(self, field):
         rtable = field._db[field.type[10:]]
@@ -3605,7 +3676,8 @@ class Crud(object):
 
     def get_query(self, field, op, value, refsearch=False):
         try:
-            if refsearch: format = self.get_format(field)
+            if refsearch:
+                format = self.get_format(field)
             if op == 'equals':
                 if not refsearch:
                     return field == value
@@ -3628,17 +3700,17 @@ class Crud(object):
                     return lambda row: row[field.name][format] < value
             elif op == 'starts with':
                 if not refsearch:
-                    return field.like(value+'%')
+                    return field.like(value + '%')
                 else:
                     return lambda row: str(row[field.name][format]).startswith(value)
             elif op == 'ends with':
                 if not refsearch:
-                    return field.like('%'+value)
+                    return field.like('%' + value)
                 else:
                     return lambda row: str(row[field.name][format]).endswith(value)
             elif op == 'contains':
                 if not refsearch:
-                    return field.like('%'+value+'%')
+                    return field.like('%' + value + '%')
                 else:
                     return lambda row: value in row[field.name][format]
         except:
@@ -3653,7 +3725,8 @@ class Crud(object):
                                query_labels={'equals':'Equals',
                                              'not equal':'Not equal'},
                                fields = ['id','children'],
-                               field_labels = {'id':'ID','children':'Children'},
+                               field_labels = {
+                                   'id':'ID','children':'Children'},
                                zero='Please choose',
                                query = (db.test.id > 0)&(db.test.id != 3) )
         """
@@ -3664,47 +3737,51 @@ class Crud(object):
         if not (isinstance(table, db.Table) or table in db.tables):
             raise HTTP(404)
         attributes = {}
-        for key in ('orderby','groupby','left','distinct','limitby','cache'):
-            if key in args: attributes[key]=args[key]
+        for key in ('orderby', 'groupby', 'left', 'distinct', 'limitby', 'cache'):
+            if key in args:
+                attributes[key] = args[key]
         tbl = TABLE()
-        selected = []; refsearch = []; results = []
+        selected = []
+        refsearch = []
+        results = []
         showall = args.get('showall', False)
         if showall:
             selected = fields
         chkall = args.get('chkall', False)
         if chkall:
             for f in fields:
-                request.vars['chk%s'%f] = 'on'
+                request.vars['chk%s' % f] = 'on'
         ops = args.get('queries', [])
         zero = args.get('zero', '')
         if not ops:
             ops = ['equals', 'not equal', 'greater than',
                    'less than', 'starts with',
                    'ends with', 'contains']
-        ops.insert(0,zero)
+        ops.insert(0, zero)
         query_labels = args.get('query_labels', {})
-        query = args.get('query',table.id > 0)
-        field_labels = args.get('field_labels',{})
+        query = args.get('query', table.id > 0)
+        field_labels = args.get('field_labels', {})
         for field in fields:
             field = table[field]
-            if not field.readable: continue
+            if not field.readable:
+                continue
             fieldname = field.name
             chkval = request.vars.get('chk' + fieldname, None)
             txtval = request.vars.get('txt' + fieldname, None)
             opval = request.vars.get('op' + fieldname, None)
-            row = TR(TD(INPUT(_type = "checkbox", _name = "chk" + fieldname,
-                              _disabled = (field.type == 'id'),
-                              value = (field.type == 'id' or chkval == 'on'))),
-                     TD(field_labels.get(fieldname,field.label)),
-                     TD(SELECT([OPTION(query_labels.get(op,op),
+            row = TR(TD(INPUT(_type="checkbox", _name="chk" + fieldname,
+                              _disabled=(field.type == 'id'),
+                              value=(field.type == 'id' or chkval == 'on'))),
+                     TD(field_labels.get(fieldname, field.label)),
+                     TD(SELECT([OPTION(query_labels.get(op, op),
                                        _value=op) for op in ops],
-                               _name = "op" + fieldname,
-                               value = opval)),
-                     TD(INPUT(_type = "text", _name = "txt" + fieldname,
-                              _value = txtval, _id='txt' + fieldname,
-                              _class = str(field.type))))
+                               _name="op" + fieldname,
+                               value=opval)),
+                     TD(INPUT(_type="text", _name="txt" + fieldname,
+                              _value=txtval, _id='txt' + fieldname,
+                              _class=str(field.type))))
             tbl.append(row)
-            if request.post_vars and (chkval or field.type=='id'):
+            if request.post_vars and (chkval or field.type == 'id'):
                 if txtval and opval != '':
                     if field.type[0:10] == 'reference ':
                         refsearch.append(self.get_query(field,
@@ -3715,29 +3792,32 @@ class Crud(object):
                             ### TODO deal with 'starts with', 'ends with', 'contains' on GAE
                             query &= self.get_query(field, opval, value)
                         else:
-                            row[3].append(DIV(error,_class='error'))
+                            row[3].append(DIV(error, _class='error'))
                 selected.append(field)
-        form = FORM(tbl,INPUT(_type="submit"))
+        form = FORM(tbl, INPUT(_type="submit"))
         if selected:
             try:
-                results = db(query).select(*selected,**attributes)
+                results = db(query).select(*selected, **attributes)
                 for r in refsearch:
                     results = results.find(r)
-            except: # hmmm, we should do better here
+            except:  # hmmm, we should do better here
                 results = None
         return form, results
 
 
 urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
 
+
 def fetch(url, data=None, headers=None,
           cookie=Cookie.SimpleCookie(),
           user_agent='Mozilla/5.0'):
     headers = headers or {}
     if not data is None:
         data = urllib.urlencode(data)
-    if user_agent: headers['User-agent'] = user_agent
-    headers['Cookie'] = ' '.join(['%s=%s;'%(c.key,c.value) for c in cookie.values()])
+    if user_agent:
+        headers['User-agent'] = user_agent
+    headers['Cookie'] = ' '.join(
+        ['%s=%s;' % (c.key, c.value) for c in cookie.values()])
     try:
         from google.appengine.api import urlfetch
     except ImportError:
@@ -3748,7 +3828,7 @@ def fetch(url, data=None, headers=None,
         while url is not None:
             response = urlfetch.fetch(url=url, payload=data,
                                       method=method, headers=headers,
-                                      allow_truncated=False,follow_redirects=False,
+                                      allow_truncated=False, follow_redirects=False,
                                       deadline=10)
             # next request will be a get, so no need to send the data again
             data = None
@@ -3762,6 +3842,7 @@ def fetch(url, data=None, headers=None,
 regex_geocode = \
     re.compile(r"""<geometry>[\W]*?<location>[\W]*?<lat>(?P<la>[^<]*)</lat>[\W]*?<lng>(?P<lo>[^<]*)</lng>[\W]*?</location>""")
 
+
 def geocode(address):
     try:
         a = urllib.quote(address)
@@ -3786,7 +3867,8 @@ def universal_caller(f, *a, **b):
 
     # Fill the arg_dict with name and value for the submitted, positional values
     for pos_index, pos_val in enumerate(a[:c]):
-        arg_dict[n[pos_index]] = pos_val    # n[pos_index] is the name of the argument
+        arg_dict[n[pos_index]
+            ] = pos_val    # n[pos_index] is the name of the argument
 
     # There might be pos_args left, that are sent as named_values. Gather them as well.
     # If a argument already is populated with values we simply replaces them.
@@ -3992,17 +4074,17 @@ class Service(object):
 
         """
         if not isinstance(domain, str):
-            raise SyntaxError, "AMF3 requires a domain for function"
+            raise SyntaxError("AMF3 requires a domain for function")
 
         def _amfrpc3(f):
             if domain:
-                self.amfrpc3_procedures[domain+'.'+f.__name__] = f
+                self.amfrpc3_procedures[domain + '.' + f.__name__] = f
             else:
                 self.amfrpc3_procedures[f.__name__] = f
             return f
         return _amfrpc3
 
-    def soap(self, name=None, returns=None, args=None,doc=None):
+    def soap(self, name=None, returns=None, args=None, doc=None):
         """
         example:
 
@@ -4064,7 +4146,7 @@ class Service(object):
                 writer = csv.writer(s)
                 writer.writerow(r[0].keys())
                 for line in r:
-                    writer.writerow([none_exception(v) \
+                    writer.writerow([none_exception(v)
                                      for v in line.values()])
             else:
                 import csv
@@ -4085,7 +4167,7 @@ class Service(object):
                                  *args[1:], **dict(request.vars))
             if hasattr(s, 'as_list'):
                 s = s.as_list()
-            return serializers.xml(s,quote=False)
+            return serializers.xml(s, quote=False)
         self.error()
 
     def serve_rss(self, args=None):
@@ -4109,20 +4191,21 @@ class Service(object):
             args = request.args
         d = dict(request.vars)
         if args and args[0] in self.json_procedures:
-            s = universal_caller(self.json_procedures[args[0]],*args[1:],**d)
+            s = universal_caller(self.json_procedures[args[0]], *args[1:], **d)
             if hasattr(s, 'as_list'):
                 s = s.as_list()
             return response.json(s)
         self.error()
 
     class JsonRpcException(Exception):
-        def __init__(self,code,info):
-            self.code,self.info = code,info
+        def __init__(self, code, info):
+            self.code, self.info = code, info
 
     def serve_jsonrpc(self):
         def return_response(id, result):
             return serializers.json({'version': '1.1',
                 'id': id, 'result': result, 'error': None})
+
         def return_error(id, code, message, data=None):
             error = {'name': 'JSONRPCError',
                      'code': code, 'message': message}
@@ -4138,7 +4221,7 @@ class Service(object):
         response.headers['Content-Type'] = 'application/json; charset=utf-8'
         methods = self.jsonrpc_procedures
         data = json_parser.loads(request.body.read())
-        id, method, params = data['id'], data['method'], data.get('params','')
+        id, method, params = data['id'], data['method'], data.get('params', '')
         if not method in methods:
             return return_error(id, 100, 'method "%s" does not exist' % method)
         try:
@@ -4185,7 +4268,7 @@ class Service(object):
         for name, message in pyamf_request:
             pyamf_response[name] = base_gateway.getProcessor(message)(message)
         response.headers['Content-Type'] = pyamf.remoting.CONTENT_TYPE
-        if version==3:
+        if version == 3:
             return pyamf.remoting.encode(pyamf_response).getvalue()
         else:
             return pyamf.remoting.encode(pyamf_response, context).getvalue()
@@ -4202,17 +4285,17 @@ class Service(object):
         location = "%s://%s%s" % (
                         request.env.wsgi_url_scheme,
                         request.env.http_host,
-                        URL(r=request,f="call/soap",vars={}))
+                        URL(r=request, f="call/soap", vars={}))
         namespace = 'namespace' in response and response.namespace or location
         documentation = response.description or ''
         dispatcher = SoapDispatcher(
-            name = response.title,
-            location = location,
-            action = location, # SOAPAction
-            namespace = namespace,
+            name=response.title,
+            location=location,
+            action=location,  # SOAPAction
+            namespace=namespace,
             prefix='pys',
-            documentation = documentation,
-            ns = True)
+            documentation=documentation,
+            ns=True)
         for method, (function, returns, args, doc) in procedures.iteritems():
             dispatcher.register_function(method, function, returns, args, doc)
         if request.env.request_method == 'POST':
@@ -4226,11 +4309,11 @@ class Service(object):
         elif 'op' in request.vars:
             # Return method help webpage
             response.headers['Content-Type'] = 'text/html'
-            method  = request.vars['op']
+            method = request.vars['op']
             sample_req_xml, sample_res_xml, doc = dispatcher.help(method)
             body = [H1("Welcome to Web2Py SOAP webservice gateway"),
                     A("See all webservice operations",
-                      _href=URL(r=request,f="call/soap",vars={})),
+                      _href=URL(r=request, f="call/soap", vars={})),
                     H2(method),
                     P(doc),
                     UL(LI("Location: %s" % dispatcher.location),
@@ -4238,9 +4321,9 @@ class Service(object):
                        LI("SoapAction: %s" % dispatcher.action),
                     ),
                     H3("Sample SOAP XML Request Message:"),
-                    CODE(sample_req_xml,language="xml"),
+                    CODE(sample_req_xml, language="xml"),
                     H3("Sample SOAP XML Response Message:"),
-                    CODE(sample_res_xml,language="xml"),
+                    CODE(sample_res_xml, language="xml"),
                     ]
             return {'body': body}
         else:
@@ -4250,9 +4333,9 @@ class Service(object):
                     P(response.description),
                     P("The following operations are available"),
                     A("See WSDL for webservice description",
-                      _href=URL(r=request,f="call/soap",vars={"WSDL":None})),
+                      _href=URL(r=request, f="call/soap", vars={"WSDL":None})),
                     UL([LI(A("%s: %s" % (method, doc or ''),
-                             _href=URL(r=request,f="call/soap",vars={'op': method})))
+                             _href=URL(r=request, f="call/soap", vars={'op': method})))
                         for method, doc in dispatcher.list_methods()]),
                     ]
             return {'body': body}
@@ -4329,20 +4412,21 @@ def completion(callback):
     The argument of completion is executed in a new thread.
     """
     def _completion(f):
-        def __completion(*a,**b):
+        def __completion(*a, **b):
             d = None
             try:
-                d = f(*a,**b)
+                d = f(*a, **b)
                 return d
             finally:
-                thread.start_new_thread(callback,(d,))
+                thread.start_new_thread(callback, (d,))
         return __completion
     return _completion
 
-def prettydate(d,T=lambda x:x):
-    if isinstance(d,datetime.datetime):
+
+def prettydate(d, T=lambda x: x):
+    if isinstance(d, datetime.datetime):
         dt = datetime.datetime.now() - d
-    elif isinstance(d,datetime.date):
+    elif isinstance(d, datetime.date):
         dt = datetime.date.today() - d
     elif not d:
         return ''
@@ -4353,55 +4437,57 @@ def prettydate(d,T=lambda x:x):
         dt = -dt
     else:
         suffix = ' ago'
-    if dt.days >= 2*365:
-        return T('%d years'+suffix) % int(dt.days / 365)
+    if dt.days >= 2 * 365:
+        return T('%d years' + suffix) % int(dt.days / 365)
     elif dt.days >= 365:
-        return T('1 year'+suffix)
+        return T('1 year' + suffix)
     elif dt.days >= 60:
-        return T('%d months'+suffix) % int(dt.days / 30)
+        return T('%d months' + suffix) % int(dt.days / 30)
     elif dt.days > 21:
-        return T('1 month'+suffix)
+        return T('1 month' + suffix)
     elif dt.days >= 14:
-        return T('%d weeks'+suffix) % int(dt.days / 7)
+        return T('%d weeks' + suffix) % int(dt.days / 7)
     elif dt.days >= 7:
-        return T('1 week'+suffix)
+        return T('1 week' + suffix)
     elif dt.days > 1:
-        return T('%d days'+suffix) % dt.days
+        return T('%d days' + suffix) % dt.days
     elif dt.days == 1:
-        return T('1 day'+suffix)
-    elif dt.seconds >= 2*60*60:
-        return T('%d hours'+suffix) % int(dt.seconds / 3600)
-    elif dt.seconds >= 60*60:
-        return T('1 hour'+suffix)
-    elif dt.seconds >= 2*60:
-        return T('%d minutes'+suffix) % int(dt.seconds / 60)
+        return T('1 day' + suffix)
+    elif dt.seconds >= 2 * 60 * 60:
+        return T('%d hours' + suffix) % int(dt.seconds / 3600)
+    elif dt.seconds >= 60 * 60:
+        return T('1 hour' + suffix)
+    elif dt.seconds >= 2 * 60:
+        return T('%d minutes' + suffix) % int(dt.seconds / 60)
     elif dt.seconds >= 60:
-        return T('1 minute'+suffix)
+        return T('1 minute' + suffix)
     elif dt.seconds > 1:
-        return T('%d seconds'+suffix) % dt.seconds
+        return T('%d seconds' + suffix) % dt.seconds
     elif dt.seconds == 1:
-        return T('1 second'+suffix)
+        return T('1 second' + suffix)
     else:
         return T('now')
 
+
 def test_thread_separation():
     def f():
-        c=PluginManager()
+        c = PluginManager()
         lock1.acquire()
         lock2.acquire()
-        c.x=7
+        c.x = 7
         lock1.release()
         lock2.release()
-    lock1=thread.allocate_lock()
-    lock2=thread.allocate_lock()
+    lock1 = thread.allocate_lock()
+    lock2 = thread.allocate_lock()
     lock1.acquire()
-    thread.start_new_thread(f,())
-    a=PluginManager()
-    a.x=5
+    thread.start_new_thread(f, ())
+    a = PluginManager()
+    a.x = 5
     lock1.release()
     lock2.acquire()
     return a.x
 
+
 class PluginManager(object):
     """
 
@@ -4456,7 +4542,8 @@ class PluginManager(object):
     True
     """
     instances = {}
-    def __new__(cls,*a,**b):
+
+    def __new__(cls, *a, **b):
         id = thread.get_ident()
         lock = thread.allocate_lock()
         try:
@@ -4464,77 +4551,83 @@ class PluginManager(object):
             try:
                 return cls.instances[id]
             except KeyError:
-                instance = object.__new__(cls,*a,**b)
+                instance = object.__new__(cls, *a, **b)
                 cls.instances[id] = instance
                 return instance
         finally:
             lock.release()
-    def __init__(self,plugin=None,**defaults):
+
+    def __init__(self, plugin=None, **defaults):
         if not plugin:
             self.__dict__.clear()
         settings = self.__getattr__(plugin)
         settings.installed = True
         settings.update(
-            (k,v) for k,v in defaults.items() if not k in settings)
+            (k, v) for k, v in defaults.items() if not k in settings)
 
     def __getattr__(self, key):
         if not key in self.__dict__:
             self.__dict__[key] = Storage()
         return self.__dict__[key]
+
     def keys(self):
         return self.__dict__.keys()
-    def __contains__(self,key):
+
+    def __contains__(self, key):
         return key in self.__dict__
 
+
 class Expose(object):
-    def __init__(self,base=None,basename='base'):
+    def __init__(self, base=None, basename='base'):
         current.session.forget()
-        base = base or os.path.join(current.request.folder,'static')
+        base = base or os.path.join(current.request.folder, 'static')
         self.basename = basename
         args = self.args = current.request.raw_args and \
             current.request.raw_args.split('/') or []
-        filename = os.path.join(base,*args)
+        filename = os.path.join(base, *args)
         if not os.path.normpath(filename).startswith(base):
-            raise HTTP(401,"NOT AUTHORIZED")
+            raise HTTP(401, "NOT AUTHORIZED")
         if not os.path.isdir(filename):
             current.response.headers['Content-Type'] = contenttype(filename)
-            raise HTTP(200,open(filename,'rb'),**current.response.headers)
-        self.path = path = os.path.join(filename,'*')
-        self.folders = [f[len(path)-1:] for f in sorted(glob.glob(path)) \
+            raise HTTP(200, open(filename, 'rb'), **current.response.headers)
+        self.path = path = os.path.join(filename, '*')
+        self.folders = [f[len(path) - 1:] for f in sorted(glob.glob(path))
                             if os.path.isdir(f) and not self.isprivate(f)]
-        self.filenames = [f[len(path)-1:] for f in sorted(glob.glob(path)) \
+        self.filenames = [f[len(path) - 1:] for f in sorted(glob.glob(path))
                             if not os.path.isdir(f) and not self.isprivate(f)]
 
     def breadcrumbs(self, basename):
         path = []
         span = SPAN()
-        span.append(A(basename,_href=URL()))
+        span.append(A(basename, _href=URL()))
         span.append('/')
         args = current.request.raw_args and \
             current.request.raw_args.split('/') or []
         for arg in args:
             path.append(arg)
-            span.append(A(arg,_href=URL(args='/'.join(path))))
+            span.append(A(arg, _href=URL(args='/'.join(path))))
             span.append('/')
         return span
 
     def table_folders(self):
-        return TABLE(*[TR(TD(A(folder,_href=URL(args=self.args+[folder])))) \
+        return TABLE(*[TR(TD(A(folder, _href=URL(args=self.args + [folder]))))
                            for folder in self.folders])
+
     @staticmethod
     def isprivate(f):
         return 'private' in f or f.startswith('.') or f.endswith('~')
 
     @staticmethod
     def isimage(f):
-        return f.rsplit('.')[-1].lower() in ('png','jpg','jpeg','gif','tiff')
+        return f.rsplit('.')[-1].lower() in ('png', 'jpg', 'jpeg', 'gif', 'tiff')
 
-    def table_files(self,width=160):
-        return TABLE(*[TR(TD(A(f,_href=URL(args=self.args+[f]))),
-                          TD(IMG(_src=URL(args=self.args+[f]),
-                                 _style='max-width:%spx' % width) \
-                                 if width and self.isimage(f) else '')) \
+    def table_files(self, width=160):
+        return TABLE(*[TR(TD(A(f, _href=URL(args=self.args + [f]))),
+                          TD(IMG(_src=URL(args=self.args + [f]),
+                                 _style='max-width:%spx' % width)
+                                 if width and self.isimage(f) else ''))
                            for f in self.filenames])
+
     def xml(self):
         return DIV(
             H2(self.breadcrumbs(self.basename)),
@@ -4547,22 +4640,25 @@ class Expose(object):
 class Wiki(object):
     everybody = 'everybody'
     rows_page = 25
-    def markmin_render(self,page):
-        html = MARKMIN(page.body,url=True,environment=self.env,
-                       autolinks=lambda link: expand_one(link,{})).xml()
+
+    def markmin_render(self, page):
+        html = MARKMIN(page.body, url=True, environment=self.env,
+                       autolinks=lambda link: expand_one(link, {})).xml()
         html += DIV(_class='w2p_wiki_tags',
-                    *[A(t.strip(),_href=URL(args='_search',vars=dict(q=t)))
+                    *[A(t.strip(), _href=URL(args='_search', vars=dict(q=t)))
                       for t in page.tags or [] if t.strip()]).xml()
         return html
-    def html_render(self,page):
+
+    def html_render(self, page):
         html = page.body
         # @///function -> http://..../function
-        html = replace_at_urls(html,URL)
+        html = replace_at_urls(html, URL)
         # http://...jpg -> <img src="http://...jpg/> or oembed
-        html = replace_autolinks(html,lambda link: expand_one(link,{}))
+        html = replace_autolinks(html, lambda link: expand_one(link, {}))
         # @{component:name} -> <script>embed component name</script>
-        html = replace_components(html,self.env)
+        html = replace_components(html, self.env)
         return html
+
     @staticmethod
     def component(text):
         """
@@ -4572,13 +4668,16 @@ class Wiki(object):
         items = text.split('/')
         controller, function, args = items[0], items[1], items[2:]
         return LOAD(controller, function, args=args, ajax=True).xml()
-    def __init__(self,auth,env=None,render='markmin',
-                 manage_permissions=False,force_prefix='',
+
+    def __init__(self, auth, env=None, render='markmin',
+                 manage_permissions=False, force_prefix='',
                  restrict_search=False):
         self.env = env or {}
         self.env['component'] = Wiki.component
-        if render == 'markmin': render=self.markmin_render
-        elif render == 'html': render=self.html_render
+        if render == 'markmin':
+            render = self.markmin_render
+        elif render == 'html':
+            render = self.html_render
         self.render = render
         self.auth = auth
         if self.auth.user:
@@ -4590,38 +4689,38 @@ class Wiki(object):
         self.restrict_search = restrict_search
         db = auth.db
         table_definitions = [
-            ('wiki_page',{
+            ('wiki_page', {
                     'args':[
                         Field('slug',
                               requires=[IS_SLUG(),
-                                        IS_NOT_IN_DB(db,'wiki_page.slug')],
-                              readable=False,writable=False),
-                        Field('title',unique=True),
-                        Field('body','text',notnull=True),
-                        Field('tags','list:string'),
-                        Field('can_read','list:string',
+                                        IS_NOT_IN_DB(db, 'wiki_page.slug')],
+                              readable=False, writable=False),
+                        Field('title', unique=True),
+                        Field('body', 'text', notnull=True),
+                        Field('tags', 'list:string'),
+                        Field('can_read', 'list:string',
                               writable=perms,
                               readable=perms,
                               default=[Wiki.everybody]),
                         Field('can_edit', 'list:string',
-                              writable=perms,readable=perms,
+                              writable=perms, readable=perms,
                               default=[Wiki.everybody]),
                         Field('changelog'),
-                        Field('html','text',compute=render,
+                        Field('html', 'text', compute=render,
                               readable=False, writable=False),
                         auth.signature],
               'vars':{'format':'%(title)s'}}),
-            ('wiki_tag',{
+            ('wiki_tag', {
                     'args':[
                         Field('name'),
-                        Field('wiki_page','reference wiki_page'),
+                        Field('wiki_page', 'reference wiki_page'),
                         auth.signature],
                     'vars':{'format':'%(name)s'}}),
-            ('wiki_media',{
+            ('wiki_media', {
                     'args':[
-                        Field('wiki_page','reference wiki_page'),
-                        Field('title',required=True),
-                        Field('filename','upload',required=True),
+                        Field('wiki_page', 'reference wiki_page'),
+                        Field('title', required=True),
+                        Field('filename', 'upload', required=True),
                         auth.signature],
                     'vars':{'format':'%(title)s'}})
             ]
@@ -4640,109 +4739,122 @@ class Wiki(object):
                 args += value['args']
                 db.define_table(key, *args, **value['vars'])
 
-        def update_tags_insert(page,id,db=db):
+        def update_tags_insert(page, id, db=db):
             for tag in page.tags or []:
                 tag = tag.strip().lower()
-                if tag: db.wiki_tag.insert(name=tag,wiki_page=id)
-        def update_tags_update(dbset,page,db=db):
+                if tag:
+                    db.wiki_tag.insert(name=tag, wiki_page=id)
+
+        def update_tags_update(dbset, page, db=db):
             page = dbset.select().first()
-            db(db.wiki_tag.wiki_page==page.id).delete()
+            db(db.wiki_tag.wiki_page == page.id).delete()
             for tag in page.tags or []:
                 tag = tag.strip().lower()
-                if tag: db.wiki_tag.insert(name=tag,wiki_page=page.id)
+                if tag:
+                    db.wiki_tag.insert(name=tag, wiki_page=page.id)
         db.wiki_page._after_insert.append(update_tags_insert)
         db.wiki_page._after_update.append(update_tags_update)
         if auth.user and check_credentials(current.request) and \
                 not 'wiki_editor' in auth.user_groups.values():
             group = db.auth_group(role='wiki_editor')
-            gid = group.id if group else db.auth_group.insert(role='wiki_editor')
+            gid = group.id if group else db.auth_group.insert(
+                role='wiki_editor')
             auth.add_membership(gid)
     # WIKI ACCESS POLICY
-    def not_authorized(self,page=None):
+
+    def not_authorized(self, page=None):
         raise HTTP(401)
-    def can_read(self,page):
+
+    def can_read(self, page):
         if 'everybody' in page.can_read or not self.manage_permissions:
             return True
         elif self.auth.user:
             groups = self.auth.user_groups.values()
             if ('wiki_editor' in groups or
-                set(groups).intersection(set(page.can_read+page.can_edit)) or
-                page.created_by==self.auth.user.id):
+                set(groups).intersection(set(page.can_read + page.can_edit)) or
+                page.created_by == self.auth.user.id):
                 return True
         return False
-    def can_edit(self,page=None):
-        if not self.auth.user: redirect(self.auth.settings.login_url)
+
+    def can_edit(self, page=None):
+        if not self.auth.user:
+            redirect(self.auth.settings.login_url)
         groups = self.auth.user_groups.values()
         return ('wiki_editor' in groups or
                 (page is None and 'wiki_author' in groups) or
                 not page is None and (
                 set(groups).intersection(set(page.can_edit)) or
-                page.created_by==self.auth.user.id))
+                page.created_by == self.auth.user.id))
+
     def can_manage(self):
         if not self.auth.user:
             return False
         groups = self.auth.user_groups.values()
         return 'wiki_editor' in groups
+
     def can_search(self):
         return True
     ### END POLICY
+
     def __call__(self):
-        request =  current.request
-        automenu = self.menu(request.controller,request.function)
+        request = current.request
+        automenu = self.menu(request.controller, request.function)
         current.response.menu += automenu
         zero = request.args(0) or 'index'
         if zero and zero.isdigit():
             return self.media(int(zero))
         elif not zero or not zero.startswith('_'):
             return self.read(zero)
-        elif zero=='_edit':
+        elif zero == '_edit':
             return self.edit(request.args(1) or 'index')
-        elif zero=='_editmedia':
+        elif zero == '_editmedia':
             return self.editmedia(request.args(1) or 'index')
-        elif zero=='_create':
+        elif zero == '_create':
             return self.create()
-        elif zero=='_pages':
+        elif zero == '_pages':
             return self.pages()
-        elif zero=='_search':
+        elif zero == '_search':
             return self.search()
-        elif zero=='_recent':
+        elif zero == '_recent':
             ipage = int(request.vars.page or 0)
-            query = self.auth.db.wiki_page.created_by==request.args(1,cast=int)
+            query = self.auth.db.wiki_page.created_by == request.args(
+                1, cast=int)
             return self.search(query=query,
                                orderby=~self.auth.db.wiki_page.created_on,
-                               limitby=(ipage*self.rows_page,
-                                        (ipage+1)*self.rows_page),
+                               limitby=(ipage * self.rows_page,
+                                        (ipage + 1) * self.rows_page),
                                )
-        elif zero=='_cloud':
+        elif zero == '_cloud':
             return self.cloud()
         elif zero == '_preview':
             return self.preview(self.render)
 
-    def first_paragraph(self,page):
+    def first_paragraph(self, page):
         if not self.can_read(page):
-            mm = (page.body or '').replace('\r','')
-            ps = [p for p in mm.split('\n\n') \
+            mm = (page.body or '').replace('\r', '')
+            ps = [p for p in mm.split('\n\n')
                       if not p.startswith('#') and p.strip()]
-            if ps: return ps[0]
+            if ps:
+                return ps[0]
         return ''
 
-    def fix_hostname(self,body):
-        return (body or '').replace('://HOSTNAME','://%s' % self.host)
+    def fix_hostname(self, body):
+        return (body or '').replace('://HOSTNAME', '://%s' % self.host)
 
-    def read(self,slug):
+    def read(self, slug):
         if slug in '_cloud':
             return self.cloud()
         elif slug in '_search':
             return self.search()
         page = self.auth.db.wiki_page(slug=slug)
         if not page:
-            redirect(URL(args=('_create',slug)))
+            redirect(URL(args=('_create', slug)))
         if not self.can_read(page):
             return self.not_authorized(page)
         if current.request.extension == 'html':
             if not page:
-                url = URL(args=('_edit',slug))
-                return dict(content=A('Create page "%s"' % slug,_href=url,_class="btn"))
+                url = URL(args=('_edit', slug))
+                return dict(content=A('Create page "%s"' % slug, _href=url, _class="btn"))
             else:
                 return dict(content=XML(self.fix_hostname(page.html)))
         elif current.request.extension == 'load':
@@ -4757,26 +4869,31 @@ class Wiki(object):
                             tags=page.tags,
                             created_on=page.created_on,
                             modified_on=page.modified_on)
-    def check_editor(self,role='wiki_editor',act=False):
+
+    def check_editor(self, role='wiki_editor', act=False):
         if not self.auth.user:
-            if not act: return False
+            if not act:
+                return False
             redirect(self.auth.settings.login_url)
         elif not self.auth.has_membership(role):
-            if not act: return False
+            if not act:
+                return False
             raise HTTP(401, "Not Authorized")
         return True
-    def edit(self,slug):
+
+    def edit(self, slug):
         auth = self.auth
         db = auth.db
         page = db.wiki_page(slug=slug)
-        if not self.can_edit(page): return self.not_authorized(page)
+        if not self.can_edit(page):
+            return self.not_authorized(page)
         title_guess = ' '.join(c.capitalize() for c in slug.split('-'))
         if not page:
             if not (self.can_manage() or
                     slug.startswith(self.force_prefix)):
-                current.session.flash='slug must have "%s" prefix' \
+                current.session.flash = 'slug must have "%s" prefix' \
                     % self.force_prefix
-                redirect(URL(args=('_edit',self.force_prefix+slug)))
+                redirect(URL(args=('_edit', self.force_prefix + slug)))
             db.wiki_page.can_read.default = [Wiki.everybody]
             db.wiki_page.can_edit.default = [auth.user_group_role()]
             db.wiki_page.title.default = title_guess
@@ -4788,9 +4905,9 @@ class Wiki(object):
                 db.wiki_page.body.default = '## %s\n\npage content' % title_guess
         vars = current.request.post_vars
         if vars.body:
-            vars.body=vars.body.replace('://%s' % self.host,'://HOSTNAME')
-        form = SQLFORM(db.wiki_page,page,deletable=True,
-                       formstyle='table2cols',showid=False).process()
+            vars.body = vars.body.replace('://%s' % self.host, '://HOSTNAME')
+        form = SQLFORM(db.wiki_page, page, deletable=True,
+                       formstyle='table2cols', showid=False).process()
         if form.deleted:
             current.session.flash = 'page deleted'
             redirect(URL())
@@ -4801,7 +4918,8 @@ class Wiki(object):
         $(function() {
             if (!$('#wiki_page_body').length) return;
             var pagecontent = $('#wiki_page_body');
-            pagecontent.css('font-family', 'Monaco,Menlo,Consolas,"Courier New",monospace');
+            pagecontent.css('font-family',
+                            'Monaco,Menlo,Consolas,"Courier New",monospace');
             var prevbutton = $('<button class="btn nopreview">Preview</button>');
             var preview = $('<div id="preview"></div>').hide();
             var table = $('form');
@@ -4810,11 +4928,13 @@ class Wiki(object):
             prevbutton.on('click', function(e) {
                 e.preventDefault();
                 if (prevbutton.hasClass('nopreview')) {
-                    prevbutton.addClass('preview').removeClass('nopreview').html('Edit Source');
+                    prevbutton.addClass('preview').removeClass(
+                        'nopreview').html('Edit Source');
                     web2py_ajax_page('post', '%(url)s', {body : $('#wiki_page_body').val()}, 'preview');
                     table.fadeOut('medium', function() {preview.fadeIn()});
                 } else {
-                    prevbutton.addClass('nopreview').removeClass('preview').html('Preview');
+                    prevbutton.addClass(
+                        'nopreview').removeClass('preview').html('Preview');
                     preview.fadeOut('medium', function() {table.fadeIn()});
                 }
             })
@@ -4822,191 +4942,204 @@ class Wiki(object):
         """ % dict(url=URL(args=('_preview')))
         return dict(content=TAG[''](form, SCRIPT(script)))
 
-    def editmedia(self,slug):
+    def editmedia(self, slug):
         auth = self.auth
         db = auth.db
         page = db.wiki_page(slug=slug)
-        if not (page and self.can_edit(page)): return self.not_authorized(page)
-        self.auth.db.wiki_media.id.represent = lambda id,row: \
+        if not (page and self.can_edit(page)):
+            return self.not_authorized(page)
+        self.auth.db.wiki_media.id.represent = lambda id, row: \
             id if not row.filename else \
-            SPAN('@////%i/%s.%s' % \
-                     (id,IS_SLUG.urlify(row.title.split('.')[0]),
+            SPAN('@////%i/%s.%s' %
+                     (id, IS_SLUG.urlify(row.title.split('.')[0]),
                       row.filename.split('.')[-1]))
         self.auth.db.wiki_media.wiki_page.default = page.id
         self.auth.db.wiki_media.wiki_page.writable = False
         content = SQLFORM.grid(
-            self.auth.db.wiki_media.wiki_page==page.id,
-            orderby = self.auth.db.wiki_media.title,
-            args=['_editmedia',slug],
+            self.auth.db.wiki_media.wiki_page == page.id,
+            orderby=self.auth.db.wiki_media.title,
+            args=['_editmedia', slug],
             user_signature=False)
         return dict(content=content)
+
     def create(self):
-        if not self.can_edit(): return self.not_authorized()
+        if not self.can_edit():
+            return self.not_authorized()
         db = self.auth.db
-        form = FORM(INPUT(_name='slug',value=current.request.args(1),
+        form = FORM(INPUT(_name='slug', value=current.request.args(1),
                           requires=(IS_SLUG(),
-                                    IS_NOT_IN_DB(db,db.wiki_page.slug))),
+                                    IS_NOT_IN_DB(db, db.wiki_page.slug))),
                     INPUT(_type='submit',
                           _value=current.T('Create Page from Slug')))
         if form.process().accepted:
-            redirect(URL(args=('_edit',form.vars.slug)))
+            redirect(URL(args=('_edit', form.vars.slug)))
         return dict(content=form)
+
     def pages(self):
         if not self.can_manage():
             return self.not_authorized()
-        self.auth.db.wiki_page.id.represent = lambda id,row:SPAN('@////%s' % row.slug)
-        self.auth.db.wiki_page.title.represent = lambda title,row: \
-            A(title,_href=URL(args=row.slug))
-        content=SQLFORM.grid(
+        self.auth.db.wiki_page.id.represent = lambda id, row: SPAN(
+            '@////%s' % row.slug)
+        self.auth.db.wiki_page.title.represent = lambda title, row: \
+            A(title, _href=URL(args=row.slug))
+        content = SQLFORM.grid(
             self.auth.db.wiki_page,
-            links = [
-                lambda row: \
-                    A('edit',_href=URL(args=('_edit',row.slug))),
-                lambda row: \
-                    A('media',_href=URL(args=('_editmedia',row.slug)))],
-            details=False,editable=False,deletable=False,create=False,
+            links=[
+                lambda row:
+                    A('edit', _href=URL(args=('_edit', row.slug))),
+                lambda row:
+                    A('media', _href=URL(args=('_editmedia', row.slug)))],
+            details=False, editable=False, deletable=False, create=False,
             orderby=self.auth.db.wiki_page.title,
             args=['_pages'],
             user_signature=False)
         return dict(content=content)
+
     def media(self, id):
         request, db = current.request, self.auth.db
         media = db.wiki_media(id)
         if media:
             if self.manage_permissions:
                 page = db.wiki_page(media.wiki_page)
-                if not self.can_read(page): return self.not_authorized(page)
+                if not self.can_read(page):
+                    return self.not_authorized(page)
             request.args = [media.filename]
-            return current.response.download(request,db)
+            return current.response.download(request, db)
         else:
             raise HTTP(404)
-    def menu(self,controller='default',function='index'):
+
+    def menu(self, controller='default', function='index'):
         db = self.auth.db
         request = current.request
         menu_page = db.wiki_page(slug='wiki-menu')
         menu = []
         if menu_page:
-            tree = {'':menu}
+            tree = {'': menu}
             regex = re.compile('[\r\n\t]*(?P<base>(\s*\-\s*)+)(?P<title>\w.*?)\s+\>\s+(?P<link>\S+)')
             for match in regex.finditer(self.fix_hostname(menu_page.body)):
-                base = match.group('base').replace(' ','')
+                base = match.group('base').replace(' ', '')
                 title = match.group('title')
                 link = match.group('link')
                 if link.startswith('@'):
                     items = link[2:].split('/')
-                    if len(items)>3:
-                        link = URL(a=items[0] or None,c=items[1] or None,f=items[2] or None, args=items[3:])
-                parent = tree.get(base[1:],tree[''])
+                    if len(items) > 3:
+                        link = URL(a=items[0] or None, c=items[1] or None,
+                                   f=items[2] or None, args=items[3:])
+                parent = tree.get(base[1:], tree[''])
                 subtree = []
                 tree[base] = subtree
-                parent.append((current.T(title),False,link,subtree))
+                parent.append((current.T(title), False, link, subtree))
         if True:
             submenu = []
-            menu.append((current.T('[Wiki]'),None,None,submenu))
-            if URL() == URL(controller,function):
+            menu.append((current.T('[Wiki]'), None, None, submenu))
+            if URL() == URL(controller, function):
                 if not str(request.args(0)).startswith('_'):
                     slug = request.args(0) or 'index'
-                    mode=1
-                elif request.args(0)=='_edit':
+                    mode = 1
+                elif request.args(0) == '_edit':
                     slug = request.args(1) or 'index'
-                    mode=2
-                elif request.args(0)=='_editmedia':
+                    mode = 2
+                elif request.args(0) == '_editmedia':
                     slug = request.args(1) or 'index'
-                    mode=3
+                    mode = 3
                 else:
-                    mode=0
-                if mode in (2,3):
-                    submenu.append((current.T('View Page'),None,
-                    URL(controller,function,args=slug)))
-                if mode in (1,3):
-                    submenu.append((current.T('Edit Page'),None,
-                    URL(controller,function,args=('_edit',slug))))
-                if mode in (1,2):
-                    submenu.append((current.T('Edit Page Media'),None,
-                    URL(controller,function,args=('_editmedia',slug))))
+                    mode = 0
+                if mode in (2, 3):
+                    submenu.append((current.T('View Page'), None,
+                    URL(controller, function, args=slug)))
+                if mode in (1, 3):
+                    submenu.append((current.T('Edit Page'), None,
+                    URL(controller, function, args=('_edit', slug))))
+                if mode in (1, 2):
+                    submenu.append((current.T('Edit Page Media'), None,
+                    URL(controller, function, args=('_editmedia', slug))))
 
-            submenu.append((current.T('Create New Page'),None,
-                            URL(controller,function,args=('_create'))))
+            submenu.append((current.T('Create New Page'), None,
+                            URL(controller, function, args=('_create'))))
         if self.can_manage():
-            submenu.append((current.T('Manage Pages'),None,
-                            URL(controller,function,args=('_pages'))))
-            submenu.append((current.T('Edit Menu'),None,
-                            URL(controller,function,args=('_edit','wiki-menu'))))
-        submenu.append((current.T('Search Pages'),None,
-                        URL(controller,function,args=('_search'))))
+            submenu.append((current.T('Manage Pages'), None,
+                            URL(controller, function, args=('_pages'))))
+            submenu.append((current.T('Edit Menu'), None,
+                            URL(controller, function, args=('_edit', 'wiki-menu'))))
+        submenu.append((current.T('Search Pages'), None,
+                        URL(controller, function, args=('_search'))))
         return menu
 
-    def search(self,tags=None,query=None,cloud=True,preview=True,
-               limitby=(0,100),orderby=None):
-        if not self.can_search(): return self.not_authorized()
+    def search(self, tags=None, query=None, cloud=True, preview=True,
+               limitby=(0, 100), orderby=None):
+        if not self.can_search():
+            return self.not_authorized()
         request = current.request
         content = CAT()
         if tags is None and query is None:
-            form = FORM(INPUT(_name='q',requires=IS_NOT_EMPTY(),
+            form = FORM(INPUT(_name='q', requires=IS_NOT_EMPTY(),
                               value=request.vars.q),
-                        INPUT(_type="submit",_value=current.T('Search')),
+                        INPUT(_type="submit", _value=current.T('Search')),
                         _method='GET')
-            content.append(DIV(form,_class='w2p_wiki_form'))
+            content.append(DIV(form, _class='w2p_wiki_form'))
             if request.vars.q:
                 tags = [v.strip() for v in request.vars.q.split(',')]
                 tags = [v for v in tags if v]
         if tags or not query is None:
             db = self.auth.db
             count = db.wiki_tag.wiki_page.count()
-            fields = [db.wiki_page.id,db.wiki_page.slug,
-                      db.wiki_page.title,db.wiki_page.tags,
+            fields = [db.wiki_page.id, db.wiki_page.slug,
+                      db.wiki_page.title, db.wiki_page.tags,
                       db.wiki_page.can_read]
             if preview:
                 fields.append(db.wiki_page.body)
             if query is None:
-                query = (db.wiki_page.id==db.wiki_tag.wiki_page)&\
+                query = (db.wiki_page.id == db.wiki_tag.wiki_page) &\
                     (db.wiki_tag.name.belongs(tags))
-                query = query|db.wiki_page.title.contains(request.vars.q)
+                query = query | db.wiki_page.title.contains(request.vars.q)
             if self.restrict_search and not self.manage():
-                query = query&(db.wiki_page.created_by==self.auth.user_id)
+                query = query & (db.wiki_page.created_by == self.auth.user_id)
             pages = db(query).select(count,
-                *fields,**dict(orderby=orderby or ~count,
-                               groupby=reduce(lambda a,b:a|b,fields),
+                *fields, **dict(orderby=orderby or ~count,
+                               groupby=reduce(lambda a, b: a | b, fields),
                                distinct=True,
                                limitby=limitby))
-            if request.extension in ('html','load'):
+            if request.extension in ('html', 'load'):
                 if not pages:
                     content.append(DIV(current.T("No results"),
                                        _class='w2p_wiki_form'))
+
                 def link(t):
-                    return A(t,_href=URL(args='_search',vars=dict(q=t)))
-                items = [DIV(H3(A(p.wiki_page.title,_href=URL(
+                    return A(t, _href=URL(args='_search', vars=dict(q=t)))
+                items = [DIV(H3(A(p.wiki_page.title, _href=URL(
                                     args=p.wiki_page.slug))),
-                             MARKMIN(self.first_paragraph(p.wiki_page)) \
+                             MARKMIN(self.first_paragraph(p.wiki_page))
                                  if preview else '',
                              DIV(_class='w2p_wiki_tags',
-                                 *[link(t.strip()) for t in \
+                                 *[link(t.strip()) for t in
                                        p.wiki_page.tags or [] if t.strip()]),
                              _class='w2p_wiki_search_item')
                          for p in pages]
-                content.append(DIV(_class='w2p_wiki_pages',*items))
+                content.append(DIV(_class='w2p_wiki_pages', *items))
             else:
-                cloud=False
+                cloud = False
                 content = [p.wiki_page.as_dict() for p in pages]
         elif cloud:
             content.append(self.cloud()['content'])
-        if request.extension=='load':
+        if request.extension == 'load':
             return content
         return dict(content=content)
+
     def cloud(self):
         db = self.auth.db
         count = db.wiki_tag.wiki_page.count(distinct=True)
         ids = db(db.wiki_tag).select(
-            db.wiki_tag.name,count,
+            db.wiki_tag.name, count,
             distinct=True,
-            groupby = db.wiki_tag.name,
-            orderby = ~count, limitby=(0,20))
+            groupby=db.wiki_tag.name,
+            orderby=~count, limitby=(0, 20))
         if ids:
-            a,b = ids[0](count), ids[-1](count)
+            a, b = ids[0](count), ids[-1](count)
+
         def style(c):
-            STYLE ='padding:0 0.2em;line-height:%.2fem;font-size:%.2fem'
-            size = (1.5*(c-b)/max(a-b,1)+1.3)
-            return STYLE % (1.3,size)
+            STYLE = 'padding:0 0.2em;line-height:%.2fem;font-size:%.2fem'
+            size = (1.5 * (c - b) / max(a - b, 1) + 1.3)
+            return STYLE % (1.3, size)
         items = []
         for item in ids:
             items.append(A(item.wiki_tag.name,
@@ -5014,7 +5147,8 @@ class Wiki(object):
                            _href=URL(args='_search',
                                      vars=dict(q=item.wiki_tag.name))))
             items.append(' ')
-        return dict(content = DIV(_class='w2p_cloud',*items))
+        return dict(content=DIV(_class='w2p_cloud', *items))
+
     def preview(self, render):
         request = current.request
         return render(request.post_vars)
diff --git a/gluon/utf8.py b/gluon/utf8.py
index 5882c400..111327aa 100644
--- a/gluon/utf8.py
+++ b/gluon/utf8.py
@@ -14,18 +14,20 @@ Utilities and class for UTF8 strings managing
 import __builtin__
 __all__ = ['Utf8']
 
-repr_escape_tab={}
-for i in range(1,32): repr_escape_tab[i]=ur'\x%02x'%i
-repr_escape_tab[7]=u'\\a'
-repr_escape_tab[8]=u'\\b'
-repr_escape_tab[9]=u'\\t'
-repr_escape_tab[10]=u'\\n'
-repr_escape_tab[11]=u'\\v'
-repr_escape_tab[12]=u'\\f'
-repr_escape_tab[13]=u'\\r'
-repr_escape_tab[ord('\\')]=u'\\\\'
-repr_escape_tab2=repr_escape_tab.copy()
-repr_escape_tab2[ord('\'')]=u"\\'"
+repr_escape_tab = {}
+for i in range(1, 32):
+    repr_escape_tab[i] = ur'\x%02x' % i
+repr_escape_tab[7] = u'\\a'
+repr_escape_tab[8] = u'\\b'
+repr_escape_tab[9] = u'\\t'
+repr_escape_tab[10] = u'\\n'
+repr_escape_tab[11] = u'\\v'
+repr_escape_tab[12] = u'\\f'
+repr_escape_tab[13] = u'\\r'
+repr_escape_tab[ord('\\')] = u'\\\\'
+repr_escape_tab2 = repr_escape_tab.copy()
+repr_escape_tab2[ord('\'')] = u"\\'"
+
 
 def sort_key(s):
     """ Unicode Collation Algorithm (UCA) (http://www.unicode.org/reports/tr10/)
@@ -45,10 +47,11 @@ def sort_key(s):
     try:
         from contrib.pyuca import unicode_collator
         unicode_sort_key = unicode_collator.sort_key
-        sort_key=lambda s: unicode_sort_key(
-                unicode(s, 'utf-8') if isinstance(s, str) else s)
+        sort_key = lambda s: unicode_sort_key(
+            unicode(s, 'utf-8') if isinstance(s, str) else s)
     except:
-        sort_key=lambda s: (unicode(s, 'utf-8') if isinstance(s, str) else s).lower()
+        sort_key = lambda s: (
+            unicode(s, 'utf-8') if isinstance(s, str) else s).lower()
     return sort_key(s)
 
 
@@ -57,13 +60,16 @@ def ord(char):
 
         SUPPOSE that *char* is an utf-8 or unicode character only
     """
-    if isinstance(char, unicode): return __builtin__.ord(char)
+    if isinstance(char, unicode):
+        return __builtin__.ord(char)
     return __builtin__.ord(unicode(char, 'utf-8'))
 
+
 def chr(code):
     """ return utf8-character with *code* unicode id """
     return Utf8(unichr(code))
 
+
 def size(string):
     """ return length of utf-8 string in bytes
         NOTE! The length of correspondent utf-8
@@ -71,6 +77,7 @@ def size(string):
     """
     return Utf8(string).__size__()
 
+
 def truncate(string, length, dots='...'):
     """ returns string of length < *length* or truncate
         string with adding *dots* suffix to the string's end
@@ -85,570 +92,668 @@ def truncate(string, length, dots='...'):
     text = unicode(string, 'utf-8')
     dots = unicode(dots, 'utf-8') if isinstance(dots, str) else dots
     if len(text) > length:
-        text = text[:length-len(dots)] + dots
+        text = text[:length - len(dots)] + dots
     return str.__new__(Utf8, text.encode('utf-8'))
 
 
 class Utf8(str):
-   """
-   Class for utf8 string storing and manipulations
+    """
+    Class for utf8 string storing and manipulations
 
-   The base presupposition of this class usage is:
-   "ALL strings in the application are either of
-   utf-8 or unicode type, even when simple str
-   type is used. UTF-8 is only a "packed" version
-   of unicode, so Utf-8 and unicode strings are
-   interchangeable."
+    The base presupposition of this class usage is:
+    "ALL strings in the application are either of
+    utf-8 or unicode type, even when simple str
+    type is used. UTF-8 is only a "packed" version
+    of unicode, so Utf-8 and unicode strings are
+    interchangeable."
 
-   CAUTION! This class is slower than str/unicode!
-   Do NOT use it inside intensive loops. Simply
-   decode string(s) to unicode before loop and
-   encode it back to utf-8 string(s) after
-   intensive calculation.
+    CAUTION! This class is slower than str/unicode!
+    Do NOT use it inside intensive loops. Simply
+    decode string(s) to unicode before loop and
+    encode it back to utf-8 string(s) after
+    intensive calculation.
 
-   You can see the benefit of this class in doctests() below
-   """
-   def __new__(cls, content='', codepage='utf-8'):
-      if isinstance(content, unicode):
-         return str.__new__(cls, unicode.encode(content, 'utf-8'))
-      elif codepage in ('utf-8', 'utf8') or isinstance(content, cls):
-         return str.__new__(cls, content)
-      else:
-         return str.__new__(cls, unicode(content, codepage).encode('utf-8'))
+    You can see the benefit of this class in doctests() below
+    """
+    def __new__(cls, content='', codepage='utf-8'):
+        if isinstance(content, unicode):
+            return str.__new__(cls, unicode.encode(content, 'utf-8'))
+        elif codepage in ('utf-8', 'utf8') or isinstance(content, cls):
+            return str.__new__(cls, content)
+        else:
+            return str.__new__(cls, unicode(content, codepage).encode('utf-8'))
 
-   def __repr__(self):
-       r''' # note that we use raw strings to avoid having to use double back slashes below
-       NOTE! This function is a clone of web2py:gluon.languages.utf_repl() function
+    def __repr__(self):
+        r''' # note that we use raw strings to avoid having to use double back slashes below
+        NOTE! This function is a clone of web2py:gluon.languages.utf_repl() function
 
-       utf8.__repr__() works same as str.repr() when processing ascii string
-       >>> repr(Utf8('abc')) == repr(Utf8("abc")) == repr('abc') == repr("abc") == "'abc'"
-       True
-       >>> repr(Utf8('a"b"c')) == repr('a"b"c') == '\'a"b"c\''
-       True
-       >>> repr(Utf8("a'b'c")) == repr("a'b'c") == '"a\'b\'c"'
-       True
-       >>> repr(Utf8('a\'b"c')) == repr('a\'b"c') == repr(Utf8("a'b\"c")) == repr("a'b\"c") == '\'a\\\'b"c\''
-       True
-       >>> repr(Utf8('a\r\nb')) == repr('a\r\nb') == "'a\\r\\nb'" # Test for \r, \n
-       True
+        utf8.__repr__() works same as str.repr() when processing ascii string
+        >>> repr(Utf8('abc')) == repr(Utf8("abc")) == repr('abc') == repr("abc") == "'abc'"
+        True
+        >>> repr(Utf8('a"b"c')) == repr('a"b"c') == '\'a"b"c\''
+        True
+        >>> repr(Utf8("a'b'c")) == repr("a'b'c") == '"a\'b\'c"'
+        True
+        >>> repr(Utf8('a\'b"c')) == repr('a\'b"c') == repr(Utf8("a'b\"c")) == repr("a'b\"c") == '\'a\\\'b"c\''
+        True
+        >>> repr(Utf8('a\r\nb')) == repr('a\r\nb') == "'a\\r\\nb'" # Test for \r, \n
+        True
 
-       Unlike str.repr(), Utf8.__repr__() remains utf8 content when processing utf8 string
-       >>> repr(Utf8('中文字')) == repr(Utf8("中文字")) == "'中文字'" != repr('中文字')
-       True
-       >>> repr(Utf8('中"文"字')) == "'中\"文\"字'" != repr('中"文"字')
-       True
-       >>> repr(Utf8("中'文'字")) == '"中\'文\'字"' != repr("中'文'字")
-       True
-       >>> repr(Utf8('中\'文"字')) == repr(Utf8("中'文\"字")) == '\'中\\\'文"字\'' != repr('中\'文"字') == repr("中'文\"字")
-       True
-       >>> repr(Utf8('中\r\n文')) == "'中\\r\\n文'" != repr('中\r\n文') # Test for \r, \n
-       True
-       '''
-       if str.find(self,"'") >= 0 and str.find(self,'"') < 0: # only single quote exists
-           return '"'+unicode(self, 'utf-8').translate(repr_escape_tab).encode('utf-8')+'"'
-       else:
-           return "'"+unicode(self, 'utf-8').translate(repr_escape_tab2).encode('utf-8')+"'"
+        Unlike str.repr(), Utf8.__repr__() remains utf8 content when processing utf8 string
+        >>> repr(Utf8('中文字')) == repr(Utf8("中文字")) == "'中文字'" != repr('中文字')
+        True
+        >>> repr(Utf8('中"文"字')) == "'中\"文\"字'" != repr('中"文"字')
+        True
+        >>> repr(Utf8("中'文'字")) == '"中\'文\'字"' != repr("中'文'字")
+        True
+        >>> repr(Utf8('中\'文"字')) == repr(Utf8("中'文\"字")) == '\'中\\\'文"字\'' != repr('中\'文"字') == repr("中'文\"字")
+        True
+        >>> repr(Utf8('中\r\n文')) == "'中\\r\\n文'" != repr('中\r\n文') # Test for \r, \n
+        True
+        '''
+        if str.find(self, "'") >= 0 and str.find(self, '"') < 0:  # only single quote exists
+            return '"' + unicode(self, 'utf-8').translate(repr_escape_tab).encode('utf-8') + '"'
+        else:
+            return "'" + unicode(self, 'utf-8').translate(repr_escape_tab2).encode('utf-8') + "'"
 
-   def __size__(self):
-       """ length of utf-8 string in bytes """
-       return str.__len__(self)
+    def __size__(self):
+        """ length of utf-8 string in bytes """
+        return str.__len__(self)
 
-   def __contains__(self, other):      return str.__contains__(self, Utf8(other))
-   def __getitem__(self, index):       return str.__new__(Utf8, unicode(self, 'utf-8')[index].encode('utf-8'))
-   def __getslice__(self, begin, end): return str.__new__(Utf8, unicode(self, 'utf-8')[begin:end].encode('utf-8'))
+    def __contains__(self, other):
+        return str.__contains__(self, Utf8(other))
 
-   def __add__(self, other):  return str.__new__(Utf8, str.__add__(self, unicode.encode(other, 'utf-8')
-                                                        if isinstance(other, unicode) else other))
-   def __len__(self):         return len(unicode(self, 'utf-8'))
-   def __mul__(self, integer):return str.__new__(Utf8, str.__mul__(self, integer))
-   def __eq__(self, string):  return str.__eq__(self, Utf8(string))
-   def __ne__(self, string):  return str.__ne__(self, Utf8(string))
-   def capitalize(self):      return str.__new__(Utf8, unicode(self, 'utf-8').capitalize().encode('utf-8'))
-   def center(self, length):  return str.__new__(Utf8, unicode(self, 'utf-8').center(length).encode('utf-8'))
-   def upper(self):           return str.__new__(Utf8, unicode(self, 'utf-8').upper().encode('utf-8'))
-   def lower(self):           return str.__new__(Utf8, unicode(self, 'utf-8').lower().encode('utf-8'))
-   def title(self):           return str.__new__(Utf8, unicode(self, 'utf-8').title().encode('utf-8'))
-   def index(self, string):   return unicode(self, 'utf-8').index(string if isinstance(string,unicode) else unicode(string, 'utf-8'))
-   def isalnum(self):         return unicode(self, 'utf-8').isalnum()
-   def isalpha(self):         return unicode(self, 'utf-8').isalpha()
-   def isdigit(self):         return unicode(self, 'utf-8').isdigit()
-   def islower(self):         return unicode(self, 'utf-8').islower()
-   def isspace(self):         return unicode(self, 'utf-8').isspace()
-   def istitle(self):         return unicode(self, 'utf-8').istitle()
-   def isupper(self):         return unicode(self, 'utf-8').isupper()
-   def zfill(self, length):   return str.__new__(Utf8, unicode(self, 'utf-8').zfill(length).encode('utf-8'))
-   def join(self, iter):      return str.__new__(Utf8, str.join(self, [Utf8(c) for c in
-                                                                       list(unicode(iter, 'utf-8') if
-                                                                            isinstance(iter, str) else
-                                                                            iter)]))
-   def lstrip(self, chars=None):   return str.__new__(Utf8, str.lstrip(self, None if chars is None else Utf8(chars)))
-   def rstrip(self, chars=None ):  return str.__new__(Utf8, str.rstrip(self, None if chars is None else Utf8(chars)))
-   def strip(self,  chars=None):   return str.__new__(Utf8, str.strip(self, None if chars is None else Utf8(chars)))
-   def swapcase(self):             return str.__new__(Utf8, unicode(self, 'utf-8').swapcase().encode('utf-8'))
+    def __getitem__(self, index):
+        return str.__new__(Utf8, unicode(self, 'utf-8')[index].encode('utf-8'))
 
-   def count(self, sub, start=0, end=None):
-       unistr = unicode(self, 'utf-8')
-       return unistr.count(unicode(sub, 'utf-8') if isinstance(sub, str) else sub,
-                              start, len(unistr) if end is None else end)
-   def decode(self, encoding='utf-8', errors='strict'): return str.decode(self, encoding, errors)
-   def encode(self, encoding, errors='strict'): return unicode(self, 'utf-8').encode(encoding, errors)
-   def expandtabs(self, tabsize=8): return str.__new__(Utf8, unicode(self, 'utf-8').expandtabs(tabsize).encode('utf-8'))
-   def find(self, sub, start=None, end=None): return unicode(self, 'utf-8').find(unicode(sub, 'utf-8')
-                                                     if isinstance(sub, str) else sub, start, end)
-   def ljust(self, width, fillchar=' '): return str.__new__(Utf8, unicode(self, 'utf-8').ljust(width, unicode(fillchar, 'utf-8')
+    def __getslice__(self, begin, end):
+        return str.__new__(Utf8, unicode(self, 'utf-8')[begin:end].encode('utf-8'))
+
+    def __add__(self, other):
+        return str.__new__(Utf8, str.__add__(self, unicode.encode(other, 'utf-8')
+                                             if isinstance(other, unicode) else other))
+
+    def __len__(self):
+        return len(unicode(self, 'utf-8'))
+
+    def __mul__(self, integer):
+        return str.__new__(Utf8, str.__mul__(self, integer))
+
+    def __eq__(self, string):
+        return str.__eq__(self, Utf8(string))
+
+    def __ne__(self, string):
+        return str.__ne__(self, Utf8(string))
+
+    def capitalize(self):
+        return str.__new__(Utf8, unicode(self, 'utf-8').capitalize().encode('utf-8'))
+
+    def center(self, length):
+        return str.__new__(Utf8, unicode(self, 'utf-8').center(length).encode('utf-8'))
+
+    def upper(self):
+        return str.__new__(Utf8, unicode(self, 'utf-8').upper().encode('utf-8'))
+
+    def lower(self):
+        return str.__new__(Utf8, unicode(self, 'utf-8').lower().encode('utf-8'))
+
+    def title(self):
+        return str.__new__(Utf8, unicode(self, 'utf-8').title().encode('utf-8'))
+
+    def index(self, string):
+        return unicode(self, 'utf-8').index(string if isinstance(string, unicode) else unicode(string, 'utf-8'))
+
+    def isalnum(self):
+        return unicode(self, 'utf-8').isalnum()
+
+    def isalpha(self):
+        return unicode(self, 'utf-8').isalpha()
+
+    def isdigit(self):
+        return unicode(self, 'utf-8').isdigit()
+
+    def islower(self):
+        return unicode(self, 'utf-8').islower()
+
+    def isspace(self):
+        return unicode(self, 'utf-8').isspace()
+
+    def istitle(self):
+        return unicode(self, 'utf-8').istitle()
+
+    def isupper(self):
+        return unicode(self, 'utf-8').isupper()
+
+    def zfill(self, length):
+        return str.__new__(Utf8, unicode(self, 'utf-8').zfill(length).encode('utf-8'))
+
+    def join(self, iter):
+        return str.__new__(Utf8, str.join(self, [Utf8(c) for c in
+                                                 list(unicode(iter, 'utf-8') if
+                                                      isinstance(iter, str) else
+                                                      iter)]))
+
+    def lstrip(self, chars=None):
+        return str.__new__(Utf8, str.lstrip(self, None if chars is None else Utf8(chars)))
+
+    def rstrip(self, chars=None):
+        return str.__new__(Utf8, str.rstrip(self, None if chars is None else Utf8(chars)))
+
+    def strip(self, chars=None):
+        return str.__new__(Utf8, str.strip(self, None if chars is None else Utf8(chars)))
+
+    def swapcase(self):
+        return str.__new__(Utf8, unicode(self, 'utf-8').swapcase().encode('utf-8'))
+
+    def count(self, sub, start=0, end=None):
+        unistr = unicode(self, 'utf-8')
+        return unistr.count(
+            unicode(sub, 'utf-8') if isinstance(sub, str) else sub,
+            start, len(unistr) if end is None else end)
+
+    def decode(self, encoding='utf-8', errors='strict'):
+        return str.decode(self, encoding, errors)
+
+    def encode(self, encoding, errors='strict'):
+        return unicode(self, 'utf-8').encode(encoding, errors)
+
+    def expandtabs(self, tabsize=8):
+        return str.__new__(Utf8, unicode(self, 'utf-8').expandtabs(tabsize).encode('utf-8'))
+
+    def find(self, sub, start=None, end=None):
+        return unicode(self, 'utf-8').find(unicode(sub, 'utf-8')
+                                           if isinstance(sub, str) else sub, start, end)
+
+    def ljust(self, width, fillchar=' '):
+        return str.__new__(Utf8, unicode(self, 'utf-8').ljust(width, unicode(fillchar, 'utf-8')
                                                               if isinstance(fillchar, str) else fillchar).encode('utf-8'))
-   def partition(self, sep):
-       (head, sep, tail) = str.partition(self, Utf8(sep))
-       return ( str.__new__(Utf8, head),
-                str.__new__(Utf8, sep),
-                str.__new__(Utf8, tail) )
 
-   def replace(self, old, new, count=-1): return str.__new__(Utf8, str.replace(self, Utf8(old), Utf8(new), count))
-   def rfind(self, sub, start=None, end=None): return unicode(self, 'utf-8').rfind(unicode(sub, 'utf-8')
-                                                              if isinstance(sub, str) else sub, start, end)
-   def rindex(self, string):   return unicode(self, 'utf-8').rindex(string if isinstance(string,unicode)
-                                                                         else unicode(string, 'utf-8'))
-   def rjust(self, width, fillchar=' '): return str.__new__(Utf8, unicode(self, 'utf-8').rjust(width, unicode(fillchar, 'utf-8')
-                                                              if isinstance(fillchar, str) else fillchar).encode('utf-8'))
-   def rpartition(self, sep):
-       (head, sep, tail) = str.rpartition(self, Utf8(sep))
-       return ( str.__new__(Utf8, head),
+    def partition(self, sep):
+        (head, sep, tail) = str.partition(self, Utf8(sep))
+        return (str.__new__(Utf8, head),
                 str.__new__(Utf8, sep),
-                str.__new__(Utf8, tail) )
-   def rsplit(self, sep=None, maxsplit=-1): return [str.__new__(Utf8, part) for part in str.rsplit(self,
-                                                                 None if sep is None else Utf8(sep), maxsplit)]
-   def split(self, sep=None, maxsplit=-1): return [str.__new__(Utf8, part) for part in str.split(self,
-                                                                 None if sep is None else Utf8(sep), maxsplit)]
-   def splitlines(self,keepends=False): return [str.__new__(Utf8, part) for part in str.splitlines(self,keepends)]
-   def startswith(self, prefix, start=0, end=None):
-       unistr = unicode(self, 'utf-8')
-       if isinstance(prefix, tuple):
-           prefix = tuple(unicode(s,'utf-8') if isinstance(s, str) else s for s in prefix)
-       elif isinstance(prefix, str):
-           prefix = unicode(prefix, 'utf-8')
-       return unistr.startswith(prefix, start, len(unistr) if end is None else end)
-   def translate(self, table, deletechars=''):
-       if isinstance(table, dict):
-           return str.__new__(Utf8, unicode(self, 'utf-8').translate(table).encode('utf-8'))
-       else:
-           return str.__new__(Utf8, str.translate(self, table, deletechars))
-   def endswith(self, prefix, start=0, end=None):
-       unistr = unicode(self, 'utf-8')
-       if isinstance(prefix, tuple):
-           prefix = tuple(unicode(s,'utf-8') if isinstance(s, str) else s for s in prefix)
-       elif isinstance(prefix, str):
-           prefix = unicode(prefix, 'utf-8')
-       return unistr.endswith(prefix, start, len(unistr) if end is None else end)
-   if hasattr(str, 'format'): # Python 2.5 hasn't got str.format() method
-       def format(self, *args, **kwargs):
-           args = [unicode(s, 'utf-8') if isinstance(s, str) else s for s in args]
-           kwargs = dict((unicode(k, 'utf-8') if isinstance(k, str) else k,
+                str.__new__(Utf8, tail))
+
+    def replace(self, old, new, count=-1):
+        return str.__new__(Utf8, str.replace(self, Utf8(old), Utf8(new), count))
+
+    def rfind(self, sub, start=None, end=None):
+        return unicode(self, 'utf-8').rfind(unicode(sub, 'utf-8')
+                                            if isinstance(sub, str) else sub, start, end)
+
+    def rindex(self, string):
+        return unicode(self, 'utf-8').rindex(string if isinstance(string, unicode)
+                                             else unicode(string, 'utf-8'))
+
+    def rjust(self, width, fillchar=' '):
+        return str.__new__(Utf8, unicode(self, 'utf-8').rjust(width, unicode(fillchar, 'utf-8')
+                                                              if isinstance(fillchar, str) else fillchar).encode('utf-8'))
+
+    def rpartition(self, sep):
+        (head, sep, tail) = str.rpartition(self, Utf8(sep))
+        return (str.__new__(Utf8, head),
+                str.__new__(Utf8, sep),
+                str.__new__(Utf8, tail))
+
+    def rsplit(self, sep=None, maxsplit=-1):
+        return [str.__new__(Utf8, part) for part in str.rsplit(self,
+                                                               None if sep is None else Utf8(sep), maxsplit)]
+
+    def split(self, sep=None, maxsplit=-1):
+        return [str.__new__(Utf8, part) for part in str.split(self,
+                                                              None if sep is None else Utf8(sep), maxsplit)]
+
+    def splitlines(self, keepends=False):
+        return [str.__new__(Utf8, part) for part in str.splitlines(self, keepends)]
+
+    def startswith(self, prefix, start=0, end=None):
+        unistr = unicode(self, 'utf-8')
+        if isinstance(prefix, tuple):
+            prefix = tuple(unicode(
+                s, 'utf-8') if isinstance(s, str) else s for s in prefix)
+        elif isinstance(prefix, str):
+            prefix = unicode(prefix, 'utf-8')
+        return unistr.startswith(prefix, start, len(unistr) if end is None else end)
+
+    def translate(self, table, deletechars=''):
+        if isinstance(table, dict):
+            return str.__new__(Utf8, unicode(self, 'utf-8').translate(table).encode('utf-8'))
+        else:
+            return str.__new__(Utf8, str.translate(self, table, deletechars))
+
+    def endswith(self, prefix, start=0, end=None):
+        unistr = unicode(self, 'utf-8')
+        if isinstance(prefix, tuple):
+            prefix = tuple(unicode(
+                s, 'utf-8') if isinstance(s, str) else s for s in prefix)
+        elif isinstance(prefix, str):
+            prefix = unicode(prefix, 'utf-8')
+        return unistr.endswith(prefix, start, len(unistr) if end is None else end)
+    if hasattr(str, 'format'):  # Python 2.5 hasn't got str.format() method
+        def format(self, *args, **kwargs):
+            args = [unicode(
+                s, 'utf-8') if isinstance(s, str) else s for s in args]
+            kwargs = dict((unicode(k, 'utf-8') if isinstance(k, str) else k,
+                           unicode(v, 'utf-8') if isinstance(v, str) else v)
+                          for k, v in kwargs.iteritems())
+            return str.__new__(Utf8, unicode(self, 'utf-8').
+                               format(*args, **kwargs).encode('utf-8'))
+
+    def __mod__(self, right):
+        if isinstance(right, tuple):
+            right = tuple(unicode(v, 'utf-8') if isinstance(v, str) else v
+                          for v in right)
+        elif isinstance(right, dict):
+            right = dict((unicode(k, 'utf-8') if isinstance(k, str) else k,
                           unicode(v, 'utf-8') if isinstance(v, str) else v)
-                             for k,v in kwargs.iteritems())
-           return str.__new__(Utf8, unicode(self, 'utf-8').
-                                         format(*args, **kwargs).encode('utf-8'))
-   def __mod__(self, right):
-       if isinstance(right, tuple):
-           right = tuple(unicode(v, 'utf-8') if isinstance(v, str) else v
-                             for v in right)
-       elif isinstance(right, dict):
-           right = dict((unicode(k, 'utf-8') if isinstance(k, str) else k,
-                          unicode(v, 'utf-8') if isinstance(v, str) else v)
-                             for k,v in right.iteritems())
-       elif isinstance(right, str):
-           right = unicode(right, 'utf-8')
-       return str.__new__(Utf8, unicode(self, 'utf-8').__mod__(right).encode('utf-8'))
-   def __ge__(self, string): return sort_key(self) >= sort_key(string)
-   def __gt__(self, string): return sort_key(self) >  sort_key(string)
-   def __le__(self, string): return sort_key(self) <= sort_key(string)
-   def __lt__(self, string): return sort_key(self) <  sort_key(string)
+                         for k, v in right.iteritems())
+        elif isinstance(right, str):
+            right = unicode(right, 'utf-8')
+        return str.__new__(Utf8, unicode(self, 'utf-8').__mod__(right).encode('utf-8'))
+
+    def __ge__(self, string):
+        return sort_key(self) >= sort_key(string)
+
+    def __gt__(self, string):
+        return sort_key(self) > sort_key(string)
+
+    def __le__(self, string):
+        return sort_key(self) <= sort_key(string)
+
+    def __lt__(self, string):
+        return sort_key(self) < sort_key(string)
 
 
 if __name__ == '__main__':
     def doctests():
-       u"""
-       doctests:
-       >>> test_unicode=u'ПРоба Є PRobe'
-       >>> test_unicode_word=u'ПРоба'
-       >>> test_number_str='12345'
-       >>> test_unicode
-       u'\\u041f\\u0420\\u043e\\u0431\\u0430 \\u0404 PRobe'
-       >>> print test_unicode
-       ПРоба Є PRobe
-       >>> test_word=test_unicode_word.encode('utf-8')
-       >>> test_str=test_unicode.encode('utf-8')
-       >>> s=Utf8(test_str)
-       >>> s
-       'ПРоба Є PRobe'
-       >>> type(s)
-       <class '__main__.Utf8'>
-       >>> s == test_str
-       True
-       >>> len(test_str) # wrong length of utf8-string!
-       19
-       >>> len(test_unicode) # RIGHT!
-       13
-       >>> len(s) # RIGHT!
-       13
-       >>> size(test_str) # size of utf-8 string (in bytes) == len(str)
-       19
-       >>> size(test_unicode) # size of unicode string in bytes (packed to utf-8 string)
-       19
-       >>> size(s) # size of utf-8 string in bytes
-       19
-       >>> try: # utf-8 is a multibyte string. Convert it to unicode for use with builtin ord()
-       ...     __builtin__.ord('б')  #  ascii string
-       ... except Exception, e:
-       ...     print 'Exception:', e
-       Exception: ord() expected a character, but string of length 2 found
-       >>> ord('б') # utf8.ord() is used(!!!)
-       1073
-       >>> ord(u'б') # utf8.ord() is used(!!!)
-       1073
-       >>> ord(s[3])  # utf8.ord() is used(!!!)
-       1073
-       >>> chr(ord(s[3])) # utf8.chr() and utf8.chr() is used(!!!)
-       'б'
-       >>> type(chr(1073))  # utf8.chr() is used(!!!)
-       <class '__main__.Utf8'>
-       >>> s=Utf8(test_unicode)
-       >>> s
-       'ПРоба Є PRobe'
-       >>> s == test_str
-       True
-       >>> test_str == s
-       True
-       >>> s == test_unicode
-       True
-       >>> test_unicode == s
-       True
-       >>> print test_str.upper() # only ASCII characters uppered
-       ПРоба Є PROBE
-       >>> print test_unicode.upper() # unicode gives right result
-       ПРОБА Є PROBE
-       >>> s.upper() # utf8 class use unicode.upper()
-       'ПРОБА Є PROBE'
-       >>> type(s.upper())
-       <class '__main__.Utf8'>
-       >>> s.lower()
-       'проба є probe'
-       >>> type(s.lower())
-       <class '__main__.Utf8'>
-       >>> s.capitalize()
-       'Проба є probe'
-       >>> type(s.capitalize())
-       <class '__main__.Utf8'>
-       >>> len(s)
-       13
-       >>> len(test_unicode)
-       13
-       >>> s+'. Probe is проба'
-       'ПРоба Є PRobe. Probe is проба'
-       >>> type(s+'. Probe is проба')
-       <class '__main__.Utf8'>
-       >>> s+u'. Probe is проба'
-       'ПРоба Є PRobe. Probe is проба'
-       >>> type(s+u'. Probe is проба')
-       <class '__main__.Utf8'>
-       >>> s+s
-       'ПРоба Є PRobeПРоба Є PRobe'
-       >>> type(s+s)
-       <class '__main__.Utf8'>
-       >>> a=s
-       >>> a+=s
-       >>> a+=test_unicode
-       >>> a+=test_str
-       >>> a
-       'ПРоба Є PRobeПРоба Є PRobeПРоба Є PRobeПРоба Є PRobe'
-       >>> type(a)
-       <class '__main__.Utf8'>
-       >>> s*3
-       'ПРоба Є PRobeПРоба Є PRobeПРоба Є PRobe'
-       >>> type(s*3)
-       <class '__main__.Utf8'>
-       >>> a=Utf8("-проба-")
-       >>> a*=10
-       >>> a
-       '-проба--проба--проба--проба--проба--проба--проба--проба--проба--проба-'
-       >>> type(a)
-       <class '__main__.Utf8'>
-       >>> print "'"+test_str.center(17)+"'" # WRONG RESULT!
-       'ПРоба Є PRobe'
-       >>> s.center(17) # RIGHT!
-       '  ПРоба Є PRobe  '
-       >>> type(s.center(17))
-       <class '__main__.Utf8'>
-       >>> (test_word+test_number_str).isalnum() # WRONG RESULT! non ASCII chars are detected as non alpha
-       False
-       >>> Utf8(test_word+test_number_str).isalnum()
-       True
-       >>> s.isalnum()
-       False
-       >>> test_word.isalpha() # WRONG RESULT! Non ASCII characters are detected as non alpha
-       False
-       >>> Utf8(test_word).isalpha() # RIGHT!
-       True
-       >>> s.lower().islower()
-       True
-       >>> s.upper().isupper()
-       True
-       >>> print test_str.zfill(17) # WRONG RESULT!
-       ПРоба Є PRobe
-       >>> s.zfill(17) # RIGHT!
-       '0000ПРоба Є PRobe'
-       >>> type(s.zfill(17))
-       <class '__main__.Utf8'>
-       >>> s.istitle()
-       False
-       >>> s.title().istitle()
-       True
-       >>> Utf8('1234').isdigit()
-       True
-       >>> Utf8(' \t').isspace()
-       True
-       >>> s.join('•|•')
-       '•ПРоба Є PRobe|ПРоба Є PRobe•'
-       >>> s.join((str('(utf8 тест1)'), unicode('(unicode тест2)','utf-8'), '(ascii test3)'))
-       '(utf8 тест1)ПРоба Є PRobe(unicode тест2)ПРоба Є PRobe(ascii test3)'
-       >>> type(s)
-       <class '__main__.Utf8'>
-       >>> s==test_str
-       True
-       >>> s==test_unicode
-       True
-       >>> s.swapcase()
-       'прОБА є prOBE'
-       >>> type(s.swapcase())
-       <class '__main__.Utf8'>
-       >>> truncate(s, 10)
-       'ПРоба Є...'
-       >>> truncate(s, 20)
-       'ПРоба Є PRobe'
-       >>> truncate(s, 10, '•••') # utf-8 string as *dots*
-       'ПРоба Є•••'
-       >>> truncate(s, 10, u'®') # you can use unicode string as *dots*
-       'ПРоба Є P®'
-       >>> type(truncate(s, 10))
-       <class '__main__.Utf8'>
-       >>> Utf8(s.encode('koi8-u'), 'koi8-u')
-       'ПРоба Є PRobe'
-       >>> s.decode() # convert utf-8 string to unicode
-       u'\\u041f\\u0420\\u043e\\u0431\\u0430 \\u0404 PRobe'
-       >>> a='про\\tba'
-       >>> str_tmp=a.expandtabs()
-       >>> utf8_tmp=Utf8(a).expandtabs()
-       >>> utf8_tmp.replace(' ','.') # RIGHT! (default tabsize is 8)
-       'про.....ba'
-       >>> utf8_tmp.index('b')
-       8
-       >>> print "'"+str_tmp.replace(' ','.')+"'" # WRONG STRING LENGTH!
-       'про..ba'
-       >>> str_tmp.index('b') # WRONG index of 'b' character
-       8
-       >>> print "'"+a.expandtabs(4).replace(' ','.')+"'" # WRONG RESULT!
-       'про..ba'
-       >>> Utf8(a).expandtabs(4).replace(' ','.') # RIGHT!
-       'про.ba'
-       >>> s.find('Є')
-       6
-       >>> s.find(u'Є')
-       6
-       >>> s.find(' ', 6)
-       7
-       >>> s.rfind(' ')
-       7
-       >>> s.partition('Є')
-       ('ПРоба ', 'Є', ' PRobe')
-       >>> s.partition(u'Є')
-       ('ПРоба ', 'Є', ' PRobe')
-       >>> (a,b,c) = s.partition('Є')
-       >>> type(a), type(b), type(c)
-       (<class '__main__.Utf8'>, <class '__main__.Utf8'>, <class '__main__.Utf8'>)
-       >>> s.partition(' ')
-       ('ПРоба', ' ', 'Є PRobe')
-       >>> s.rpartition(' ')
-       ('ПРоба Є', ' ', 'PRobe')
-       >>> s.index('Є')
-       6
-       >>> s.rindex(u'Є')
-       6
-       >>> s.index(' ')
-       5
-       >>> s.rindex(' ')
-       7
-       >>> a=Utf8('а б ц д е а б ц д е а\\tб ц д е')
-       >>> a.split()
-       ['а', 'б', 'ц', 'д', 'е', 'а', 'б', 'ц', 'д', 'е', 'а', 'б', 'ц', 'д', 'е']
-       >>> a.rsplit()
-       ['а', 'б', 'ц', 'д', 'е', 'а', 'б', 'ц', 'д', 'е', 'а', 'б', 'ц', 'д', 'е']
-       >>> a.expandtabs().split('б')
-       ['а ', ' ц д е а ', ' ц д е а   ', ' ц д е']
-       >>> a.expandtabs().rsplit('б')
-       ['а ', ' ц д е а ', ' ц д е а   ', ' ц д е']
-       >>> a.expandtabs().split(u'б', 1)
-       ['а ', ' ц д е а б ц д е а   б ц д е']
-       >>> a.expandtabs().rsplit(u'б', 1)
-       ['а б ц д е а б ц д е а   ', ' ц д е']
-       >>> a=Utf8("рядок1\\nрядок2\\nрядок3")
-       >>> a.splitlines()
-       ['рядок1', 'рядок2', 'рядок3']
-       >>> a.splitlines(True)
-       ['рядок1\\n', 'рядок2\\n', 'рядок3']
-       >>> s[6]
-       'Є'
-       >>> s[0]
-       'П'
-       >>> s[-1]
-       'e'
-       >>> s[:10]
-       'ПРоба Є PR'
-       >>> s[2:-2:2]
-       'оаЄPo'
-       >>> s[::-1]
-       'eboRP Є абоРП'
-       >>> s.startswith('ПР')
-       True
-       >>> s.startswith(('ПР', u'об'),0)
-       True
-       >>> s.startswith(u'об', 2, 4)
-       True
-       >>> s.endswith('be')
-       True
-       >>> s.endswith(('be', 'PR', u'Є'))
-       True
-       >>> s.endswith('PR', 8, 10)
-       True
-       >>> s.endswith('Є', -7, -6)
-       True
-       >>> s.count(' ')
-       2
-       >>> s.count(' ',6)
-       1
-       >>> s.count(u'Є')
-       1
-       >>> s.count('Є', 0, 5)
-       0
-       >>> Utf8("Parameters: '%(проба)s', %(probe)04d, %(проба2)s") % { u"проба": s,
-       ...      "not used": "???", "probe":  2, "проба2": u"ПРоба Probe" }
-       "Parameters: 'ПРоба Є PRobe', 0002, ПРоба Probe"
-       >>> a=Utf8(u"Параметр: (%s)-(%s)-[%s]")
-       >>> a%=(s, s[::-1], 1000)
-       >>> a
-       'Параметр: (ПРоба Є PRobe)-(eboRP Є абоРП)-[1000]'
-       >>> if hasattr(Utf8,  'format'):
-       ...     Utf8("Проба <{0}>, {1}, {param1}, {param2}").format(s, u"中文字",
-       ...           param1="барабан", param2=1000) == 'Проба <ПРоба Є PRobe>, 中文字, барабан, 1000'
-       ... else: # format() method is not used in python with version <2.6:
-       ...     print True
-       True
-       >>> u'Б'<u'Ї' # WRONG ORDER!
-       False
-       >>> 'Б'<'Ї' # WRONG ORDER!
-       False
-       >>> Utf8('Б')<'Ї' # RIGHT!
-       True
-       >>> u'д'>u'ґ' # WRONG ORDER!
-       False
-       >>> Utf8('д')>Utf8('ґ') # RIGHT!
-       True
-       >>> u'є'<=u'ж' # WRONG ORDER!
-       False
-       >>> Utf8('є')<=u'ж' # RIGHT!
-       True
-       >>> Utf8('є')<=u'є'
-       True
-       >>> u'Ї'>=u'И' # WRONG ORDER!
-       False
-       >>> Utf8(u'Ї') >= u'И' # RIGHT
-       True
-       >>> Utf8('Є') >= 'Є'
-       True
-       >>> a="яжертиуіопшщїасдфгґхйклчєзьцвбнмюЯЖЕРТИУІОПШЩЇАСДФГҐХЙКЛЧЗЬЦВБНМЮЄ"  # str type
-       >>> b=u"яжертиуіопшщїасдфгґхйклчєзьцвбнмюЯЖЕРТИУІОПШЩЇАСДФГҐХЙКЛЧЗЬЦВБНМЮЄ" # unicode type
-       >>> c=Utf8("яжертиуіопшщїасдфгґхйклчєзьцвбнмюЯЖЕРТИУІОПШЩЇАСДФГҐХЙКЛЧЗЬЦВБНМЮЄ") # utf8 class
-       >>> result = "".join(sorted(a))
-       >>> result[0:20] # result is not utf8 string, because bytes, not utf8-characters were sorted
-       '\\x80\\x81\\x82\\x83\\x84\\x84\\x85\\x86\\x86\\x87\\x87\\x88\\x89\\x8c\\x8e\\x8f\\x90\\x90\\x91\\x91'
-       >>> try:
-       ...   unicode(result, 'utf-8') # try to convert result (utf-8?) to unicode
-       ... except Exception, e:
-       ...    print 'Exception:', e
-       Exception: 'utf8' codec can't decode byte 0x80 in position 0: unexpected code byte
-       >>> try: # FAILED! (working with bytes, not with utf8-charactes)
-       ...    "".join( sorted(a, key=sort_key) ) # utf8.sort_key may be used with utf8 or unicode strings only!
-       ... except Exception, e:
-       ...    print 'Exception:', e
-       Exception: 'utf8' codec can't decode byte 0xd1 in position 0: unexpected end of data
-       >>> print "".join( sorted(Utf8(a))) # converting *a* to unicode or utf8-string gives us correct result
-       аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
-       >>> print u"".join( sorted(b) ) # WRONG ORDER! Default sort key is used
-       ЄІЇАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгдежзийклмнопрстуфхцчшщьюяєіїҐґ
-       >>> print u"".join( sorted(b, key=sort_key) ) # RIGHT ORDER! utf8.sort_key is used
-       аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
-       >>> print "".join( sorted(c) ) # RIGHT ORDER! Utf8 "rich comparison" methods are used
-       аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
-       >>> print "".join( sorted(c, key=sort_key) ) # RIGHT ORDER! utf8.sort_key is used
-       аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
-       >>> Utf8().join(sorted(c.decode(), key=sort_key)) # convert to unicode for better performance
-       'аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ'
-       >>> for result in sorted(["Іа", "Астро", u"гала", Utf8("Гоша"), "Єва", "шовк", "аякс", "Їжа",
-       ...                       "ґанок", Utf8("Дар'я"), "білінг", "веб", u"Жужа", "проба", u"тест",
-       ...                       "абетка", "яблуко", "Юляся", "Київ", "лимонад", "ложка", "Матриця",
-       ...                      ], key=sort_key):
-       ...     print result.ljust(20), type(result)
-       абетка         <type 'str'>
-       Астро           <type 'str'>
-       аякс             <type 'str'>
-       білінг         <type 'str'>
-       веб               <type 'str'>
-       гала                 <type 'unicode'>
-       ґанок           <type 'str'>
-       Гоша                 <class '__main__.Utf8'>
-       Дар'я                <class '__main__.Utf8'>
-       Єва               <type 'str'>
-       Жужа                 <type 'unicode'>
-       Іа                 <type 'str'>
-       Їжа               <type 'str'>
-       Київ             <type 'str'>
-       лимонад       <type 'str'>
-       ложка           <type 'str'>
-       Матриця       <type 'str'>
-       проба           <type 'str'>
-       тест                 <type 'unicode'>
-       шовк             <type 'str'>
-       Юляся           <type 'str'>
-       яблуко         <type 'str'>
-       >>> a=Utf8("中文字")
-       >>> L=list(a)
-       >>> L
-       ['中', '文', '字']
-       >>> a="".join(L)
-       >>> print a
-       中文字
-       >>> type(a)
-       <type 'str'>
-       >>> a="中文字"  # standard str type
-       >>> L=list(a)
-       >>> L
-       ['\\xe4', '\\xb8', '\\xad', '\\xe6', '\\x96', '\\x87', '\\xe5', '\\xad', '\\x97']
-       >>> from string import maketrans
-       >>> str_tab=maketrans('PRobe','12345')
-       >>> unicode_tab={ord(u'П'):ord(u'Ж'),
-       ...              ord(u'Р')      : u'Ш',
-       ...              ord(Utf8('о')) : None,  # utf8.ord() is used
-       ...              ord('б')       : None,  # -//-//-
-       ...              ord(u'а')      : u"中文字",
-       ...              ord(u'Є')      : Utf8('•').decode(), # only unicode type is supported
-       ...             }
-       >>> s.translate(unicode_tab).translate(str_tab, deletechars=' ')
-       'ЖШ中文字•12345'
-       """
-       import sys
-       reload(sys)
-       sys.setdefaultencoding("UTF-8")
-       import doctest
-       print "DOCTESTS STARTED..."
-       doctest.testmod()
-       print "DOCTESTS FINISHED"
+        u"""
+        doctests:
+        >>> test_unicode=u'ПРоба Є PRobe'
+        >>> test_unicode_word=u'ПРоба'
+        >>> test_number_str='12345'
+        >>> test_unicode
+        u'\\u041f\\u0420\\u043e\\u0431\\u0430 \\u0404 PRobe'
+        >>> print test_unicode
+        ПРоба Є PRobe
+        >>> test_word=test_unicode_word.encode('utf-8')
+        >>> test_str=test_unicode.encode('utf-8')
+        >>> s=Utf8(test_str)
+        >>> s
+        'ПРоба Є PRobe'
+        >>> type(s)
+        <class '__main__.Utf8'>
+        >>> s == test_str
+        True
+        >>> len(test_str) # wrong length of utf8-string!
+        19
+        >>> len(test_unicode) # RIGHT!
+        13
+        >>> len(s) # RIGHT!
+        13
+        >>> size(test_str) # size of utf-8 string (in bytes) == len(str)
+        19
+        >>> size(test_unicode) # size of unicode string in bytes (packed to utf-8 string)
+        19
+        >>> size(s) # size of utf-8 string in bytes
+        19
+        >>> try: # utf-8 is a multibyte string. Convert it to unicode for use with builtin ord()
+        ...     __builtin__.ord('б')  #  ascii string
+        ... except Exception, e:
+        ...     print 'Exception:', e
+        Exception: ord() expected a character, but string of length 2 found
+        >>> ord('б') # utf8.ord() is used(!!!)
+        1073
+        >>> ord(u'б') # utf8.ord() is used(!!!)
+        1073
+        >>> ord(s[3])  # utf8.ord() is used(!!!)
+        1073
+        >>> chr(ord(s[3])) # utf8.chr() and utf8.chr() is used(!!!)
+        'б'
+        >>> type(chr(1073))  # utf8.chr() is used(!!!)
+        <class '__main__.Utf8'>
+        >>> s=Utf8(test_unicode)
+        >>> s
+        'ПРоба Є PRobe'
+        >>> s == test_str
+        True
+        >>> test_str == s
+        True
+        >>> s == test_unicode
+        True
+        >>> test_unicode == s
+        True
+        >>> print test_str.upper() # only ASCII characters uppered
+        ПРоба Є PROBE
+        >>> print test_unicode.upper() # unicode gives right result
+        ПРОБА Є PROBE
+        >>> s.upper() # utf8 class use unicode.upper()
+        'ПРОБА Є PROBE'
+        >>> type(s.upper())
+        <class '__main__.Utf8'>
+        >>> s.lower()
+        'проба є probe'
+        >>> type(s.lower())
+        <class '__main__.Utf8'>
+        >>> s.capitalize()
+        'Проба є probe'
+        >>> type(s.capitalize())
+        <class '__main__.Utf8'>
+        >>> len(s)
+        13
+        >>> len(test_unicode)
+        13
+        >>> s+'. Probe is проба'
+        'ПРоба Є PRobe. Probe is проба'
+        >>> type(s+'. Probe is проба')
+        <class '__main__.Utf8'>
+        >>> s+u'. Probe is проба'
+        'ПРоба Є PRobe. Probe is проба'
+        >>> type(s+u'. Probe is проба')
+        <class '__main__.Utf8'>
+        >>> s+s
+        'ПРоба Є PRobeПРоба Є PRobe'
+        >>> type(s+s)
+        <class '__main__.Utf8'>
+        >>> a=s
+        >>> a+=s
+        >>> a+=test_unicode
+        >>> a+=test_str
+        >>> a
+        'ПРоба Є PRobeПРоба Є PRobeПРоба Є PRobeПРоба Є PRobe'
+        >>> type(a)
+        <class '__main__.Utf8'>
+        >>> s*3
+        'ПРоба Є PRobeПРоба Є PRobeПРоба Є PRobe'
+        >>> type(s*3)
+        <class '__main__.Utf8'>
+        >>> a=Utf8("-проба-")
+        >>> a*=10
+        >>> a
+        '-проба--проба--проба--проба--проба--проба--проба--проба--проба--проба-'
+        >>> type(a)
+        <class '__main__.Utf8'>
+        >>> print "'"+test_str.center(17)+"'" # WRONG RESULT!
+        'ПРоба Є PRobe'
+        >>> s.center(17) # RIGHT!
+        '  ПРоба Є PRobe  '
+        >>> type(s.center(17))
+        <class '__main__.Utf8'>
+        >>> (test_word+test_number_str).isalnum() # WRONG RESULT! non ASCII chars are detected as non alpha
+        False
+        >>> Utf8(test_word+test_number_str).isalnum()
+        True
+        >>> s.isalnum()
+        False
+        >>> test_word.isalpha() # WRONG RESULT! Non ASCII characters are detected as non alpha
+        False
+        >>> Utf8(test_word).isalpha() # RIGHT!
+        True
+        >>> s.lower().islower()
+        True
+        >>> s.upper().isupper()
+        True
+        >>> print test_str.zfill(17) # WRONG RESULT!
+        ПРоба Є PRobe
+        >>> s.zfill(17) # RIGHT!
+        '0000ПРоба Є PRobe'
+        >>> type(s.zfill(17))
+        <class '__main__.Utf8'>
+        >>> s.istitle()
+        False
+        >>> s.title().istitle()
+        True
+        >>> Utf8('1234').isdigit()
+        True
+        >>> Utf8(' \t').isspace()
+        True
+        >>> s.join('•|•')
+        '•ПРоба Є PRobe|ПРоба Є PRobe•'
+        >>> s.join((str('(utf8 тест1)'), unicode('(unicode тест2)','utf-8'), '(ascii test3)'))
+        '(utf8 тест1)ПРоба Є PRobe(unicode тест2)ПРоба Є PRobe(ascii test3)'
+        >>> type(s)
+        <class '__main__.Utf8'>
+        >>> s==test_str
+        True
+        >>> s==test_unicode
+        True
+        >>> s.swapcase()
+        'прОБА є prOBE'
+        >>> type(s.swapcase())
+        <class '__main__.Utf8'>
+        >>> truncate(s, 10)
+        'ПРоба Є...'
+        >>> truncate(s, 20)
+        'ПРоба Є PRobe'
+        >>> truncate(s, 10, '•••') # utf-8 string as *dots*
+        'ПРоба Є•••'
+        >>> truncate(s, 10, u'®') # you can use unicode string as *dots*
+        'ПРоба Є P®'
+        >>> type(truncate(s, 10))
+        <class '__main__.Utf8'>
+        >>> Utf8(s.encode('koi8-u'), 'koi8-u')
+        'ПРоба Є PRobe'
+        >>> s.decode() # convert utf-8 string to unicode
+        u'\\u041f\\u0420\\u043e\\u0431\\u0430 \\u0404 PRobe'
+        >>> a='про\\tba'
+        >>> str_tmp=a.expandtabs()
+        >>> utf8_tmp=Utf8(a).expandtabs()
+        >>> utf8_tmp.replace(' ','.') # RIGHT! (default tabsize is 8)
+        'про.....ba'
+        >>> utf8_tmp.index('b')
+        8
+        >>> print "'"+str_tmp.replace(' ','.')+"'" # WRONG STRING LENGTH!
+        'про..ba'
+        >>> str_tmp.index('b') # WRONG index of 'b' character
+        8
+        >>> print "'"+a.expandtabs(4).replace(' ','.')+"'" # WRONG RESULT!
+        'про..ba'
+        >>> Utf8(a).expandtabs(4).replace(' ','.') # RIGHT!
+        'про.ba'
+        >>> s.find('Є')
+        6
+        >>> s.find(u'Є')
+        6
+        >>> s.find(' ', 6)
+        7
+        >>> s.rfind(' ')
+        7
+        >>> s.partition('Є')
+        ('ПРоба ', 'Є', ' PRobe')
+        >>> s.partition(u'Є')
+        ('ПРоба ', 'Є', ' PRobe')
+        >>> (a,b,c) = s.partition('Є')
+        >>> type(a), type(b), type(c)
+        (<class '__main__.Utf8'>, <class '__main__.Utf8'>, <class '__main__.Utf8'>)
+        >>> s.partition(' ')
+        ('ПРоба', ' ', 'Є PRobe')
+        >>> s.rpartition(' ')
+        ('ПРоба Є', ' ', 'PRobe')
+        >>> s.index('Є')
+        6
+        >>> s.rindex(u'Є')
+        6
+        >>> s.index(' ')
+        5
+        >>> s.rindex(' ')
+        7
+        >>> a=Utf8('а б ц д е а б ц д е а\\tб ц д е')
+        >>> a.split()
+        ['а', 'б', 'ц', 'д', 'е', 'а', 'б', 'ц', 'д',
+            'е', 'а', 'б', 'ц', 'д', 'е']
+        >>> a.rsplit()
+        ['а', 'б', 'ц', 'д', 'е', 'а', 'б', 'ц', 'д',
+            'е', 'а', 'б', 'ц', 'д', 'е']
+        >>> a.expandtabs().split('б')
+        ['а ', ' ц д е а ', ' ц д е а   ', ' ц д е']
+        >>> a.expandtabs().rsplit('б')
+        ['а ', ' ц д е а ', ' ц д е а   ', ' ц д е']
+        >>> a.expandtabs().split(u'б', 1)
+        ['а ', ' ц д е а б ц д е а   б ц д е']
+        >>> a.expandtabs().rsplit(u'б', 1)
+        ['а б ц д е а б ц д е а   ', ' ц д е']
+        >>> a=Utf8("рядок1\\nрядок2\\nрядок3")
+        >>> a.splitlines()
+        ['рядок1', 'рядок2', 'рядок3']
+        >>> a.splitlines(True)
+        ['рядок1\\n', 'рядок2\\n', 'рядок3']
+        >>> s[6]
+        'Є'
+        >>> s[0]
+        'П'
+        >>> s[-1]
+        'e'
+        >>> s[:10]
+        'ПРоба Є PR'
+        >>> s[2:-2:2]
+        'оаЄPo'
+        >>> s[::-1]
+        'eboRP Є абоРП'
+        >>> s.startswith('ПР')
+        True
+        >>> s.startswith(('ПР', u'об'),0)
+        True
+        >>> s.startswith(u'об', 2, 4)
+        True
+        >>> s.endswith('be')
+        True
+        >>> s.endswith(('be', 'PR', u'Є'))
+        True
+        >>> s.endswith('PR', 8, 10)
+        True
+        >>> s.endswith('Є', -7, -6)
+        True
+        >>> s.count(' ')
+        2
+        >>> s.count(' ',6)
+        1
+        >>> s.count(u'Є')
+        1
+        >>> s.count('Є', 0, 5)
+        0
+        >>> Utf8(
+            "Parameters: '%(проба)s', %(probe)04d, %(проба2)s") % { u"проба": s,
+        ...      "not used": "???", "probe":  2, "проба2": u"ПРоба Probe" }
+        "Parameters: 'ПРоба Є PRobe', 0002, ПРоба Probe"
+        >>> a=Utf8(u"Параметр: (%s)-(%s)-[%s]")
+        >>> a%=(s, s[::-1], 1000)
+        >>> a
+        'Параметр: (ПРоба Є PRobe)-(eboRP Є абоРП)-[1000]'
+        >>> if hasattr(Utf8,  'format'):
+        ...     Utf8("Проба <{0}>, {1}, {param1}, {param2}").format(s, u"中文字",
+        ...           param1="барабан", param2=1000) == 'Проба <ПРоба Є PRobe>, 中文字, барабан, 1000'
+        ... else: # format() method is not used in python with version <2.6:
+        ...     print True
+        True
+        >>> u'Б'<u'Ї' # WRONG ORDER!
+        False
+        >>> 'Б'<'Ї' # WRONG ORDER!
+        False
+        >>> Utf8('Б')<'Ї' # RIGHT!
+        True
+        >>> u'д'>u'ґ' # WRONG ORDER!
+        False
+        >>> Utf8('д')>Utf8('ґ') # RIGHT!
+        True
+        >>> u'є'<=u'ж' # WRONG ORDER!
+        False
+        >>> Utf8('є')<=u'ж' # RIGHT!
+        True
+        >>> Utf8('є')<=u'є'
+        True
+        >>> u'Ї'>=u'И' # WRONG ORDER!
+        False
+        >>> Utf8(u'Ї') >= u'И' # RIGHT
+        True
+        >>> Utf8('Є') >= 'Є'
+        True
+        >>> a="яжертиуіопшщїасдфгґхйклчєзьцвбнмюЯЖЕРТИУІОПШЩЇАСДФГҐХЙКЛЧЗЬЦВБНМЮЄ"  # str type
+        >>> b=u"яжертиуіопшщїасдфгґхйклчєзьцвбнмюЯЖЕРТИУІОПШЩЇАСДФГҐХЙКЛЧЗЬЦВБНМЮЄ" # unicode type
+        >>> c=Utf8("яжертиуіопшщїасдфгґхйклчєзьцвбнмюЯЖЕРТИУІОПШЩЇАСДФГҐХЙКЛЧЗЬЦВБНМЮЄ") # utf8 class
+        >>> result = "".join(sorted(a))
+        >>> result[0:20] # result is not utf8 string, because bytes, not utf8-characters were sorted
+        '\\x80\\x81\\x82\\x83\\x84\\x84\\x85\\x86\\x86\\x87\\x87\\x88\\x89\\x8c\\x8e\\x8f\\x90\\x90\\x91\\x91'
+        >>> try:
+        ...   unicode(result, 'utf-8') # try to convert result (utf-8?) to unicode
+        ... except Exception, e:
+        ...    print 'Exception:', e
+        Exception: 'utf8' codec can't decode byte 0x80 in position 0: unexpected code byte
+        >>> try: # FAILED! (working with bytes, not with utf8-charactes)
+        ...    "".join( sorted(a, key=sort_key) ) # utf8.sort_key may be used with utf8 or unicode strings only!
+        ... except Exception, e:
+        ...    print 'Exception:', e
+        Exception: 'utf8' codec can't decode byte 0xd1 in position 0: unexpected end of data
+        >>> print "".join( sorted(Utf8(a))) # converting *a* to unicode or utf8-string gives us correct result
+        аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
+        >>> print u"".join( sorted(b) ) # WRONG ORDER! Default sort key is used
+        ЄІЇАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгдежзийклмнопрстуфхцчшщьюяєіїҐґ
+        >>> print u"".join( sorted(b, key=sort_key) ) # RIGHT ORDER! utf8.sort_key is used
+        аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
+        >>> print "".join( sorted(c) ) # RIGHT ORDER! Utf8 "rich comparison" methods are used
+        аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
+        >>> print "".join( sorted(c, key=sort_key) ) # RIGHT ORDER! utf8.sort_key is used
+        аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ
+        >>> Utf8().join(sorted(c.decode(), key=sort_key)) # convert to unicode for better performance
+        'аАбБвВгГґҐдДеЕєЄжЖзЗиИіІїЇйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩьЬюЮяЯ'
+        >>> for result in sorted(
+            ["Іа", "Астро", u"гала", Utf8("Гоша"), "Єва", "шовк", "аякс", "Їжа",
+        ...                       "ґанок", Utf8("Дар'я"), "білінг", "веб", u"Жужа", "проба", u"тест",
+        ...                       "абетка", "яблуко", "Юляся", "Київ", "лимонад", "ложка", "Матриця",
+        ...                      ], key=sort_key):
+        ...     print result.ljust(20), type(result)
+        абетка         <type 'str'>
+        Астро           <type 'str'>
+        аякс             <type 'str'>
+        білінг         <type 'str'>
+        веб               <type 'str'>
+        гала                 <type 'unicode'>
+        ґанок           <type 'str'>
+        Гоша                 <class '__main__.Utf8'>
+        Дар'я                <class '__main__.Utf8'>
+        Єва               <type 'str'>
+        Жужа                 <type 'unicode'>
+        Іа                 <type 'str'>
+        Їжа               <type 'str'>
+        Київ             <type 'str'>
+        лимонад       <type 'str'>
+        ложка           <type 'str'>
+        Матриця       <type 'str'>
+        проба           <type 'str'>
+        тест                 <type 'unicode'>
+        шовк             <type 'str'>
+        Юляся           <type 'str'>
+        яблуко         <type 'str'>
+        >>> a=Utf8("中文字")
+        >>> L=list(a)
+        >>> L
+        ['中', '文', '字']
+        >>> a="".join(L)
+        >>> print a
+        中文字
+        >>> type(a)
+        <type 'str'>
+        >>> a="中文字"  # standard str type
+        >>> L=list(a)
+        >>> L
+        ['\\xe4', '\\xb8', '\\xad', '\\xe6', '\\x96', '\\x87',
+            '\\xe5', '\\xad', '\\x97']
+        >>> from string import maketrans
+        >>> str_tab=maketrans('PRobe','12345')
+        >>> unicode_tab={ord(u'П'):ord(u'Ж'),
+        ...              ord(u'Р')      : u'Ш',
+        ...              ord(Utf8('о')) : None,  # utf8.ord() is used
+        ...              ord('б')       : None,  # -//-//-
+        ...              ord(u'а')      : u"中文字",
+        ...              ord(u'Є')      : Utf8('•').decode(), # only unicode type is supported
+        ...             }
+        >>> s.translate(unicode_tab).translate(str_tab, deletechars=' ')
+        'ЖШ中文字•12345'
+        """
+        import sys
+        reload(sys)
+        sys.setdefaultencoding("UTF-8")
+        import doctest
+        print "DOCTESTS STARTED..."
+        doctest.testmod()
+        print "DOCTESTS FINISHED"
 
     doctests()
diff --git a/gluon/utils.py b/gluon/utils.py
index 085f6d44..3ef03909 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -38,7 +38,8 @@ except ImportError:
 
 logger = logging.getLogger("web2py")
 
-def compare(a,b):
+
+def compare(a, b):
     """ compares two strings and not vulnerable to timing attacks """
     if len(a) != len(b):
         return False
@@ -47,36 +48,39 @@ def compare(a,b):
         result |= ord(x) ^ ord(y)
     return result == 0
 
+
 def md5_hash(text):
     """ Generate a md5 hash with the given text """
     return hashlib.md5(text).hexdigest()
 
-def simple_hash(text, key='', salt = '', digest_alg = 'md5'):
+
+def simple_hash(text, key='', salt='', digest_alg='md5'):
     """
     Generates hash with the given text using the specified
     digest hashing algorithm
     """
     if not digest_alg:
-        raise RuntimeError, "simple_hash with digest_alg=None"
-    elif not isinstance(digest_alg,str): # manual approach
-        h = digest_alg(text+key+salt)
-    elif digest_alg.startswith('pbkdf2'): # latest and coolest!
+        raise RuntimeError("simple_hash with digest_alg=None")
+    elif not isinstance(digest_alg, str):  # manual approach
+        h = digest_alg(text + key + salt)
+    elif digest_alg.startswith('pbkdf2'):  # latest and coolest!
         iterations, keylen, alg = digest_alg[7:-1].split(',')
         return pbkdf2_hex(text, salt, int(iterations),
-                          int(keylen),get_digest(alg))
-    elif key: # use hmac
+                          int(keylen), get_digest(alg))
+    elif key:  # use hmac
         digest_alg = get_digest(digest_alg)
-        h = hmac.new(key+salt,text,digest_alg)
-    else: # compatible with third party systems
+        h = hmac.new(key + salt, text, digest_alg)
+    else:  # compatible with third party systems
         h = hashlib.new(digest_alg)
-        h.update(text+salt)
+        h.update(text + salt)
     return h.hexdigest()
 
+
 def get_digest(value):
     """
     Returns a hashlib digest algorithm from a string
     """
-    if not isinstance(value,str):
+    if not isinstance(value, str):
         return value
     value = value.lower()
     if value == "md5":
@@ -95,50 +99,55 @@ def get_digest(value):
         raise ValueError("Invalid digest algorithm: %s" % value)
 
 DIGEST_ALG_BY_SIZE = {
-    128/4: 'md5',
-    160/4: 'sha1',
-    224/4: 'sha224',
-    256/4: 'sha256',
-    384/4: 'sha384',
-    512/4: 'sha512',
-    }
+    128 / 4: 'md5',
+    160 / 4: 'sha1',
+    224 / 4: 'sha224',
+    256 / 4: 'sha256',
+    384 / 4: 'sha384',
+    512 / 4: 'sha512',
+}
 
-def pad(s,n=32,padchar='.'):
+
+def pad(s, n=32, padchar='.'):
     return s + (32 - len(s) % 32) * padchar
 
-def secure_dumps(data,encryption_key,hash_key=None,compression_level=None):
+
+def secure_dumps(data, encryption_key, hash_key=None, compression_level=None):
     if not hash_key:
         hash_key = hashlib.sha1(encryption_key).hexdigest()
     dump = cPickle.dumps(data)
     if compression_level:
         dump = zlib.compress(dump, compression_level)
     key = pad(encryption_key[:32])
-    cipher = AES.new(key,IV=key[:16])
+    cipher = AES.new(key, IV=key[:16])
     encrypted_data = base64.urlsafe_b64encode(cipher.encrypt(pad(dump)))
-    signature = hmac.new(hash_key,encrypted_data).hexdigest()
-    return signature+':'+encrypted_data
+    signature = hmac.new(hash_key, encrypted_data).hexdigest()
+    return signature + ':' + encrypted_data
 
-def secure_loads(data,encryption_key,hash_key=None, compression_level=None):
+
+def secure_loads(data, encryption_key, hash_key=None, compression_level=None):
     if not ':' in data:
         return None
     if not hash_key:
         hash_key = hashlib.sha1(encryption_key).hexdigest()
-    signature, encrypted_data = data.split(':',1)
-    actual_signature = hmac.new(hash_key,encrypted_data).hexdigest()
-    if signature!=actual_signature:
+    signature, encrypted_data = data.split(':', 1)
+    actual_signature = hmac.new(hash_key, encrypted_data).hexdigest()
+    if signature != actual_signature:
         return None
     key = pad(encryption_key[:32])
-    cipher = AES.new(key,IV=key[:16])
+    cipher = AES.new(key, IV=key[:16])
     try:
         data = cipher.decrypt(base64.urlsafe_b64decode(encrypted_data))
         data = data.rstrip(' ')
         if compression_level:
             data = zlib.decompress(data)
         return cPickle.loads(data)
-    except (TypeError,cPickle.UnpicklingError):
+    except (TypeError, cPickle.UnpicklingError):
         return None
 
 ### compute constant CTOKENS
+
+
 def initialize_urandom():
     """
     This function and the web2py_uuid follow from the following discussion:
@@ -154,14 +163,15 @@ def initialize_urandom():
     """
     node_id = uuid.getnode()
     microseconds = int(time.time() * 1e6)
-    ctokens = [((node_id + microseconds) >> ((i%6)*8)) % 256 for i in range(16)]
+    ctokens = [((node_id + microseconds) >> ((i % 6) * 8)) %
+               256 for i in range(16)]
     random.seed(node_id + microseconds)
     try:
         os.urandom(1)
         have_urandom = True
         try:
             # try to add process-specific entropy
-            frandom = open('/dev/urandom','wb')
+            frandom = open('/dev/urandom', 'wb')
             try:
                 frandom.write(''.join(chr(t) for t in ctokens))
             finally:
@@ -172,15 +182,16 @@ def initialize_urandom():
     except NotImplementedError:
         have_urandom = False
         logger.warning(
-"""Cryptographically secure session management is not possible on your system because
+            """Cryptographically secure session management is not possible on your system because
 your system does not provide a cryptographically secure entropy source.
 This is not specific to web2py; consider deploying on a different operating system.""")
-    unpacked_ctokens = struct.unpack('=QQ',string.join(
-            (chr(x) for x in ctokens),''))
+    unpacked_ctokens = struct.unpack('=QQ', string.join(
+        (chr(x) for x in ctokens), ''))
     return unpacked_ctokens, have_urandom
 UNPACKED_CTOKENS, HAVE_URANDOM = initialize_urandom()
 
-def fast_urandom16(urandom=[], locker = threading.RLock()):
+
+def fast_urandom16(urandom=[], locker=threading.RLock()):
     """
     this is 4x faster than calling os.urandom(16) and prevents
     the "too many files open" issue with concurrent access to os.urandom()
@@ -190,12 +201,13 @@ def fast_urandom16(urandom=[], locker = threading.RLock()):
     except IndexError:
         try:
             locker.acquire()
-            ur = os.urandom(16*1024)
-            urandom += [ur[i:i+16] for i in xrange(16,1024*16,16)]
+            ur = os.urandom(16 * 1024)
+            urandom += [ur[i:i + 16] for i in xrange(16, 1024 * 16, 16)]
             return ur[0:16]
         finally:
             locker.release()
 
+
 def web2py_uuid(ctokens=UNPACKED_CTOKENS):
     """
     This function follows from the following discussion:
@@ -204,20 +216,21 @@ def web2py_uuid(ctokens=UNPACKED_CTOKENS):
     It works like uuid.uuid4 except that tries to use os.urandom() if possible
     and it XORs the output with the tokens uniquely associated with this machine.
     """
-    rand_longs = (random.getrandbits(64),random.getrandbits(64))
+    rand_longs = (random.getrandbits(64), random.getrandbits(64))
     if HAVE_URANDOM:
         urand_longs = struct.unpack('=QQ', fast_urandom16())
         byte_s = struct.pack('=QQ',
-                             rand_longs[0]^urand_longs[0]^ctokens[0],
-                             rand_longs[1]^urand_longs[1]^ctokens[1])
+                             rand_longs[0] ^ urand_longs[0] ^ ctokens[0],
+                             rand_longs[1] ^ urand_longs[1] ^ ctokens[1])
     else:
         byte_s = struct.pack('=QQ',
-                             rand_longs[0]^ctokens[0],
-                             rand_longs[1]^ctokens[1])
+                             rand_longs[0] ^ ctokens[0],
+                             rand_longs[1] ^ ctokens[1])
     return str(uuid.UUID(bytes=byte_s, version=4))
 
 REGEX_IPv4 = re.compile('(\d+)\.(\d+)\.(\d+)\.(\d+)')
 
+
 def is_valid_ip_address(address):
     """
     >>> is_valid_ip_address('127.0')
@@ -228,29 +241,29 @@ def is_valid_ip_address(address):
     True
     """
     # deal with special cases
-    if address.lower() in ('127.0.0.1','localhost','::1','::ffff:127.0.0.1'):
+    if address.lower() in ('127.0.0.1', 'localhost', '::1', '::ffff:127.0.0.1'):
         return True
-    elif address.lower() in ('unkown',''):
+    elif address.lower() in ('unkown', ''):
         return False
-    elif address.count('.')==3: # assume IPv4
+    elif address.count('.') == 3:  # assume IPv4
         if address.startswith('::ffff:'):
             address = address[7:]
-        if hasattr(socket,'inet_aton'): # try validate using the OS
+        if hasattr(socket, 'inet_aton'):  # try validate using the OS
             try:
                 addr = socket.inet_aton(address)
                 return True
-            except socket.error: # invalid address
+            except socket.error:  # invalid address
                 return False
-        else: # try validate using Regex
+        else:  # try validate using Regex
             match = REGEX_IPv4.match(address)
-            if match and all(0<=int(match.group(i))<256 for i in (1,2,3,4)):
+            if match and all(0 <= int(match.group(i)) < 256 for i in (1, 2, 3, 4)):
                 return True
             return False
-    elif hasattr(socket,'inet_pton'): # assume IPv6, try using the OS
+    elif hasattr(socket, 'inet_pton'):  # assume IPv6, try using the OS
         try:
             addr = socket.inet_pton(socket.AF_INET6, address)
             return True
-        except socket.error: # invalid address
+        except socket.error:  # invalid address
             return False
-    else: # do not know what to do? assume it is a valid address
+    else:  # do not know what to do? assume it is a valid address
         return True
diff --git a/gluon/validators.py b/gluon/validators.py
index e577dbcc..e3a33480 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -53,7 +53,7 @@ __all__ = [
     'IS_UPLOAD_FILENAME',
     'IS_UPPER',
     'IS_URL',
-    ]
+]
 
 try:
     from globals import current
@@ -61,16 +61,19 @@ try:
 except ImportError:
     have_current = False
 
+
 def translate(text):
     if text is None:
         return None
-    elif isinstance(text,(str,unicode)) and have_current:
-        if hasattr(current,'T'):
+    elif isinstance(text, (str, unicode)) and have_current:
+        if hasattr(current, 'T'):
             return str(current.T(text))
     return str(text)
 
-def options_sorter(x,y):
-    return (str(x[1]).upper()>str(y[1]).upper() and 1) or -1
+
+def options_sorter(x, y):
+    return (str(x[1]).upper() > str(y[1]).upper() and 1) or -1
+
 
 class Validator(object):
     """
@@ -117,7 +120,7 @@ class Validator(object):
         """
         return value
 
-    def __call__(self,value):
+    def __call__(self, value):
         raise NotImplementedError
         return (value, None)
 
@@ -277,7 +280,7 @@ class IS_LENGTH(Validator):
                 value.file.seek(0, os.SEEK_END)
                 length = value.file.tell()
                 value.file.seek(0, os.SEEK_SET)
-            elif hasattr(value,'value'):
+            elif hasattr(value, 'value'):
                 val = value.value
                 if val:
                     length = len(val)
@@ -294,8 +297,8 @@ class IS_LENGTH(Validator):
                 return (value, None)
             except:
                 pass
-        return (value, translate(self.error_message) \
-                    % dict(min=self.minsize, max=self.maxsize))
+        return (value, translate(self.error_message)
+                % dict(min=self.minsize, max=self.maxsize))
 
 
 class IS_IN_SET(Validator):
@@ -334,15 +337,15 @@ class IS_IN_SET(Validator):
         multiple=False,
         zero='',
         sort=False,
-        ):
+    ):
         self.multiple = multiple
         if isinstance(theset, dict):
             self.theset = [str(item) for item in theset]
             self.labels = theset.values()
-        elif theset and isinstance(theset, (tuple,list)) \
-            and isinstance(theset[0], (tuple,list)) and len(theset[0])==2:
-            self.theset = [str(item) for item,label in theset]
-            self.labels = [str(label) for item,label in theset]
+        elif theset and isinstance(theset, (tuple, list)) \
+                and isinstance(theset[0], (tuple, list)) and len(theset[0]) == 2:
+            self.theset = [str(item) for item, label in theset]
+            self.labels = [str(label) for item, label in theset]
         else:
             self.theset = [str(item) for item in theset]
             self.labels = labels
@@ -350,7 +353,7 @@ class IS_IN_SET(Validator):
         self.zero = zero
         self.sort = sort
 
-    def options(self,zero=True):
+    def options(self, zero=True):
         if not self.labels:
             items = [(k, k) for (i, k) in enumerate(self.theset)]
         else:
@@ -358,7 +361,7 @@ class IS_IN_SET(Validator):
         if self.sort:
             items.sort(options_sorter)
         if zero and not self.zero is None and not self.multiple:
-            items.insert(0,('',self.zero))
+            items.insert(0, ('', self.zero))
         return items
 
     def __call__(self, value):
@@ -379,8 +382,8 @@ class IS_IN_SET(Validator):
                 return ([], None)
             return (value, translate(self.error_message))
         if self.multiple:
-            if isinstance(self.multiple,(tuple,list)) and \
-                    not self.multiple[0]<=len(values)<self.multiple[1]:
+            if isinstance(self.multiple, (tuple, list)) and \
+                    not self.multiple[0] <= len(values) < self.multiple[1]:
                 return (values, translate(self.error_message))
             return (values, None)
         return (value, None)
@@ -414,9 +417,10 @@ class IS_IN_DB(Validator):
         zero='',
         sort=False,
         _and=None,
-        ):
+    ):
         from dal import Table
-        if isinstance(field,Table): field = field._id
+        if isinstance(field, Table):
+            field = field._id
 
         if hasattr(dbset, 'define_table'):
             self.dbset = dbset()
@@ -425,7 +429,7 @@ class IS_IN_DB(Validator):
         (ktable, kfield) = str(field).split('.')
         if not label:
             label = '%%(%s)s' % kfield
-        if isinstance(label,str):
+        if isinstance(label, str):
             if regex1.match(str(label)):
                 label = '%%(%s)s' % str(label).split('.')[-1]
             ks = regex2.findall(label)
@@ -462,7 +466,7 @@ class IS_IN_DB(Validator):
         else:
             fields = [table[k] for k in self.fields]
         if self.dbset.db._dbname != 'gae':
-            orderby = self.orderby or reduce(lambda a,b:a|b,fields)
+            orderby = self.orderby or reduce(lambda a, b: a | b, fields)
             groupby = self.groupby
             distinct = self.distinct
             dd = dict(orderby=orderby, groupby=groupby,
@@ -471,11 +475,12 @@ class IS_IN_DB(Validator):
             records = self.dbset(table).select(*fields, **dd)
         else:
             orderby = self.orderby or \
-                reduce(lambda a,b:a|b,(f for f in fields if not f.name=='id'))
+                reduce(lambda a, b: a | b, (
+                    f for f in fields if not f.name == 'id'))
             dd = dict(orderby=orderby, cache=self.cache, cacheable=True)
             records = self.dbset(table).select(table.ALL, **dd)
         self.theset = [str(r[self.kfield]) for r in records]
-        if isinstance(self.label,str):
+        if isinstance(self.label, str):
             self.labels = [self.label % dict(r) for r in records]
         else:
             self.labels = [self.label(r) for r in records]
@@ -486,7 +491,7 @@ class IS_IN_DB(Validator):
         if self.sort:
             items.sort(options_sorter)
         if zero and not self.zero is None and not self.multiple:
-            items.insert(0,('',self.zero))
+            items.insert(0, ('', self.zero))
         return items
 
     def __call__(self, value):
@@ -495,25 +500,26 @@ class IS_IN_DB(Validator):
         if self.multiple:
             if self._and:
                 raise NotImplementedError
-            if isinstance(value,list):
-                values=value
+            if isinstance(value, list):
+                values = value
             elif value:
                 values = [value]
             else:
                 values = []
-            if isinstance(self.multiple,(tuple,list)) and \
-                    not self.multiple[0]<=len(values)<self.multiple[1]:
+            if isinstance(self.multiple, (tuple, list)) and \
+                    not self.multiple[0] <= len(values) < self.multiple[1]:
                 return (values, translate(self.error_message))
             if self.theset:
                 if not [v for v in values if not v in self.theset]:
                     return (values, None)
             else:
                 from dal import GoogleDatastoreAdapter
+
                 def count(values, s=self.dbset, f=field):
-                    return s(f.belongs(map(int,values))).count()
+                    return s(f.belongs(map(int, values))).count()
                 if isinstance(self.dbset.db._adapter, GoogleDatastoreAdapter):
-                    range_ids = range(0,len(values),30)
-                    total = sum(count(values[i:i+30]) for i in range_ids)
+                    range_ids = range(0, len(values), 30)
+                    total = sum(count(values[i:i + 30]) for i in range_ids)
                     if total == len(values):
                         return (values, None)
                 elif count(values) == len(values):
@@ -549,10 +555,11 @@ class IS_NOT_IN_DB(Validator):
         error_message='value already in database or empty',
         allowed_override=[],
         ignore_common_filters=False,
-        ):
+    ):
 
         from dal import Table
-        if isinstance(field,Table): field = field._id
+        if isinstance(field, Table):
+            field = field._id
 
         if hasattr(dbset, 'define_table'):
             self.dbset = dbset()
@@ -568,7 +575,7 @@ class IS_NOT_IN_DB(Validator):
         self.record_id = id
 
     def __call__(self, value):
-        value=str(value)
+        value = str(value)
         if not value.strip():
             return (value, translate(self.error_message))
         if value in self.allowed_override:
@@ -576,7 +583,7 @@ class IS_NOT_IN_DB(Validator):
         (tablename, fieldname) = str(self.field).split('.')
         table = self.dbset.db[tablename]
         field = table[fieldname]
-        rows = self.dbset(field == value, ignore_common_filters = self.ignore_common_filters).select(limitby=(0, 1))
+        rows = self.dbset(field == value, ignore_common_filters=self.ignore_common_filters).select(limitby=(0, 1))
         if len(rows) > 0:
             if isinstance(self.record_id, dict):
                 for f in self.record_id:
@@ -631,7 +638,7 @@ class IS_INT_IN_RANGE(Validator):
         minimum=None,
         maximum=None,
         error_message=None,
-        ):
+    ):
         self.minimum = self.maximum = None
         if minimum is None:
             if maximum is None:
@@ -640,19 +647,21 @@ class IS_INT_IN_RANGE(Validator):
                 self.maximum = int(maximum)
                 if error_message is None:
                     error_message = 'enter an integer less than or equal to %(max)g'
-                self.error_message = translate(error_message) % dict(max=self.maximum-1)
+                self.error_message = translate(
+                    error_message) % dict(max=self.maximum - 1)
         elif maximum is None:
             self.minimum = int(minimum)
             if error_message is None:
                 error_message = 'enter an integer greater than or equal to %(min)g'
-            self.error_message = translate(error_message) % dict(min=self.minimum)
+            self.error_message = translate(
+                error_message) % dict(min=self.minimum)
         else:
             self.minimum = int(minimum)
             self.maximum = int(maximum)
             if error_message is None:
                 error_message = 'enter an integer between %(min)g and %(max)g'
             self.error_message = translate(error_message) \
-                % dict(min=self.minimum, max=self.maximum-1)
+                % dict(min=self.minimum, max=self.maximum - 1)
 
     def __call__(self, value):
         try:
@@ -672,12 +681,16 @@ class IS_INT_IN_RANGE(Validator):
             pass
         return (value, self.error_message)
 
+
 def str2dec(number):
     s = str(number)
-    if not '.' in s: s+='.00'
-    else: s+='0'*(2-len(s.split('.')[1]))
+    if not '.' in s:
+        s += '.00'
+    else:
+        s += '0' * (2 - len(s.split('.')[1]))
     return s
 
+
 class IS_FLOAT_IN_RANGE(Validator):
     """
     Determine that the argument is (or can be represented as) a float,
@@ -723,7 +736,7 @@ class IS_FLOAT_IN_RANGE(Validator):
         maximum=None,
         error_message=None,
         dot='.'
-        ):
+    ):
         self.minimum = self.maximum = None
         self.dot = dot
         if minimum is None:
@@ -748,10 +761,10 @@ class IS_FLOAT_IN_RANGE(Validator):
 
     def __call__(self, value):
         try:
-            if self.dot=='.':
+            if self.dot == '.':
                 fvalue = float(value)
             else:
-                fvalue = float(str(value).replace(self.dot,'.'))
+                fvalue = float(str(value).replace(self.dot, '.'))
             if self.minimum is None:
                 if self.maximum is None or fvalue <= self.maximum:
                     return (fvalue, None)
@@ -764,8 +777,8 @@ class IS_FLOAT_IN_RANGE(Validator):
             pass
         return (value, self.error_message)
 
-    def formatter(self,value):
-        return str2dec(value).replace('.',self.dot)
+    def formatter(self, value):
+        return str2dec(value).replace('.', self.dot)
 
 
 class IS_DECIMAL_IN_RANGE(Validator):
@@ -827,7 +840,7 @@ class IS_DECIMAL_IN_RANGE(Validator):
         maximum=None,
         error_message=None,
         dot='.'
-        ):
+    ):
         self.minimum = self.maximum = None
         self.dot = dot
         if minimum is None:
@@ -852,10 +865,10 @@ class IS_DECIMAL_IN_RANGE(Validator):
 
     def __call__(self, value):
         try:
-            if isinstance(value,decimal.Decimal):
+            if isinstance(value, decimal.Decimal):
                 v = value
             else:
-                v = decimal.Decimal(str(value).replace(self.dot,'.'))
+                v = decimal.Decimal(str(value).replace(self.dot, '.'))
             if self.minimum is None:
                 if self.maximum is None or v <= self.maximum:
                     return (v, None)
@@ -869,7 +882,8 @@ class IS_DECIMAL_IN_RANGE(Validator):
         return (value, self.error_message)
 
     def formatter(self, value):
-        return str2dec(value).replace('.',self.dot)
+        return str2dec(value).replace('.', self.dot)
+
 
 def is_empty(value, empty_regex=None):
     "test empty field"
@@ -881,6 +895,7 @@ def is_empty(value, empty_regex=None):
         return (value, True)
     return (value, False)
 
+
 class IS_NOT_EMPTY(Validator):
     """
     example::
@@ -1048,7 +1063,8 @@ class IS_EMAIL(Validator):
           localhost
           |
           (
-            [a-z0-9]                         # [sub]domain begins with alphanumeric
+            [a-z0-9]
+                # [sub]domain begins with alphanumeric
             (
               [-\w]*                         # alphanumeric, underscore, dot, hyphen
               [a-z0-9]                       # ending alphanumeric
@@ -1057,9 +1073,9 @@ class IS_EMAIL(Validator):
           )+
           [a-z]{2,}                        # TLD alpha-only
        )$
-    ''', re.VERBOSE|re.IGNORECASE)
+    ''', re.VERBOSE | re.IGNORECASE)
 
-    regex_proposed_but_failed = re.compile('^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$',re.VERBOSE|re.IGNORECASE)
+    regex_proposed_but_failed = re.compile('^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$', re.VERBOSE | re.IGNORECASE)
 
     def __init__(self,
                  banned=None,
@@ -1153,7 +1169,7 @@ official_url_schemes = [
     'xmpp',
     'z39.50r',
     'z39.50s',
-    ]
+]
 unofficial_url_schemes = [
     'about',
     'adiumxtra',
@@ -1207,7 +1223,7 @@ unofficial_url_schemes = [
     'xfire',
     'xri',
     'ymsgr',
-    ]
+]
 all_url_schemes = [None] + official_url_schemes + unofficial_url_schemes
 http_schemes = [None, 'http', 'https']
 
@@ -1298,7 +1314,7 @@ def unicode_to_ascii_authority(authority):
                  #don't modify the URL
                 asciiLabels.append('')
     except:
-        asciiLabels=[str(label) for label in labels]
+        asciiLabels = [str(label) for label in labels]
     #RFC 3490, Section 4, Step 5
     return str(reduce(lambda x, y: x + unichr(0x002E) + y, asciiLabels))
 
@@ -1345,8 +1361,8 @@ def unicode_to_ascii_url(url, prepend_scheme):
             unicode(scheme_to_prepend) + u'://' + url).groups()
     #if we still can't find the authority
     if not groups[3]:
-        raise Exception('No authority component found, '+ \
-            'could not decode unicode to US-ASCII')
+        raise Exception('No authority component found, ' +
+                        'could not decode unicode to US-ASCII')
 
     #We're here if we found an authority, let's rebuild the URL
     scheme = groups[1]
@@ -1395,13 +1411,12 @@ class IS_GENERIC_URL(Validator):
 
     """
 
-
     def __init__(
         self,
         error_message='enter a valid URL',
         allowed_schemes=None,
         prepend_scheme=None,
-        ):
+    ):
         """
         :param error_message: a string, the error message to give the end user
             if the URL does not validate
@@ -1418,9 +1433,8 @@ class IS_GENERIC_URL(Validator):
             self.allowed_schemes = allowed_schemes
         self.prepend_scheme = prepend_scheme
         if self.prepend_scheme not in self.allowed_schemes:
-            raise SyntaxError, \
-                "prepend_scheme='%s' is not in allowed_schemes=%s" \
-                % (self.prepend_scheme, self.allowed_schemes)
+            raise SyntaxError("prepend_scheme='%s' is not in allowed_schemes=%s"
+                              % (self.prepend_scheme, self.allowed_schemes))
 
     GENERIC_URL = re.compile(r"%[^0-9A-Fa-f]{2}|%[^0-9A-Fa-f][0-9A-Fa-f]|%[0-9A-Fa-f][^0-9A-Fa-f]|%$|%[0-9A-Fa-f]$|%[^0-9A-Fa-f]$")
     GENERIC_URL_VALID = re.compile(r"[A-Za-z0-9;/?:@&=+$,\-_\.!~*'\(\)%#]+$")
@@ -1452,7 +1466,7 @@ class IS_GENERIC_URL(Validator):
                         # ports, check to see if adding a valid scheme fixes
                         # the problem (but only do this if it doesn't have
                         # one already!)
-                        if value.find('://')<0 and None in self.allowed_schemes:
+                        if value.find('://') < 0 and None in self.allowed_schemes:
                             schemeToUse = self.prepend_scheme or 'http'
                             prependTest = self.__call__(
                                 schemeToUse + '://' + value)
@@ -1763,7 +1777,7 @@ official_top_level_domains = [
     'za',
     'zm',
     'zw',
-    ]
+]
 
 
 class IS_HTTP_URL(Validator):
@@ -1810,7 +1824,8 @@ class IS_HTTP_URL(Validator):
 
     """
 
-    GENERIC_VALID_IP = re.compile("([\w.!~*'|;:&=+$,-]+@)?\d+\.\d+\.\d+\.\d+(:\d*)*$")
+    GENERIC_VALID_IP = re.compile(
+        "([\w.!~*'|;:&=+$,-]+@)?\d+\.\d+\.\d+\.\d+(:\d*)*$")
     GENERIC_VALID_DOMAIN = re.compile("([\w.!~*'|;:&=+$,-]+@)?(([A-Za-z0-9]+[A-Za-z0-9\-]*[A-Za-z0-9]+\.)*([A-Za-z0-9]+\.)*)*([A-Za-z]+[A-Za-z0-9\-]*[A-Za-z0-9]+)\.?(:\d*)*$")
 
     def __init__(
@@ -1818,7 +1833,7 @@ class IS_HTTP_URL(Validator):
         error_message='enter a valid URL',
         allowed_schemes=None,
         prepend_scheme='http',
-        ):
+    ):
         """
         :param error_message: a string, the error message to give the end user
             if the URL does not validate
@@ -1837,14 +1852,12 @@ class IS_HTTP_URL(Validator):
 
         for i in self.allowed_schemes:
             if i not in http_schemes:
-                raise SyntaxError, \
-                    "allowed_scheme value '%s' is not in %s" % \
-                    (i, http_schemes)
+                raise SyntaxError("allowed_scheme value '%s' is not in %s" %
+                                  (i, http_schemes))
 
         if self.prepend_scheme not in self.allowed_schemes:
-            raise SyntaxError, \
-                "prepend_scheme='%s' is not in allowed_schemes=%s" % \
-                (self.prepend_scheme, self.allowed_schemes)
+            raise SyntaxError("prepend_scheme='%s' is not in allowed_schemes=%s" %
+                              (self.prepend_scheme, self.allowed_schemes))
 
     def __call__(self, value):
         """
@@ -1870,11 +1883,12 @@ class IS_HTTP_URL(Validator):
                         return (value, None)
                     else:
                         # else if authority is a valid domain name
-                        domainMatch = self.GENERIC_VALID_DOMAIN.match(authority)
+                        domainMatch = self.GENERIC_VALID_DOMAIN.match(
+                            authority)
                         if domainMatch:
                             # if the top-level domain really exists
                             if domainMatch.group(5).lower()\
-                                 in official_top_level_domains:
+                                    in official_top_level_domains:
                                 # Then this HTTP URL is valid
                                 return (value, None)
                 else:
@@ -1889,10 +1903,10 @@ class IS_HTTP_URL(Validator):
                     else:
                         # abbreviated case: if we haven't already, prepend a
                         # scheme and see if it fixes the problem
-                        if value.find('://')<0:
+                        if value.find('://') < 0:
                             schemeToUse = self.prepend_scheme or 'http'
                             prependTest = self.__call__(schemeToUse
-                                     + '://' + value)
+                                                        + '://' + value)
                             # if the prepend test succeeded
                             if prependTest[1] is None:
                                 # if prepending in the output is enabled
@@ -1989,7 +2003,7 @@ class IS_URL(Validator):
         mode='http',
         allowed_schemes=None,
         prepend_scheme='http',
-        ):
+    ):
         """
         :param error_message: a string, the error message to give the end user
             if the URL does not validate
@@ -2002,14 +2016,13 @@ class IS_URL(Validator):
         self.error_message = error_message
         self.mode = mode.lower()
         if not self.mode in ['generic', 'http']:
-            raise SyntaxError, "invalid mode '%s' in IS_URL" % self.mode
+            raise SyntaxError("invalid mode '%s' in IS_URL" % self.mode)
         self.allowed_schemes = allowed_schemes
 
         if self.allowed_schemes:
             if prepend_scheme not in self.allowed_schemes:
-                raise SyntaxError, \
-                    "prepend_scheme='%s' is not in allowed_schemes=%s" \
-                    % (prepend_scheme, self.allowed_schemes)
+                raise SyntaxError("prepend_scheme='%s' is not in allowed_schemes=%s"
+                                  % (prepend_scheme, self.allowed_schemes))
 
         # if allowed_schemes is None, then we will defer testing
         # prepend_scheme's validity to a sub-method
@@ -2036,7 +2049,7 @@ class IS_URL(Validator):
                                     allowed_schemes=self.allowed_schemes,
                                     prepend_scheme=self.prepend_scheme)
         else:
-            raise SyntaxError, "invalid mode '%s' in IS_URL" % self.mode
+            raise SyntaxError("invalid mode '%s' in IS_URL" % self.mode)
 
         if type(value) != unicode:
             return subMethod(value)
@@ -2117,9 +2130,8 @@ class IS_TIME(Validator):
             if value.group('d') == 'pm' and 0 < h < 12:
                 h = h + 12
             if not (h in range(24) and m in range(60) and s
-                     in range(60)):
-                raise ValueError\
-                    ('Hours or minutes or seconds are outside of allowed range')
+                    in range(60)):
+                raise ValueError('Hours or minutes or seconds are outside of allowed range')
             value = datetime.time(h, m, s)
             return (value, None)
         except AttributeError:
@@ -2145,8 +2157,8 @@ class IS_DATE(Validator):
         self.extremes = {}
 
     def __call__(self, value):
-        if isinstance(value,datetime.date):
-            return (value,None)
+        if isinstance(value, datetime.date):
+            return (value, None)
         try:
             (y, m, d, hh, mm, ss, t0, t1, t2) = \
                 time.strptime(value, str(self.format))
@@ -2160,11 +2172,11 @@ class IS_DATE(Validator):
         format = self.format
         year = value.year
         y = '%.4i' % year
-        format = format.replace('%y',y[-2:])
-        format = format.replace('%Y',y)
-        if year<1900:
+        format = format.replace('%y', y[-2:])
+        format = format.replace('%Y', y)
+        if year < 1900:
             year = 2000
-        d = datetime.date(year,value.month,value.day)
+        d = datetime.date(year, value.month, value.day)
         return d.strftime(format)
 
 
@@ -2181,19 +2193,19 @@ class IS_DATETIME(Validator):
 
     @staticmethod
     def nice(format):
-        code=(('%Y','1963'),
-              ('%y','63'),
-              ('%d','28'),
-              ('%m','08'),
-              ('%b','Aug'),
-              ('%B','August'),
-              ('%H','14'),
-              ('%I','02'),
-              ('%p','PM'),
-              ('%M','30'),
-              ('%S','59'))
-        for (a,b) in code:
-            format=format.replace(a,b)
+        code = (('%Y', '1963'),
+                ('%y', '63'),
+                ('%d', '28'),
+                ('%m', '08'),
+                ('%b', 'Aug'),
+                ('%B', 'August'),
+                ('%H', '14'),
+                ('%I', '02'),
+                ('%p', 'PM'),
+                ('%M', '30'),
+                ('%S', '59'))
+        for (a, b) in code:
+            format = format.replace(a, b)
         return dict(format=format)
 
     def __init__(self, format='%Y-%m-%d %H:%M:%S',
@@ -2203,8 +2215,8 @@ class IS_DATETIME(Validator):
         self.extremes = {}
 
     def __call__(self, value):
-        if isinstance(value,datetime.datetime):
-            return (value,None)
+        if isinstance(value, datetime.datetime):
+            return (value, None)
         try:
             (y, m, d, hh, mm, ss, t0, t1, t2) = \
                 time.strptime(value, str(self.format))
@@ -2214,19 +2226,19 @@ class IS_DATETIME(Validator):
             self.extremes.update(IS_DATETIME.nice(self.format))
             return (value, translate(self.error_message) % self.extremes)
 
-
     def formatter(self, value):
         format = self.format
         year = value.year
         y = '%.4i' % year
-        format = format.replace('%y',y[-2:])
-        format = format.replace('%Y',y)
-        if year<1900:
+        format = format.replace('%y', y[-2:])
+        format = format.replace('%Y', y)
+        if year < 1900:
             year = 2000
-        d = datetime.datetime(year,value.month,value.day,
-                              value.hour,value.minute,value.second)
+        d = datetime.datetime(year, value.month, value.day,
+                              value.hour, value.minute, value.second)
         return d.strftime(format)
 
+
 class IS_DATE_IN_RANGE(IS_DATE):
     """
     example::
@@ -2249,10 +2261,10 @@ class IS_DATE_IN_RANGE(IS_DATE):
 
     """
     def __init__(self,
-                 minimum = None,
-                 maximum = None,
+                 minimum=None,
+                 maximum=None,
                  format='%Y-%m-%d',
-                 error_message = None):
+                 error_message=None):
         self.minimum = minimum
         self.maximum = maximum
         if error_message is None:
@@ -2263,12 +2275,12 @@ class IS_DATE_IN_RANGE(IS_DATE):
             else:
                 error_message = "enter date in range %(min)s %(max)s"
         IS_DATE.__init__(self,
-                         format = format,
-                         error_message = error_message)
+                         format=format,
+                         error_message=error_message)
         self.extremes = dict(min=minimum, max=maximum)
 
     def __call__(self, value):
-        (value, msg) = IS_DATE.__call__(self,value)
+        (value, msg) = IS_DATE.__call__(self, value)
         if msg is not None:
             return (value, msg)
         if self.minimum and self.minimum > value:
@@ -2299,10 +2311,10 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME):
         (datetime.datetime(2010, 3, 3, 0, 0), 'oops')
     """
     def __init__(self,
-                 minimum = None,
-                 maximum = None,
-                 format = '%Y-%m-%d %H:%M:%S',
-                 error_message = None):
+                 minimum=None,
+                 maximum=None,
+                 format='%Y-%m-%d %H:%M:%S',
+                 error_message=None):
         self.minimum = minimum
         self.maximum = maximum
         if error_message is None:
@@ -2313,9 +2325,9 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME):
             else:
                 error_message = "enter date and time in range %(min)s %(max)s"
         IS_DATETIME.__init__(self,
-                         format = format,
-                         error_message = error_message)
-        self.extremes = dict(min = minimum, max = maximum)
+                             format=format,
+                             error_message=error_message)
+        self.extremes = dict(min=minimum, max=maximum)
 
     def __call__(self, value):
         (value, msg) = IS_DATETIME.__call__(self, value)
@@ -2331,7 +2343,7 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME):
 class IS_LIST_OF(Validator):
 
     def __init__(self, other=None, minimum=0, maximum=100,
-                 error_message = None):
+                 error_message=None):
         self.other = other
         self.minimum = minimum
         self.maximum = maximum
@@ -2341,10 +2353,10 @@ class IS_LIST_OF(Validator):
         ivalue = value
         if not isinstance(value, list):
             ivalue = [ivalue]
-        if not self.minimum is None and len(ivalue)<self.minimum:
-            return (ivalue, translate(self.error_message) % dict(min=self.minimum,max=self.maximum))
-        if not self.maximum is None and len(ivalue)>self.maximum:
-            return (ivalue, translate(self.error_message) % dict(min=self.minimum,max=self.maximum))
+        if not self.minimum is None and len(ivalue) < self.minimum:
+            return (ivalue, translate(self.error_message) % dict(min=self.minimum, max=self.maximum))
+        if not self.maximum is None and len(ivalue) > self.maximum:
+            return (ivalue, translate(self.error_message) % dict(min=self.minimum, max=self.maximum))
         new_value = []
         if self.other:
             for item in ivalue:
@@ -2399,7 +2411,8 @@ def urlify(value, maxlen=80, keep_underscores=False):
     s = re.sub('&\w+;', '', s)            # strip html entities
     if keep_underscores:
         s = re.sub('\s+', '-', s)         # whitespace to hyphens
-        s = re.sub('[^\w\-]', '', s)      # strip all but alphanumeric/underscore/hyphen
+        s = re.sub('[^\w\-]', '', s)
+                   # strip all but alphanumeric/underscore/hyphen
     else:
         s = re.sub('[\s_]+', '-', s)      # whitespace & underscores to hyphens
         s = re.sub('[^a-z0-9\-]', '', s)  # strip all but alphanumeric/hyphen
@@ -2465,7 +2478,8 @@ class IS_SLUG(Validator):
     def __call__(self, value):
         if self.check and value != urlify(value, self.maxlen, self.keep_underscores):
             return (value, translate(self.error_message))
-        return (urlify(value,self.maxlen, self.keep_underscores), None)
+        return (urlify(value, self.maxlen, self.keep_underscores), None)
+
 
 class IS_EMPTY_OR(Validator):
     """
@@ -2494,12 +2508,12 @@ class IS_EMPTY_OR(Validator):
         if hasattr(other, 'multiple'):
             self.multiple = other.multiple
         if hasattr(other, 'options'):
-            self.options=self._options
+            self.options = self._options
 
     def _options(self):
         options = self.other.options()
-        if (not options or options[0][0]!='') and not self.multiple:
-            options.insert(0,('',''))
+        if (not options or options[0][0] != '') and not self.multiple:
+            options.insert(0, ('', ''))
         return options
 
     def set_self_id(self, id):
@@ -2519,7 +2533,8 @@ class IS_EMPTY_OR(Validator):
             error = None
             for item in self.other:
                 value, error = item(value)
-                if error: break
+                if error:
+                    break
             return value, error
         else:
             return self.other(value)
@@ -2547,14 +2562,15 @@ class CLEANUP(Validator):
             else re.compile(regex)
 
     def __call__(self, value):
-        v = self.regex.sub('',str(value).strip())
+        v = self.regex.sub('', str(value).strip())
         return (v, None)
 
+
 class LazyCrypt(object):
     """
     Stores a lazy password hash
     """
-    def __init__(self,crypt,password):
+    def __init__(self, crypt, password):
         """
         crypt is an instance of the CRYPT validator,
         password is the password as inserted by the user
@@ -2585,14 +2601,14 @@ class LazyCrypt(object):
             return self.crypted
         if self.crypt.key:
             if ':' in self.crypt.key:
-                digest_alg, key = self.crypt.key.split(':',1)
+                digest_alg, key = self.crypt.key.split(':', 1)
             else:
                 digest_alg, key = self.crypt.digest_alg, self.crypt.key
         else:
             digest_alg, key = self.crypt.digest_alg, ''
         if self.crypt.salt:
             if self.crypt.salt == True:
-                salt = str(web2py_uuid()).replace('-','')[-16:]
+                salt = str(web2py_uuid()).replace('-', '')[-16:]
             else:
                 salt = self.crypt.salt
         else:
@@ -2614,13 +2630,13 @@ class LazyCrypt(object):
             key = ''
         if stored_password is None:
             return False
-        elif stored_password.count('$')==2:
+        elif stored_password.count('$') == 2:
             (digest_alg, salt, hash) = stored_password.split('$')
             h = simple_hash(self.password, key, salt, digest_alg)
             temp_pass = '%s$%s$%s' % (digest_alg, salt, h)
-        else: # no salting
+        else:  # no salting
             # guess digest_alg
-            digest_alg = DIGEST_ALG_BY_SIZE.get(len(stored_password),None)
+            digest_alg = DIGEST_ALG_BY_SIZE.get(len(stored_password), None)
             if not digest_alg:
                 return False
             else:
@@ -2725,9 +2741,9 @@ class CRYPT(object):
         self.salt = salt
 
     def __call__(self, value):
-        if len(value)<self.min_length:
+        if len(value) < self.min_length:
             return ('', translate(self.error_message))
-        return (LazyCrypt(self,value),None)
+        return (LazyCrypt(self, value), None)
 
 #  entropy calculator for IS_STRONG
 #
@@ -2736,7 +2752,9 @@ upperset = frozenset(unicode('ABCDEFGHIJKLMNOPQRSTUVWXYZ'))
 numberset = frozenset(unicode('0123456789'))
 sym1set = frozenset(unicode('!@#$%^&*()'))
 sym2set = frozenset(unicode('~`-_=+[]{}\\|;:\'",.<>?/'))
-otherset = frozenset(unicode('0123456789abcdefghijklmnopqrstuvwxyz')) # anything else
+otherset = frozenset(
+    unicode('0123456789abcdefghijklmnopqrstuvwxyz'))  # anything else
+
 
 def calc_entropy(string):
     " calculate a simple entropy for a given string "
@@ -2764,9 +2782,11 @@ def calc_entropy(string):
         if inset is not lastset:
             alphabet += 1   # credit for set transitions
             lastset = cset
-    entropy = len(string) * math.log(alphabet) / 0.6931471805599453 # math.log(2)
+    entropy = len(
+        string) * math.log(alphabet) / 0.6931471805599453  # math.log(2)
     return round(entropy, 2)
 
+
 class IS_STRONG(object):
     """
     example::
@@ -2777,7 +2797,8 @@ class IS_STRONG(object):
     enforces complexity requirements on a field
 
     >>> IS_STRONG(es=True)('Abcd1234')
-    ('Abcd1234', 'Must include at least 1 of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|')
+    ('Abcd1234',
+     'Must include at least 1 of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|')
     >>> IS_STRONG(es=True)('Abcd1234!')
     ('Abcd1234!', None)
     >>> IS_STRONG(es=True, entropy=1)('a')
@@ -2828,8 +2849,8 @@ class IS_STRONG(object):
         if self.entropy is not None:
             entropy = calc_entropy(value)
             if entropy < self.entropy:
-                failures.append(translate("Entropy (%(have)s) less than required (%(need)s)") \
-                    % dict(have=entropy, need=self.entropy))
+                failures.append(translate("Entropy (%(have)s) less than required (%(need)s)")
+                                % dict(have=entropy, need=self.entropy))
         if type(self.min) == int and self.min > 0:
             if not len(value) >= self.min:
                 failures.append(translate("Minimum length is %s") % self.min)
@@ -2840,31 +2861,33 @@ class IS_STRONG(object):
             all_special = [ch in value for ch in self.specials]
             if self.special > 0:
                 if not all_special.count(True) >= self.special:
-                    failures.append(translate("Must include at least %s of the following: %s") \
-                                        % (self.special, self.specials))
+                    failures.append(translate("Must include at least %s of the following: %s")
+                                    % (self.special, self.specials))
         if self.invalid:
             all_invalid = [ch in value for ch in self.invalid]
             if all_invalid.count(True) > 0:
-                failures.append(translate("May not contain any of the following: %s") \
-                    % self.invalid)
+                failures.append(translate("May not contain any of the following: %s")
+                                % self.invalid)
         if type(self.upper) == int:
             all_upper = re.findall("[A-Z]", value)
             if self.upper > 0:
                 if not len(all_upper) >= self.upper:
-                    failures.append(translate("Must include at least %s upper case") \
-                        % str(self.upper))
+                    failures.append(translate("Must include at least %s upper case")
+                                    % str(self.upper))
             else:
                 if len(all_upper) > 0:
-                    failures.append(translate("May not include any upper case letters"))
+                    failures.append(
+                        translate("May not include any upper case letters"))
         if type(self.lower) == int:
             all_lower = re.findall("[a-z]", value)
             if self.lower > 0:
                 if not len(all_lower) >= self.lower:
-                    failures.append(translate("Must include at least %s lower case") \
-                        % str(self.lower))
+                    failures.append(translate("Must include at least %s lower case")
+                                    % str(self.lower))
             else:
                 if len(all_lower) > 0:
-                    failures.append(translate("May not include any lower case letters"))
+                    failures.append(
+                        translate("May not include any lower case letters"))
         if type(self.number) == int:
             all_number = re.findall("[0-9]", value)
             if self.number > 0:
@@ -2872,8 +2895,8 @@ class IS_STRONG(object):
                 if self.number > 1:
                     numbers = "numbers"
                 if not len(all_number) >= self.number:
-                    failures.append(translate("Must include at least %s %s") \
-                        % (str(self.number), numbers))
+                    failures.append(translate("Must include at least %s %s")
+                                    % (str(self.number), numbers))
             else:
                 if len(all_number) > 0:
                     failures.append(translate("May not include any numbers"))
@@ -3050,7 +3073,7 @@ class IS_UPLOAD_FILENAME(Validator):
     """
 
     def __init__(self, filename=None, extension=None, lastdot=True, case=1,
-            error_message='enter valid filename'):
+                 error_message='enter valid filename'):
         if isinstance(filename, str):
             filename = re.compile(filename)
         if isinstance(extension, str):
@@ -3193,7 +3216,7 @@ class IS_IPV4(Validator):
         is_localhost=None,
         is_private=None,
         is_automatic=None,
-        error_message='enter valid IPv4 address'):
+            error_message='enter valid IPv4 address'):
         for n, value in enumerate((minip, maxip)):
             temp = []
             if isinstance(value, str):
@@ -3232,14 +3255,14 @@ class IS_IPV4(Validator):
             for bottom, top in zip(self.minip, self.maxip):
                 if self.invert != (bottom <= number <= top):
                     ok = True
-            if not (self.is_localhost is None or self.is_localhost == \
-                (number == self.localhost)):
+            if not (self.is_localhost is None or self.is_localhost ==
+                    (number == self.localhost)):
                     ok = False
-            if not (self.is_private is None or self.is_private == \
-                (sum([number[0] <= number <= number[1] for number in self.private]) > 0)):
+            if not (self.is_private is None or self.is_private ==
+                    (sum([number[0] <= number <= number[1] for number in self.private]) > 0)):
                     ok = False
-            if not (self.is_automatic is None or self.is_automatic == \
-                (self.automatic[0] <= number <= self.automatic[1])):
+            if not (self.is_automatic is None or self.is_automatic ==
+                    (self.automatic[0] <= number <= self.automatic[1])):
                     ok = False
             if ok:
                 return (value, None)
@@ -3247,4 +3270,5 @@ class IS_IPV4(Validator):
 
 if __name__ == '__main__':
     import doctest
-    doctest.testmod(optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
+    doctest.testmod(
+        optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS)
diff --git a/gluon/widget.py b/gluon/widget.py
index 18b98bab..d4a38d95 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -30,7 +30,8 @@ from settings import global_settings
 from shell import run, test
 
 try:
-    import Tkinter, tkMessageBox
+    import Tkinter
+    import tkMessageBox
     import contrib.taskbar_widget
     from winservice import web2py_windows_service_handler
     have_winservice = True
@@ -44,7 +45,8 @@ except NameError:
     BaseException = Exception
 
 ProgramName = 'web2py Web Framework'
-ProgramAuthor = 'Created by Massimo Di Pierro, Copyright 2007-' + str(datetime.datetime.now().year)
+ProgramAuthor = 'Created by Massimo Di Pierro, Copyright 2007-' + str(
+    datetime.datetime.now().year)
 ProgramVersion = read_file('VERSION').strip()
 
 ProgramInfo = '''%s
@@ -58,6 +60,7 @@ if not sys.version[:3] in ['2.4', '2.5', '2.6', '2.7']:
 
 logger = logging.getLogger("web2py")
 
+
 def run_system_tests():
     major_version = sys.version_info[0]
     minor_version = sys.version_info[1]
@@ -77,6 +80,7 @@ def run_system_tests():
         ret = 256
     sys.exit(ret and 1)
 
+
 class IO(object):
     """   """
 
@@ -141,7 +145,7 @@ def presentation(root):
         pnl = Tkinter.Label(canvas, image=img, background='white', bd=0)
         pnl.pack(side='top', fill='both', expand='yes')
         # Prevent garbage collection of img
-        pnl.image=img
+        pnl.image = img
 
     def add_label(text='Change Me', font_size=12, foreground='#195866', height=1):
         return Tkinter.Label(
@@ -153,7 +157,7 @@ def presentation(root):
             anchor=Tkinter.CENTER,
             foreground=foreground,
             background='white'
-            )
+        )
 
     add_label('Welcome to...').pack(side='top')
     add_label(ProgramName, 18, '#FF5C1F', 2).pack()
@@ -231,17 +235,18 @@ class web2pyDialog(object):
                                                  sticky=sticky)
         self.ips = {}
         self.selected_ip = Tkinter.StringVar()
-        row=0
-        ips = [('127.0.0.1','Local')] + \
-            [(ip,'Public') for ip in options.ips] + \
-            [('0.0.0.0','Public')]
-        for ip,legend in ips:
+        row = 0
+        ips = [('127.0.0.1', 'Local')] + \
+            [(ip, 'Public') for ip in options.ips] + \
+            [('0.0.0.0', 'Public')]
+        for ip, legend in ips:
             self.ips[ip] = Tkinter.Radiobutton(
-                self.root,text='%s (%s)' % (legend,ip),
+                self.root, text='%s (%s)' % (legend, ip),
                 variable=self.selected_ip, value=ip)
             self.ips[ip].grid(row=row, column=1, sticky=sticky)
-            if row==0: self.ips[ip].select()
-            row+=1
+            if row == 0:
+                self.ips[ip].select()
+            row += 1
         shift = row
         # Port
         Tkinter.Label(self.root,
@@ -257,26 +262,26 @@ class web2pyDialog(object):
         # Password
         Tkinter.Label(self.root,
                       text='Choose Password:',
-                      justify=Tkinter.LEFT).grid(row=shift+1,
+                      justify=Tkinter.LEFT).grid(row=shift + 1,
                                                  column=0,
                                                  sticky=sticky)
 
         self.password = Tkinter.Entry(self.root, show='*')
         self.password.bind('<Return>', lambda e: self.start())
         self.password.focus_force()
-        self.password.grid(row=shift+1, column=1, sticky=sticky)
+        self.password.grid(row=shift + 1, column=1, sticky=sticky)
 
         # Prepare the canvas
         self.canvas = Tkinter.Canvas(self.root,
                                      width=300,
                                      height=100,
                                      bg='black')
-        self.canvas.grid(row=shift+2, column=0, columnspan=2)
+        self.canvas.grid(row=shift + 2, column=0, columnspan=2)
         self.canvas.after(1000, self.update_canvas)
 
         # Prepare the frame
         frame = Tkinter.Frame(self.root)
-        frame.grid(row=shift+3, column=0, columnspan=2)
+        frame.grid(row=shift + 3, column=0, columnspan=2)
 
         # Start button
         self.button_start = Tkinter.Button(frame,
@@ -309,12 +314,12 @@ class web2pyDialog(object):
         apps = []
         available_apps = [arq for arq in os.listdir('applications/')]
         available_apps = [arq for arq in available_apps
-            if os.path.exists('applications/%s/models/scheduler.py' % arq)]
+                          if os.path.exists('applications/%s/models/scheduler.py' % arq)]
         if start:
             #the widget takes care of starting the scheduler
             if self.options.scheduler and self.options.with_scheduler:
                 apps = [app.strip() for app in self.options.scheduler.split(',')
-                            if app in available_apps]
+                        if app in available_apps]
         for app in apps:
             self.try_start_scheduler(app)
 
@@ -324,11 +329,11 @@ class web2pyDialog(object):
             if arq not in self.scheduler_processes:
                 item = lambda u = arq: self.try_start_scheduler(u)
                 self.schedmenu.add_command(label="start %s" % arq,
-                                            command=item)
+                                           command=item)
             if arq in self.scheduler_processes:
                 item = lambda u = arq: self.try_stop_scheduler(u)
                 self.schedmenu.add_command(label="stop %s" % arq,
-                                            command=item)
+                                           command=item)
 
     def start_schedulers(self, app):
         try:
@@ -338,12 +343,13 @@ class web2pyDialog(object):
             return
         code = "from gluon import current;current._scheduler.loop()"
         print 'starting scheduler from widget for "%s"...' % app
-        args = (app,True,True,None,False,code)
+        args = (app, True, True, None, False, code)
         logging.getLogger().setLevel(self.options.debuglevel)
         p = Process(target=run, args=args)
         self.scheduler_processes[app] = p
         self.update_schedulers()
-        print "Currently running %s scheduler processes" % (len(self.scheduler_processes))
+        print "Currently running %s scheduler processes" % (
+            len(self.scheduler_processes))
         p.start()
         print "Processes started"
 
@@ -360,7 +366,6 @@ class web2pyDialog(object):
             t = threading.Thread(target=self.start_schedulers, args=(app,))
             t.start()
 
-
     def checkTaskBar(self):
         """ Check taskbar status """
 
@@ -573,7 +578,8 @@ def console():
 
     description = textwrap.dedent(description)
 
-    parser = optparse.OptionParser(usage, None, optparse.Option, ProgramVersion)
+    parser = optparse.OptionParser(
+        usage, None, optparse.Option, ProgramVersion)
 
     parser.description = description
 
@@ -857,7 +863,6 @@ def console():
                       dest='nobanner',
                       help='Do not print header banner')
 
-
     msg = 'listen on multiple addresses: "ip:port:cert:key:ca_cert;ip2:port2:cert2:key2:ca_cert2;..." (:cert:key optional; no spaces)'
     parser.add_option('--interfaces',
                       action='store',
@@ -865,7 +870,6 @@ def console():
                       default=None,
                       help=msg)
 
-
     msg = 'runs web2py tests'
     parser.add_option('--run_system_tests',
                       action='store_true',
@@ -873,10 +877,13 @@ def console():
                       default=False,
                       help=msg)
 
-    if '-A' in sys.argv: k = sys.argv.index('-A')
-    elif '--args' in sys.argv: k = sys.argv.index('--args')
-    else: k=len(sys.argv)
-    sys.argv, other_args = sys.argv[:k], sys.argv[k+1:]
+    if '-A' in sys.argv:
+        k = sys.argv.index('-A')
+    elif '--args' in sys.argv:
+        k = sys.argv.index('--args')
+    else:
+        k = len(sys.argv)
+    sys.argv, other_args = sys.argv[:k], sys.argv[k + 1:]
     (options, args) = parser.parse_args()
     options.args = [options.run] + other_args
     global_settings.cmd_options = options
@@ -885,7 +892,7 @@ def console():
     try:
         options.ips = [
             ip for ip in socket.gethostbyname_ex(socket.getfqdn())[2]
-            if ip!='127.0.0.1']
+            if ip != '127.0.0.1']
     except socket.gaierror:
         options.ips = []
 
@@ -943,7 +950,7 @@ def console():
 
         if not os.path.exists('welcome.w2p') or os.path.exists('NEWINSTALL'):
             try:
-                w2p_pack('welcome.w2p','applications/welcome')
+                w2p_pack('welcome.w2p', 'applications/welcome')
                 os.unlink('NEWINSTALL')
             except:
                 msg = "New installation: unable to create welcome.w2p file"
@@ -951,12 +958,14 @@ def console():
 
     return (options, args)
 
-def check_existent_app(options,appname):
+
+def check_existent_app(options, appname):
     if os.path.isdir(os.path.join(options.folder, 'applications', appname)):
         return True
 
+
 def get_code_for_scheduler(app, options):
-    if len(app) == 1 or app[1] == None:
+    if len(app) == 1 or app[1] is None:
         code = "from gluon import current;current._scheduler.loop()"
     else:
         code = "from gluon import current;current._scheduler.group_names = ['%s'];"
@@ -968,6 +977,7 @@ def get_code_for_scheduler(app, options):
         return None, None
     return app_, code
 
+
 def start_schedulers(options):
     try:
         from multiprocessing import Process
@@ -985,14 +995,14 @@ def start_schedulers(options):
         if not app_:
             return
         print 'starting single-scheduler for "%s"...' % app_
-        run(app_,True,True,None,False,code)
+        run(app_, True, True, None, False, code)
         return
     for app in apps:
         app_, code = get_code_for_scheduler(app, options)
         if not app_:
             continue
         print 'starting scheduler for "%s"...' % app_
-        args = (app_,True,True,None,False,code)
+        args = (app_, True, True, None, False, code)
         p = Process(target=run, args=args)
         processes.append(p)
         print "Currently running %s scheduler processes" % (len(processes))
@@ -1024,7 +1034,6 @@ def start(cron=True):
     if not options.nobanner:
         print 'Database drivers available: %s' % ', '.join(DRIVERS)
 
-
     # ## if -L load options from options.config file
     if options.config:
         try:
@@ -1037,8 +1046,8 @@ def start(cron=True):
                 print 'Cannot import config file [%s]' % options.config
                 sys.exit(1)
         for key in dir(options2):
-            if hasattr(options,key):
-                setattr(options,key,getattr(options2,key))
+            if hasattr(options, key):
+                setattr(options, key, getattr(options2, key))
 
     if False and not os.path.exists('logging.conf') and \
             os.path.exists('logging.example.conf'):
@@ -1048,7 +1057,7 @@ def start(cron=True):
         sys.stdout.write("OK\n")
 
     # ## if -T run doctests (no cron)
-    if hasattr(options,'test') and options.test:
+    if hasattr(options, 'test') and options.test:
         test(options.test, verbose=options.verbose)
         return
 
@@ -1066,7 +1075,8 @@ def start(cron=True):
         logger.debug('Starting extcron...')
         global_settings.web2py_crontype = 'external'
         if options.scheduler:   # -K
-            apps = [app.strip() for app in options.scheduler.split(',') if check_existent_app(options, app.strip())]
+            apps = [app.strip() for app in options.scheduler.split(
+                ',') if check_existent_app(options, app.strip())]
         else:
             apps = None
         extcron = newcron.extcron(options.folder, apps=apps)
@@ -1082,7 +1092,6 @@ def start(cron=True):
             pass
         return
 
-
     # ## if -H cron is enabled in this *process*
     # ## if --softcron use softcron
     # ## use hardcron in all other cases
@@ -1127,7 +1136,8 @@ def start(cron=True):
             import Tkinter
             havetk = True
         except ImportError:
-            logger.warn('GUI not available because Tk library is not installed')
+            logger.warn(
+                'GUI not available because Tk library is not installed')
             havetk = False
 
         if options.password == '<ask>' and havetk or options.taskbar and havetk:
diff --git a/gluon/winservice.py b/gluon/winservice.py
index 3d448496..38efe812 100644
--- a/gluon/winservice.py
+++ b/gluon/winservice.py
@@ -30,6 +30,7 @@ from fileutils import up
 
 __all__ = ['web2py_windows_service_handler']
 
+
 class Service(win32serviceutil.ServiceFramework):
 
     _svc_name_ = '_unNamed'
@@ -48,7 +49,7 @@ class Service(win32serviceutil.ServiceFramework):
             self.ReportServiceStatus(win32service.SERVICE_RUNNING)
             self.start()
             win32event.WaitForSingleObject(self.stop_event,
-                    win32event.INFINITE)
+                                           win32event.INFINITE)
         except:
             self.log(traceback.format_exc(sys.exc_info))
             self.SvcStop()
@@ -85,7 +86,7 @@ class Web2pyService(Service):
         try:
             h = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,
                                 r'SYSTEM\CurrentControlSet\Services\%s'
-                                 % self._svc_name_)
+                                % self._svc_name_)
             try:
                 cls = _winreg.QueryValue(h, 'PythonClass')
             finally:
@@ -108,11 +109,13 @@ class Web2pyService(Service):
         else:
             opt_mod = self._exe_args_
         options = __import__(opt_mod, [], [], '')
-        if True: # legacy support for old options files, which have only (deprecated) numthreads
+        if True:  # legacy support for old options files, which have only (deprecated) numthreads
             if hasattr(options, 'numthreads') and not hasattr(options, 'minthreads'):
                 options.minthreads = options.numthreads
-            if not hasattr(options, 'minthreads'): options.minthreads = None
-            if not hasattr(options, 'maxthreads'): options.maxthreads = None
+            if not hasattr(options, 'minthreads'):
+                options.minthreads = None
+            if not hasattr(options, 'maxthreads'):
+                options.maxthreads = None
         import main
         self.server = main.HttpServer(
             ip=options.ip,
@@ -130,7 +133,7 @@ class Web2pyService(Service):
             timeout=options.timeout,
             shutdown_timeout=options.shutdown_timeout,
             path=options.folder
-            )
+        )
         try:
             self.server.start()
         except:
@@ -152,17 +155,17 @@ class Web2pyService(Service):
 def web2py_windows_service_handler(argv=None, opt_file='options'):
     path = os.path.dirname(__file__)
     web2py_path = up(path)
-    if web2py_path.endswith('.zip'): # in case bianry distro 'library.zip'
+    if web2py_path.endswith('.zip'):  # in case bianry distro 'library.zip'
         web2py_path = os.path.dirname(web2py_path)
     os.chdir(web2py_path)
     classstring = os.path.normpath(
-        os.path.join(web2py_path,'gluon.winservice.Web2pyService'))
+        os.path.join(web2py_path, 'gluon.winservice.Web2pyService'))
     if opt_file:
         Web2pyService._exe_args_ = opt_file
         win32serviceutil.HandleCommandLine(Web2pyService,
-                serviceClassString=classstring, argv=['', 'install'])
+                                           serviceClassString=classstring, argv=['', 'install'])
     win32serviceutil.HandleCommandLine(Web2pyService,
-            serviceClassString=classstring, argv=argv)
+                                       serviceClassString=classstring, argv=argv)
 
 if __name__ == '__main__':
     web2py_windows_service_handler()
diff --git a/isapiwsgihandler.py b/isapiwsgihandler.py
index ce10023c..e3f38789 100644
--- a/isapiwsgihandler.py
+++ b/isapiwsgihandler.py
@@ -3,21 +3,23 @@ web2py handler for isapi-wsgi for IIS. Requires:
 http://code.google.com/p/isapi-wsgi/
 """
 # The entry point for the ISAPI extension.
+
+
 def __ExtensionFactory__():
     import os
     import sys
     path = os.path.dirname(os.path.abspath(__file__))
     os.chdir(path)
-    sys.path = [path]+[p for p in sys.path if not p==path]
+    sys.path = [path] + [p for p in sys.path if not p == path]
     import gluon.main
     import isapi_wsgi
-    application=gluon.main.wsgibase
+    application = gluon.main.wsgibase
     return isapi_wsgi.ISAPIThreadPoolHandler(application)
 
 # ISAPI installation:
-if __name__=='__main__':
+if __name__ == '__main__':
     import sys
-    if len(sys.argv)<2:
+    if len(sys.argv) < 2:
         print "USAGE: python isapiwsgihandler.py install --server=Sitename"
         sys.exit(0)
     from isapi.install import ISAPIParameters
@@ -26,10 +28,10 @@ if __name__=='__main__':
     from isapi.install import HandleCommandLine
 
     params = ISAPIParameters()
-    sm = [ ScriptMapParams(Extension="*", Flags=0) ]
+    sm = [ScriptMapParams(Extension="*", Flags=0)]
     vd = VirtualDirParameters(Name="appname",
-                              Description = "Web2py in Python",
-                              ScriptMaps = sm,
-                              ScriptMapUpdate = "replace")
+                              Description="Web2py in Python",
+                              ScriptMaps=sm,
+                              ScriptMapUpdate="replace")
     params.VirtualDirs = [vd]
     HandleCommandLine(params)
diff --git a/modpythonhandler.py b/modpythonhandler.py
index ae2fa49e..de4ee65f 100755
--- a/modpythonhandler.py
+++ b/modpythonhandler.py
@@ -34,7 +34,7 @@ from mod_python import apache
 
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
 import gluon.main
 
diff --git a/options_std.py b/options_std.py
index feb0a48f..c531e7f3 100644
--- a/options_std.py
+++ b/options_std.py
@@ -14,13 +14,14 @@ import os
 
 ip = '0.0.0.0'
 port = 80
-interfaces=[('0.0.0.0',80)] #,('0.0.0.0',443,'ssl_private_key.pem','ssl_certificate.pem')]
+interfaces = [('0.0.0.0', 80)]
+               #,('0.0.0.0',443,'ssl_private_key.pem','ssl_certificate.pem')]
 password = '<recycle>'  # ## <recycle> means use the previous password
 pid_filename = 'httpserver.pid'
 log_filename = 'httpserver.log'
 profiler_filename = None
-ssl_certificate = None #'ssl_certificate.pem'  # ## path to certificate file
-ssl_private_key = None #'ssl_private_key.pem'  # ## path to private key file
+ssl_certificate = None  # 'ssl_certificate.pem'  # ## path to certificate file
+ssl_private_key = None  # 'ssl_private_key.pem'  # ## path to private key file
 #numthreads = 50 # ## deprecated; remove
 minthreads = None
 maxthreads = None
diff --git a/router.example.py b/router.example.py
index f2e11498..8822ba54 100644
--- a/router.example.py
+++ b/router.example.py
@@ -102,8 +102,8 @@
 routers = dict(
 
     # base router
-    BASE = dict(
-        default_application = 'welcome',
+    BASE=dict(
+        default_application='welcome',
     ),
 )
 
@@ -145,6 +145,7 @@ logging = 'debug'
 # error_message = '<html><body><h1>%s</h1></body></html>'
 # error_message_ticket = '<html><body><h1>Internal error</h1>Ticket issued: <a href="/admin/default/ticket/%(ticket)s" target="_blank">%(ticket)s</a></body></html>'
 
+
 def __routes_doctest():
     '''
     Dummy function for doctesting routes.py.
diff --git a/routes.example.py b/routes.example.py
index cab718b3..fdcfebc6 100644
--- a/routes.example.py
+++ b/routes.example.py
@@ -31,25 +31,25 @@ routes_app = ((r'/(?P<app>welcome|admin|app)\b.*', r'\g<app>'),
 #   routes_in=( (r'/static/(?P<file>[\w./-]+)', r'/init/static/\g<file>') )
 #
 
-BASE = '' # optonal prefix for incoming URLs
+BASE = ''  # optonal prefix for incoming URLs
 
 routes_in = (
     # do not reroute admin unless you want to disable it
-    (BASE+'/admin','/admin/default/index'),
-    (BASE+'/admin/$anything','/admin/$anything'),
+    (BASE + '/admin', '/admin/default/index'),
+    (BASE + '/admin/$anything', '/admin/$anything'),
     # do not reroute appadmin unless you want to disable it
-    (BASE+'/$app/appadmin','/$app/appadmin/index'),
-    (BASE+'/$app/appadmin/$anything','/$app/appadmin/$anything'),
+    (BASE + '/$app/appadmin', '/$app/appadmin/index'),
+    (BASE + '/$app/appadmin/$anything', '/$app/appadmin/$anything'),
     # do not reroute static files
-    (BASE+'/$app/static/$anything','/$app/static/$anything'),
+    (BASE + '/$app/static/$anything', '/$app/static/$anything'),
     # reroute favicon and robots, use exable for lack of better choice
     ('/favicon.ico', '/examples/static/favicon.ico'),
     ('/robots.txt', '/examples/static/robots.txt'),
     # do other stuff
     ((r'.*http://otherdomain.com.* (?P<any>.*)', r'/app/ctr\g<any>')),
     # remove the BASE prefix
-    (BASE+'/$anything','/$anything'),
-    )
+    (BASE + '/$anything', '/$anything'),
+)
 
 # routes_out, like routes_in translates URL paths created with the web2py URL()
 # function in the same manner that route_in translates inbound URL paths.
@@ -57,16 +57,16 @@ routes_in = (
 
 routes_out = (
     # do not reroute admin unless you want to disable it
-    ('/admin/$anything', BASE+'/admin/$anything'),
+    ('/admin/$anything', BASE + '/admin/$anything'),
     # do not reroute appadmin unless you want to disable it
-    ('/$app/appadmin/$anything',BASE+'/$app/appadmin/$anything'),
+    ('/$app/appadmin/$anything', BASE + '/$app/appadmin/$anything'),
     # do not reroute static files
-    ('/$app/static/$anything', BASE+'/$app/static/$anything'),
+    ('/$app/static/$anything', BASE + '/$app/static/$anything'),
     # do other stuff
     (r'.*http://otherdomain.com.* /app/ctr(?P<any>.*)', r'\g<any>'),
     (r'/app(?P<any>.*)', r'\g<any>'),
     # restore the BASE prefix
-    ('/$anything',BASE+'/$anything'),
+    ('/$anything', BASE + '/$anything'),
 )
 
 # Specify log level for rewrite's debug logging
@@ -112,6 +112,7 @@ logging = 'debug'
 #routes_apps_raw=['myapp']
 #routes_apps_raw=['myapp', 'myotherapp']
 
+
 def __routes_doctest():
     '''
     Dummy function for doctesting routes.py.
diff --git a/scgihandler.py b/scgihandler.py
index acb055f8..c7f51cfd 100755
--- a/scgihandler.py
+++ b/scgihandler.py
@@ -47,7 +47,7 @@ import os
 
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
 import gluon.main
 
@@ -56,7 +56,7 @@ import gluon.main
 from wsgitools.scgi.forkpool import SCGIServer
 from wsgitools.filters import WSGIFilterMiddleware, GzipWSGIFilter
 
-wsgiapp=WSGIFilterMiddleware(gluon.main.wsgibase, GzipWSGIFilter)
+wsgiapp = WSGIFilterMiddleware(gluon.main.wsgibase, GzipWSGIFilter)
 
 if LOGGING:
     application = gluon.main.appfactory(wsgiapp=wsgiapp,
diff --git a/setup.py b/setup.py
index 37e06275..b1ce74f7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@ from gluon.fileutils import tar, untar, read_file, write_file
 import tarfile
 import sys
 
+
 def tar(file, filelist, expression='^.+$'):
     """
     tars dir/files into file, only tars file that match expression
@@ -21,9 +22,10 @@ def tar(file, filelist, expression='^.+$'):
     finally:
         tar.close()
 
+
 def start():
     if 'sdist' in sys.argv:
-        tar('gluon/env.tar',['applications','VERSION','splashlogo.gif'])
+        tar('gluon/env.tar', ['applications', 'VERSION', 'splashlogo.gif'])
 
     setup(name='web2py',
           version=read_file("VERSION").split()[1],
@@ -45,10 +47,10 @@ def start():
         """,
           author='Massimo Di Pierro',
           author_email='mdipierro@cs.depaul.edu',
-          license = 'http://web2py.com/examples/default/license',
-          classifiers = ["Development Status :: 5 - Production/Stable"],
+          license='http://web2py.com/examples/default/license',
+          classifiers=["Development Status :: 5 - Production/Stable"],
           url='http://web2py.com',
-          platforms ='Windows, Linux, Mac, Unix,Windows Mobile',
+          platforms='Windows, Linux, Mac, Unix,Windows Mobile',
           packages=['gluon',
                     'gluon/contrib',
                     'gluon/contrib/gateways',
@@ -63,8 +65,8 @@ def start():
                     'gluon/contrib/simplejson',
                     'gluon/tests',
                     ],
-          package_data = {'gluon':['env.tar']},
-          scripts = ['w2p_apps','w2p_run','w2p_clone'],
+          package_data={'gluon': ['env.tar']},
+          scripts=['w2p_apps', 'w2p_run', 'w2p_clone'],
           )
 
 if __name__ == '__main__':
diff --git a/setup_app.py b/setup_app.py
index 11df7c33..c26c61bc 100755
--- a/setup_app.py
+++ b/setup_app.py
@@ -13,12 +13,14 @@ from gluon.import_all import base_modules, contributed_modules
 import os
 import fnmatch
 
+
 class reglob:
     def __init__(self, directory, pattern="*"):
         self.stack = [directory]
         self.pattern = pattern
         self.files = []
         self.index = 0
+
     def __getitem__(self, index):
         while 1:
             try:
@@ -38,17 +40,17 @@ class reglob:
 
 setup(app=['web2py.py'],
       data_files=[
-        'NEWINSTALL',
-        'ABOUT',
-        'LICENSE',
-        'VERSION',
-        ] + \
-          [x for x in reglob('applications/examples')] + \
-          [x for x in reglob('applications/welcome')] + \
-          [x for x in reglob('applications/admin')],
+      'NEWINSTALL',
+      'ABOUT',
+      'LICENSE',
+      'VERSION',
+      ] +
+      [x for x in reglob('applications/examples')] +
+      [x for x in reglob('applications/welcome')] +
+      [x for x in reglob('applications/admin')],
       options={'py2app': {
-            'argv_emulation': True,
-            'includes': base_modules,
-            'packages': contributed_modules,
-            }},
+               'argv_emulation': True,
+               'includes': base_modules,
+               'packages': contributed_modules,
+               }},
       setup_requires=['py2app'])
diff --git a/setup_exe.py b/setup_exe.py
index 92d29639..2da2cf69 100755
--- a/setup_exe.py
+++ b/setup_exe.py
@@ -62,16 +62,16 @@ if python_version == '2.6':
 
 
 setup(
-  console=['web2py.py'],
-  windows=[{'script':'web2py.py',
-    'dest_base':'web2py_no_console' # MUST NOT be just 'web2py' otherwise it overrides the standard web2py.exe
-    }],
-  name="web2py",
-  version=web2py_version,
-  description="web2py web framework",
-  author="Massimo DiPierro",
-  license = "LGPL v3",
-  data_files=[
+    console=['web2py.py'],
+    windows=[{'script':'web2py.py',
+              'dest_base':'web2py_no_console'  # MUST NOT be just 'web2py' otherwise it overrides the standard web2py.exe
+              }],
+    name="web2py",
+    version=web2py_version,
+    description="web2py web framework",
+    author="Massimo DiPierro",
+    license="LGPL v3",
+    data_files=[
         'ABOUT',
         'LICENSE',
         'VERSION',
@@ -80,20 +80,21 @@ setup(
         'options_std.py',
         'app.example.yaml',
         'queue.example.yaml'
-        ],
-  options={'py2exe': {
-    'packages': contributed_modules,
-    'includes': base_modules,
-    }},
-  )
+    ],
+    options={'py2exe': {
+             'packages': contributed_modules,
+             'includes': base_modules,
+             }},
+)
 
 print "web2py binary successfully built"
 
+
 def copy_folders(source, destination):
     """Copy files & folders from source to destination (within dist/)"""
-    if os.path.exists(os.path.join('dist',destination)):
-        shutil.rmtree(os.path.join('dist',destination))
-    shutil.copytree(os.path.join(source), os.path.join('dist',destination))
+    if os.path.exists(os.path.join('dist', destination)):
+        shutil.rmtree(os.path.join('dist', destination))
+    shutil.copytree(os.path.join(source), os.path.join('dist', destination))
 
 #should we remove Windows OS dlls user is unlikely to be able to distribute
 
@@ -101,15 +102,16 @@ if remove_msft_dlls:
     print "Deleted Microsoft files not licensed for open source distribution"
     print "You are still responsible for making sure you have the rights to distribute any other included files!"
     #delete the API-MS-Win-Core DLLs
-    for f in glob ('dist/API-MS-Win-*.dll'):
-        os.unlink (f)
+    for f in glob('dist/API-MS-Win-*.dll'):
+        os.unlink(f)
     #then delete some other files belonging to Microsoft
-    other_ms_files = ['KERNELBASE.dll', 'MPR.dll', 'MSWSOCK.dll', 'POWRPROF.dll']
+    other_ms_files = ['KERNELBASE.dll', 'MPR.dll', 'MSWSOCK.dll',
+                      'POWRPROF.dll']
     for f in other_ms_files:
         try:
-            os.unlink(os.path.join('dist',f))
+            os.unlink(os.path.join('dist', f))
         except:
-            print "unable to delete dist/"+f
+            print "unable to delete dist/" + f
             #sys.exit(1)
 
 
@@ -144,29 +146,32 @@ else:
     pass
 
 
-
 #borrowed from http://bytes.com/topic/python/answers/851018-how-zip-directory-python-using-zipfile
-def recursive_zip(zipf, directory, folder = ""):
-   for item in os.listdir(directory):
-      if os.path.isfile(os.path.join(directory, item)):
-         zipf.write(os.path.join(directory, item), folder + os.sep + item)
-      elif os.path.isdir(os.path.join(directory, item)):
-         recursive_zip(zipf, os.path.join(directory, item), folder + os.sep + item)
+def recursive_zip(zipf, directory, folder=""):
+    for item in os.listdir(directory):
+        if os.path.isfile(os.path.join(directory, item)):
+            zipf.write(os.path.join(directory, item), folder + os.sep + item)
+        elif os.path.isdir(os.path.join(directory, item)):
+            recursive_zip(
+                zipf, os.path.join(directory, item), folder + os.sep + item)
 
 #should we create a zip file of the build?
 
 if make_zip:
     #to keep consistent with how official web2py windows zip file is setup,
     #create a web2py folder & copy dist's files into it
-    shutil.copytree('dist','zip_temp/web2py')
+    shutil.copytree('dist', 'zip_temp/web2py')
     #create zip file
     #use filename specified via command line
-    zipf = zipfile.ZipFile(zip_filename+".zip", "w", compression=zipfile.ZIP_DEFLATED )
-    path = 'zip_temp' #just temp so the web2py directory is included in our zip file
-    recursive_zip(zipf, path) #leave the first folder as None, as path is root.
+    zipf = zipfile.ZipFile(
+        zip_filename + ".zip", "w", compression=zipfile.ZIP_DEFLATED)
+    path = 'zip_temp'  # just temp so the web2py directory is included in our zip file
+    recursive_zip(
+        zipf, path)  # leave the first folder as None, as path is root.
     zipf.close()
     shutil.rmtree('zip_temp')
-    print "Your Windows binary version of web2py can be found in "+zip_filename+".zip"
+    print "Your Windows binary version of web2py can be found in " + \
+        zip_filename + ".zip"
     print "You may extract the archive anywhere and then run web2py/web2py.exe"
 
 #should py2exe build files be removed?
@@ -181,4 +186,4 @@ if not make_zip and not remove_build_files:
     print "Your Windows binary & associated files can also be found in /dist"
 
 print "Finished!"
-print "Enjoy web2py " +web2py_version_line
+print "Enjoy web2py " + web2py_version_line
diff --git a/web2py.py b/web2py.py
index 125ddcdb..1c6ac8ae 100755
--- a/web2py.py
+++ b/web2py.py
@@ -7,12 +7,12 @@ import sys
 if '__file__' in globals():
     path = os.path.dirname(os.path.abspath(__file__))
 elif hasattr(sys, 'frozen'):
-    path = os.path.dirname(os.path.abspath(sys.executable)) # for py2exe
-else: #should never happen
+    path = os.path.dirname(os.path.abspath(sys.executable))  # for py2exe
+else:  # should never happen
     path = os.getcwd()
 os.chdir(path)
 
-sys.path = [path]+[p for p in sys.path if not p == path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
 # import gluon.import_all ##### This should be uncommented for py2exe.py
 import gluon.widget
diff --git a/wsgihandler.py b/wsgihandler.py
index d43f37ca..e98c45e4 100644
--- a/wsgihandler.py
+++ b/wsgihandler.py
@@ -26,9 +26,9 @@ import os
 
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path] + [p for p in sys.path if not p == path]
 
-sys.stdout=sys.stderr
+sys.stdout = sys.stderr
 
 import gluon.main
 

From dd32a90844ce42e252876c1af1de109883982adc Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 12:59:58 -0500
Subject: [PATCH 39/49] upgraded feedparer and PyRSS2Gen

---
 VERSION                     |    2 +-
 gluon/contrib/feedparser.py | 1328 +++++++++++++++++++----------------
 gluon/contrib/rss2.py       |  436 +++++-------
 3 files changed, 890 insertions(+), 876 deletions(-)

diff --git a/VERSION b/VERSION
index a93bd69e..f34c30cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 12:33:48) dev
+Version 2.1.1 (2012-10-19 12:59:55) dev
diff --git a/gluon/contrib/feedparser.py b/gluon/contrib/feedparser.py
index a028d794..f8075c90 100755
--- a/gluon/contrib/feedparser.py
+++ b/gluon/contrib/feedparser.py
@@ -1,17 +1,19 @@
-#!/usr/bin/env python
 """Universal feed parser
 
 Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds
 
-Visit http://feedparser.org/ for the latest version
-Visit http://feedparser.org/docs/ for the latest documentation
+Visit https://code.google.com/p/feedparser/ for the latest version
+Visit http://packages.python.org/feedparser/ for the latest documentation
 
 Required: Python 2.4 or later
-Recommended: CJKCodecs and iconv_codec <http://cjkpython.i18n.org/>
+Recommended: iconv_codec <http://cjkpython.i18n.org/>
 """
 
-__version__ = "5.0.1"
-__license__ = """Copyright (c) 2002-2008, Mark Pilgrim, All rights reserved.
+__version__ = "5.1.2"
+__license__ = """
+Copyright (c) 2010-2012 Kurt McKee <contactme@kurtmckee.org>
+Copyright (c) 2002-2008 Mark Pilgrim
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -47,7 +49,7 @@ __contributors__ = ["Jason Diamond <http://injektilo.org/>",
 # HTTP "User-Agent" header to send to servers when downloading feeds.
 # If you are embedding feedparser in a larger application, you should
 # change this to your application name and URL.
-USER_AGENT = "UniversalFeedParser/%s +http://feedparser.org/" % __version__
+USER_AGENT = "UniversalFeedParser/%s +https://code.google.com/p/feedparser/" % __version__
 
 # HTTP "Accept" header to send to servers when downloading feeds.  If you don't
 # want to send an Accept header, set this to None.
@@ -75,6 +77,10 @@ RESOLVE_RELATIVE_URIS = 1
 # HTML content, set this to 1.
 SANITIZE_HTML = 1
 
+# If you want feedparser to automatically parse microformat content embedded
+# in entry contents, set this to 1
+PARSE_MICROFORMATS = 1
+
 # ---------- Python 3 modules (make it work if possible) ----------
 try:
     import rfc822
@@ -98,25 +104,25 @@ else:
     # Python 3.1 deprecates decodestring in favor of decodebytes
     _base64decode = getattr(base64, 'decodebytes', base64.decodestring)
 
-def _s2bytes(s):
-  # Convert a UTF-8 str to bytes if the interpreter is Python 3
-  try:
-    return bytes(s, 'utf8')
-  except (NameError, TypeError):
-    # In Python 2.5 and below, bytes doesn't exist (NameError)
-    # In Python 2.6 and above, bytes and str are the same (TypeError)
-    return s
-
-def _l2bytes(l):
-  # Convert a list of ints to bytes if the interpreter is Python 3
-  try:
-    if bytes is not str:
-      # In Python 2.6 and above, this call won't raise an exception
-      # but it will return bytes([65]) as '[65]' instead of 'A'
-      return bytes(l)
-    raise NameError
-  except NameError:
-    return ''.join(map(chr, l))
+# _s2bytes: convert a UTF-8 str to bytes if the interpreter is Python 3
+# _l2bytes: convert a list of ints to bytes if the interpreter is Python 3
+try:
+    if bytes is str:
+        # In Python 2.5 and below, bytes doesn't exist (NameError)
+        # In Python 2.6 and above, bytes and str are the same type
+        raise NameError
+except NameError:
+    # Python 2
+    def _s2bytes(s):
+        return s
+    def _l2bytes(l):
+        return ''.join(map(chr, l))
+else:
+    # Python 3
+    def _s2bytes(s):
+        return bytes(s, 'utf8')
+    def _l2bytes(l):
+        return bytes(l)
 
 # If you want feedparser to allow all URL schemes, set this to ()
 # List culled from Python's urlparse documentation at:
@@ -125,9 +131,10 @@ def _l2bytes(l):
 #   https://secure.wikimedia.org/wikipedia/en/wiki/URI_scheme
 # Many more will likely need to be added!
 ACCEPTABLE_URI_SCHEMES = (
-    'file', 'ftp', 'gopher', 'h323', 'hdl', 'http', 'https', 'imap', 'mailto',
-    'mms', 'news', 'nntp', 'prospero', 'rsync', 'rtsp', 'rtspu', 'sftp',
-    'shttp', 'sip', 'sips', 'snews', 'svn', 'svn+ssh', 'telnet', 'wais',
+    'file', 'ftp', 'gopher', 'h323', 'hdl', 'http', 'https', 'imap', 'magnet',
+    'mailto', 'mms', 'news', 'nntp', 'prospero', 'rsync', 'rtsp', 'rtspu',
+    'sftp', 'shttp', 'sip', 'sips', 'snews', 'svn', 'svn+ssh', 'telnet',
+    'wais',
     # Additional common-but-unofficial schemes
     'aim', 'callto', 'cvs', 'facetime', 'feed', 'git', 'gtalk', 'irc', 'ircs',
     'irc6', 'itms', 'mms', 'msnim', 'skype', 'ssh', 'smb', 'svn', 'ymsg',
@@ -136,16 +143,17 @@ ACCEPTABLE_URI_SCHEMES = (
 
 # ---------- required modules (should come with any Python distribution) ----------
 import cgi
+import codecs
 import copy
 import datetime
 import re
 import struct
-import sys
 import time
 import types
 import urllib
 import urllib2
 import urlparse
+import warnings
 
 from htmlentitydefs import name2codepoint, codepoint2name, entitydefs
 
@@ -170,7 +178,7 @@ except ImportError:
     zlib = None
 
 # If a real XML parser is available, feedparser will attempt to use it.  feedparser has
-# been tested with the built-in SAX parser, PyXML, and libxml2.  On platforms where the
+# been tested with the built-in SAX parser and libxml2.  On platforms where the
 # Python distribution does not come with an XML parser (such as Mac OS X 10.2 and some
 # versions of FreeBSD), feedparser will quietly fall back on regex-based parsing.
 try:
@@ -220,9 +228,12 @@ else:
     # feedparser's scope instead of sgmllib's scope.
     charref = re.compile('&#(\d+|[xX][0-9a-fA-F]+);')
     tagfind = re.compile('[a-zA-Z][-_.:a-zA-Z0-9]*')
+    attrfind = re.compile(
+        r'\s*([a-zA-Z_][-:.a-zA-Z_0-9]*)[$]?(\s*=\s*'
+        r'(\'[^\']*\'|"[^"]*"|[][\-a-zA-Z0-9./,:;+*%?!&$\(\)_#=~\'"@]*))?'
+    )
 
     # Unfortunately, these must be copied over to prevent NameError exceptions
-    attrfind = sgmllib.attrfind
     entityref = sgmllib.entityref
     incomplete = sgmllib.incomplete
     interesting = sgmllib.interesting
@@ -250,12 +261,8 @@ else:
     endbracket = _EndBracketRegEx()
 
 
-# cjkcodecs and iconv_codec provide support for more character encodings.
-# Both are available from http://cjkpython.i18n.org/
-try:
-    import cjkcodecs.aliases
-except ImportError:
-    pass
+# iconv_codec provides support for more character encodings.
+# It's available from http://cjkpython.i18n.org/
 try:
     import iconv_codec
 except ImportError:
@@ -268,15 +275,14 @@ try:
 except ImportError:
     chardet = None
 
-# BeautifulSoup parser used for parsing microformats from embedded HTML content
+# BeautifulSoup is used to extract microformat content from HTML
+# feedparser is tested using BeautifulSoup 3.2.0
 # http://www.crummy.com/software/BeautifulSoup/
-# feedparser is tested with BeautifulSoup 3.0.x, but it might work with the
-# older 2.x series.  If it doesn't, and you can figure out why, I'll accept a
-# patch and modify the compatibility statement accordingly.
 try:
     import BeautifulSoup
 except ImportError:
     BeautifulSoup = None
+    PARSE_MICROFORMATS = False
 
 # ---------- don't touch these ----------
 class ThingsNobodyCaresAboutButMe(Exception): pass
@@ -310,6 +316,7 @@ class FeedParserDict(dict):
               'date': 'updated',
               'date_parsed': 'updated_parsed',
               'description': ['summary', 'subtitle'],
+              'description_detail': ['summary_detail', 'subtitle_detail'],
               'url': ['href'],
               'modified': 'updated',
               'modified_parsed': 'updated_parsed',
@@ -330,10 +337,32 @@ class FeedParserDict(dict):
             return [norel(link) for link in dict.__getitem__(self, 'links') if link['rel']==u'enclosure']
         elif key == 'license':
             for link in dict.__getitem__(self, 'links'):
-                if link['rel']==u'license' and link.has_key('href'):
+                if link['rel']==u'license' and 'href' in link:
                     return link['href']
-        elif key == 'categories':
-            return [(tag['scheme'], tag['term']) for tag in dict.__getitem__(self, 'tags')]
+        elif key == 'updated':
+            # Temporarily help developers out by keeping the old
+            # broken behavior that was reported in issue 310.
+            # This fix was proposed in issue 328.
+            if not dict.__contains__(self, 'updated') and \
+                dict.__contains__(self, 'published'):
+                warnings.warn("To avoid breaking existing software while "
+                    "fixing issue 310, a temporary mapping has been created "
+                    "from `updated` to `published` if `updated` doesn't "
+                    "exist. This fallback will be removed in a future version "
+                    "of feedparser.", DeprecationWarning)
+                return dict.__getitem__(self, 'published')
+            return dict.__getitem__(self, 'updated')
+        elif key == 'updated_parsed':
+            if not dict.__contains__(self, 'updated_parsed') and \
+                dict.__contains__(self, 'published_parsed'):
+                warnings.warn("To avoid breaking existing software while "
+                    "fixing issue 310, a temporary mapping has been created "
+                    "from `updated_parsed` to `published_parsed` if "
+                    "`updated_parsed` doesn't exist. This fallback will be "
+                    "removed in a future version of feedparser.",
+                    DeprecationWarning)
+                return dict.__getitem__(self, 'published_parsed')
+            return dict.__getitem__(self, 'updated_parsed')
         else:
             realkey = self.keymap.get(key, key)
             if isinstance(realkey, list):
@@ -345,6 +374,11 @@ class FeedParserDict(dict):
         return dict.__getitem__(self, key)
 
     def __contains__(self, key):
+        if key in ('updated', 'updated_parsed'):
+            # Temporarily help developers out by keeping the old
+            # broken behavior that was reported in issue 310.
+            # This fix was proposed in issue 328.
+            return dict.__contains__(self, key)
         try:
             self.__getitem__(key)
         except KeyError:
@@ -380,66 +414,45 @@ class FeedParserDict(dict):
         except KeyError:
             raise AttributeError, "object has no attribute '%s'" % key
 
-
-_ebcdic_to_ascii_map = None
-def _ebcdic_to_ascii(s):
-    global _ebcdic_to_ascii_map
-    if not _ebcdic_to_ascii_map:
-        emap = (
-            0,1,2,3,156,9,134,127,151,141,142,11,12,13,14,15,
-            16,17,18,19,157,133,8,135,24,25,146,143,28,29,30,31,
-            128,129,130,131,132,10,23,27,136,137,138,139,140,5,6,7,
-            144,145,22,147,148,149,150,4,152,153,154,155,20,21,158,26,
-            32,160,161,162,163,164,165,166,167,168,91,46,60,40,43,33,
-            38,169,170,171,172,173,174,175,176,177,93,36,42,41,59,94,
-            45,47,178,179,180,181,182,183,184,185,124,44,37,95,62,63,
-            186,187,188,189,190,191,192,193,194,96,58,35,64,39,61,34,
-            195,97,98,99,100,101,102,103,104,105,196,197,198,199,200,201,
-            202,106,107,108,109,110,111,112,113,114,203,204,205,206,207,208,
-            209,126,115,116,117,118,119,120,121,122,210,211,212,213,214,215,
-            216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,
-            123,65,66,67,68,69,70,71,72,73,232,233,234,235,236,237,
-            125,74,75,76,77,78,79,80,81,82,238,239,240,241,242,243,
-            92,159,83,84,85,86,87,88,89,90,244,245,246,247,248,249,
-            48,49,50,51,52,53,54,55,56,57,250,251,252,253,254,255
-            )
-        _ebcdic_to_ascii_map = _maketrans( \
-            _l2bytes(range(256)), _l2bytes(emap))
-    return s.translate(_ebcdic_to_ascii_map)
+    def __hash__(self):
+        return id(self)
 
 _cp1252 = {
-  unichr(128): unichr(8364), # euro sign
-  unichr(130): unichr(8218), # single low-9 quotation mark
-  unichr(131): unichr( 402), # latin small letter f with hook
-  unichr(132): unichr(8222), # double low-9 quotation mark
-  unichr(133): unichr(8230), # horizontal ellipsis
-  unichr(134): unichr(8224), # dagger
-  unichr(135): unichr(8225), # double dagger
-  unichr(136): unichr( 710), # modifier letter circumflex accent
-  unichr(137): unichr(8240), # per mille sign
-  unichr(138): unichr( 352), # latin capital letter s with caron
-  unichr(139): unichr(8249), # single left-pointing angle quotation mark
-  unichr(140): unichr( 338), # latin capital ligature oe
-  unichr(142): unichr( 381), # latin capital letter z with caron
-  unichr(145): unichr(8216), # left single quotation mark
-  unichr(146): unichr(8217), # right single quotation mark
-  unichr(147): unichr(8220), # left double quotation mark
-  unichr(148): unichr(8221), # right double quotation mark
-  unichr(149): unichr(8226), # bullet
-  unichr(150): unichr(8211), # en dash
-  unichr(151): unichr(8212), # em dash
-  unichr(152): unichr( 732), # small tilde
-  unichr(153): unichr(8482), # trade mark sign
-  unichr(154): unichr( 353), # latin small letter s with caron
-  unichr(155): unichr(8250), # single right-pointing angle quotation mark
-  unichr(156): unichr( 339), # latin small ligature oe
-  unichr(158): unichr( 382), # latin small letter z with caron
-  unichr(159): unichr( 376)} # latin capital letter y with diaeresis
+    128: unichr(8364), # euro sign
+    130: unichr(8218), # single low-9 quotation mark
+    131: unichr( 402), # latin small letter f with hook
+    132: unichr(8222), # double low-9 quotation mark
+    133: unichr(8230), # horizontal ellipsis
+    134: unichr(8224), # dagger
+    135: unichr(8225), # double dagger
+    136: unichr( 710), # modifier letter circumflex accent
+    137: unichr(8240), # per mille sign
+    138: unichr( 352), # latin capital letter s with caron
+    139: unichr(8249), # single left-pointing angle quotation mark
+    140: unichr( 338), # latin capital ligature oe
+    142: unichr( 381), # latin capital letter z with caron
+    145: unichr(8216), # left single quotation mark
+    146: unichr(8217), # right single quotation mark
+    147: unichr(8220), # left double quotation mark
+    148: unichr(8221), # right double quotation mark
+    149: unichr(8226), # bullet
+    150: unichr(8211), # en dash
+    151: unichr(8212), # em dash
+    152: unichr( 732), # small tilde
+    153: unichr(8482), # trade mark sign
+    154: unichr( 353), # latin small letter s with caron
+    155: unichr(8250), # single right-pointing angle quotation mark
+    156: unichr( 339), # latin small ligature oe
+    158: unichr( 382), # latin small letter z with caron
+    159: unichr( 376), # latin capital letter y with diaeresis
+}
 
 _urifixer = re.compile('^([A-Za-z][A-Za-z0-9+-.]*://)(/*)(.*?)')
 def _urljoin(base, uri):
     uri = _urifixer.sub(r'\1\3', uri)
     #try:
+    if not isinstance(uri, unicode):
+        uri = uri.decode('utf-8', 'ignore')
     uri = urlparse.urljoin(base, uri)
     if not isinstance(uri, unicode):
         return uri.decode('utf-8', 'ignore')
@@ -449,75 +462,76 @@ def _urljoin(base, uri):
     #    return urlparse.urljoin(base, uri)
 
 class _FeedParserMixin:
-    namespaces = {'': '',
-                  'http://backend.userland.com/rss': '',
-                  'http://blogs.law.harvard.edu/tech/rss': '',
-                  'http://purl.org/rss/1.0/': '',
-                  'http://my.netscape.com/rdf/simple/0.9/': '',
-                  'http://example.com/newformat#': '',
-                  'http://example.com/necho': '',
-                  'http://purl.org/echo/': '',
-                  'uri/of/echo/namespace#': '',
-                  'http://purl.org/pie/': '',
-                  'http://purl.org/atom/ns#': '',
-                  'http://www.w3.org/2005/Atom': '',
-                  'http://purl.org/rss/1.0/modules/rss091#': '',
+    namespaces = {
+        '': '',
+        'http://backend.userland.com/rss': '',
+        'http://blogs.law.harvard.edu/tech/rss': '',
+        'http://purl.org/rss/1.0/': '',
+        'http://my.netscape.com/rdf/simple/0.9/': '',
+        'http://example.com/newformat#': '',
+        'http://example.com/necho': '',
+        'http://purl.org/echo/': '',
+        'uri/of/echo/namespace#': '',
+        'http://purl.org/pie/': '',
+        'http://purl.org/atom/ns#': '',
+        'http://www.w3.org/2005/Atom': '',
+        'http://purl.org/rss/1.0/modules/rss091#': '',
 
-                  'http://webns.net/mvcb/':                               'admin',
-                  'http://purl.org/rss/1.0/modules/aggregation/':         'ag',
-                  'http://purl.org/rss/1.0/modules/annotate/':            'annotate',
-                  'http://media.tangent.org/rss/1.0/':                    'audio',
-                  'http://backend.userland.com/blogChannelModule':        'blogChannel',
-                  'http://web.resource.org/cc/':                          'cc',
-                  'http://backend.userland.com/creativeCommonsRssModule': 'creativeCommons',
-                  'http://purl.org/rss/1.0/modules/company':              'co',
-                  'http://purl.org/rss/1.0/modules/content/':             'content',
-                  'http://my.theinfo.org/changed/1.0/rss/':               'cp',
-                  'http://purl.org/dc/elements/1.1/':                     'dc',
-                  'http://purl.org/dc/terms/':                            'dcterms',
-                  'http://purl.org/rss/1.0/modules/email/':               'email',
-                  'http://purl.org/rss/1.0/modules/event/':               'ev',
-                  'http://rssnamespace.org/feedburner/ext/1.0':           'feedburner',
-                  'http://freshmeat.net/rss/fm/':                         'fm',
-                  'http://xmlns.com/foaf/0.1/':                           'foaf',
-                  'http://www.w3.org/2003/01/geo/wgs84_pos#':             'geo',
-                  'http://postneo.com/icbm/':                             'icbm',
-                  'http://purl.org/rss/1.0/modules/image/':               'image',
-                  'http://www.itunes.com/DTDs/PodCast-1.0.dtd':           'itunes',
-                  'http://example.com/DTDs/PodCast-1.0.dtd':              'itunes',
-                  'http://purl.org/rss/1.0/modules/link/':                'l',
-                  'http://search.yahoo.com/mrss':                         'media',
-                  #Version 1.1.2 of the Media RSS spec added the trailing slash on the namespace
-                  'http://search.yahoo.com/mrss/':                         'media',
-                  'http://madskills.com/public/xml/rss/module/pingback/': 'pingback',
-                  'http://prismstandard.org/namespaces/1.2/basic/':       'prism',
-                  'http://www.w3.org/1999/02/22-rdf-syntax-ns#':          'rdf',
-                  'http://www.w3.org/2000/01/rdf-schema#':                'rdfs',
-                  'http://purl.org/rss/1.0/modules/reference/':           'ref',
-                  'http://purl.org/rss/1.0/modules/richequiv/':           'reqv',
-                  'http://purl.org/rss/1.0/modules/search/':              'search',
-                  'http://purl.org/rss/1.0/modules/slash/':               'slash',
-                  'http://schemas.xmlsoap.org/soap/envelope/':            'soap',
-                  'http://purl.org/rss/1.0/modules/servicestatus/':       'ss',
-                  'http://hacks.benhammersley.com/rss/streaming/':        'str',
-                  'http://purl.org/rss/1.0/modules/subscription/':        'sub',
-                  'http://purl.org/rss/1.0/modules/syndication/':         'sy',
-                  'http://schemas.pocketsoap.com/rss/myDescModule/':      'szf',
-                  'http://purl.org/rss/1.0/modules/taxonomy/':            'taxo',
-                  'http://purl.org/rss/1.0/modules/threading/':           'thr',
-                  'http://purl.org/rss/1.0/modules/textinput/':           'ti',
-                  'http://madskills.com/public/xml/rss/module/trackback/':'trackback',
-                  'http://wellformedweb.org/commentAPI/':                 'wfw',
-                  'http://purl.org/rss/1.0/modules/wiki/':                'wiki',
-                  'http://www.w3.org/1999/xhtml':                         'xhtml',
-                  'http://www.w3.org/1999/xlink':                         'xlink',
-                  'http://www.w3.org/XML/1998/namespace':                 'xml'
-}
+        'http://webns.net/mvcb/':                                'admin',
+        'http://purl.org/rss/1.0/modules/aggregation/':          'ag',
+        'http://purl.org/rss/1.0/modules/annotate/':             'annotate',
+        'http://media.tangent.org/rss/1.0/':                     'audio',
+        'http://backend.userland.com/blogChannelModule':         'blogChannel',
+        'http://web.resource.org/cc/':                           'cc',
+        'http://backend.userland.com/creativeCommonsRssModule':  'creativeCommons',
+        'http://purl.org/rss/1.0/modules/company':               'co',
+        'http://purl.org/rss/1.0/modules/content/':              'content',
+        'http://my.theinfo.org/changed/1.0/rss/':                'cp',
+        'http://purl.org/dc/elements/1.1/':                      'dc',
+        'http://purl.org/dc/terms/':                             'dcterms',
+        'http://purl.org/rss/1.0/modules/email/':                'email',
+        'http://purl.org/rss/1.0/modules/event/':                'ev',
+        'http://rssnamespace.org/feedburner/ext/1.0':            'feedburner',
+        'http://freshmeat.net/rss/fm/':                          'fm',
+        'http://xmlns.com/foaf/0.1/':                            'foaf',
+        'http://www.w3.org/2003/01/geo/wgs84_pos#':              'geo',
+        'http://postneo.com/icbm/':                              'icbm',
+        'http://purl.org/rss/1.0/modules/image/':                'image',
+        'http://www.itunes.com/DTDs/PodCast-1.0.dtd':            'itunes',
+        'http://example.com/DTDs/PodCast-1.0.dtd':               'itunes',
+        'http://purl.org/rss/1.0/modules/link/':                 'l',
+        'http://search.yahoo.com/mrss':                          'media',
+        # Version 1.1.2 of the Media RSS spec added the trailing slash on the namespace
+        'http://search.yahoo.com/mrss/':                         'media',
+        'http://madskills.com/public/xml/rss/module/pingback/':  'pingback',
+        'http://prismstandard.org/namespaces/1.2/basic/':        'prism',
+        'http://www.w3.org/1999/02/22-rdf-syntax-ns#':           'rdf',
+        'http://www.w3.org/2000/01/rdf-schema#':                 'rdfs',
+        'http://purl.org/rss/1.0/modules/reference/':            'ref',
+        'http://purl.org/rss/1.0/modules/richequiv/':            'reqv',
+        'http://purl.org/rss/1.0/modules/search/':               'search',
+        'http://purl.org/rss/1.0/modules/slash/':                'slash',
+        'http://schemas.xmlsoap.org/soap/envelope/':             'soap',
+        'http://purl.org/rss/1.0/modules/servicestatus/':        'ss',
+        'http://hacks.benhammersley.com/rss/streaming/':         'str',
+        'http://purl.org/rss/1.0/modules/subscription/':         'sub',
+        'http://purl.org/rss/1.0/modules/syndication/':          'sy',
+        'http://schemas.pocketsoap.com/rss/myDescModule/':       'szf',
+        'http://purl.org/rss/1.0/modules/taxonomy/':             'taxo',
+        'http://purl.org/rss/1.0/modules/threading/':            'thr',
+        'http://purl.org/rss/1.0/modules/textinput/':            'ti',
+        'http://madskills.com/public/xml/rss/module/trackback/': 'trackback',
+        'http://wellformedweb.org/commentAPI/':                  'wfw',
+        'http://purl.org/rss/1.0/modules/wiki/':                 'wiki',
+        'http://www.w3.org/1999/xhtml':                          'xhtml',
+        'http://www.w3.org/1999/xlink':                          'xlink',
+        'http://www.w3.org/XML/1998/namespace':                  'xml',
+    }
     _matchnamespaces = {}
 
-    can_be_relative_uri = ['link', 'id', 'wfw_comment', 'wfw_commentrss', 'docs', 'url', 'href', 'comments', 'icon', 'logo']
-    can_contain_relative_uris = ['content', 'title', 'summary', 'info', 'tagline', 'subtitle', 'copyright', 'rights', 'description']
-    can_contain_dangerous_markup = ['content', 'title', 'summary', 'info', 'tagline', 'subtitle', 'copyright', 'rights', 'description']
+    can_be_relative_uri = set(['link', 'id', 'wfw_comment', 'wfw_commentrss', 'docs', 'url', 'href', 'comments', 'icon', 'logo'])
+    can_contain_relative_uris = set(['content', 'title', 'summary', 'info', 'tagline', 'subtitle', 'copyright', 'rights', 'description'])
+    can_contain_dangerous_markup = set(['content', 'title', 'summary', 'info', 'tagline', 'subtitle', 'copyright', 'rights', 'description'])
     html_types = [u'text/html', u'application/xhtml+xml']
 
     def __init__(self, baseuri=None, baselang=None, encoding=u'utf-8'):
@@ -551,10 +565,20 @@ class _FeedParserMixin:
         self.baseuri = baseuri or u''
         self.lang = baselang or None
         self.svgOK = 0
-        self.hasTitle = 0
+        self.title_depth = -1
+        self.depth = 0
         if baselang:
             self.feeddata['language'] = baselang.replace('_','-')
 
+        # A map of the following form:
+        #     {
+        #         object_that_value_is_set_on: {
+        #             property_name: depth_of_node_property_was_extracted_from,
+        #             other_property: depth_of_node_property_was_extracted_from,
+        #         },
+        #     }
+        self.property_depth_map = {}
+
     def _normalize_attributes(self, kv):
         k = kv[0].lower()
         v = k in ('rel', 'type') and kv[1].lower() or kv[1]
@@ -568,6 +592,9 @@ class _FeedParserMixin:
         return (k, v)
 
     def unknown_starttag(self, tag, attrs):
+        # increment depth counter
+        self.depth += 1
+
         # normalize attrs
         attrs = map(self._normalize_attributes, attrs)
 
@@ -604,8 +631,8 @@ class _FeedParserMixin:
                 self.trackNamespace(None, uri)
 
         # track inline content
-        if self.incontent and self.contentparams.has_key('type') and not self.contentparams.get('type', u'xml').endswith(u'xml'):
-            if tag in ['xhtml:div', 'div']:
+        if self.incontent and not self.contentparams.get('type', u'xml').endswith(u'xml'):
+            if tag in ('xhtml:div', 'div'):
                 return # typepad does this 10/2007
             # element declared itself as escaped markup, but it isn't really
             self.contentparams['type'] = u'application/xhtml+xml'
@@ -675,9 +702,9 @@ class _FeedParserMixin:
             self.pop(prefix + suffix)
 
         # track inline content
-        if self.incontent and self.contentparams.has_key('type') and not self.contentparams.get('type', u'xml').endswith(u'xml'):
+        if self.incontent and not self.contentparams.get('type', u'xml').endswith(u'xml'):
             # element declared itself as escaped markup, but it isn't really
-            if tag in ['xhtml:div', 'div']:
+            if tag in ('xhtml:div', 'div'):
                 return # typepad does this 10/2007
             self.contentparams['type'] = u'application/xhtml+xml'
         if self.incontent and self.contentparams.get('type') == u'application/xhtml+xml':
@@ -694,6 +721,8 @@ class _FeedParserMixin:
             if self.langstack: # and (self.langstack[-1] is not None):
                 self.lang = self.langstack[-1]
 
+        self.depth -= 1
+
     def handle_charref(self, ref):
         # called for each character reference, e.g. for '&#160;', ref will be '160'
         if not self.elementstack:
@@ -715,7 +744,7 @@ class _FeedParserMixin:
             return
         if ref in ('lt', 'gt', 'quot', 'amp', 'apos'):
             text = '&%s;' % ref
-        elif ref in self.entities.keys():
+        elif ref in self.entities:
             text = self.entities[ref]
             if text.startswith('&#') and text.endswith(';'):
                 return self.handle_entityref(text)
@@ -778,17 +807,18 @@ class _FeedParserMixin:
 
     def trackNamespace(self, prefix, uri):
         loweruri = uri.lower()
-        if (prefix, loweruri) == (None, 'http://my.netscape.com/rdf/simple/0.9/') and not self.version:
-            self.version = u'rss090'
-        if loweruri == 'http://purl.org/rss/1.0/' and not self.version:
-            self.version = u'rss10'
-        if loweruri == 'http://www.w3.org/2005/atom' and not self.version:
-            self.version = u'atom10'
+        if not self.version:
+            if (prefix, loweruri) == (None, 'http://my.netscape.com/rdf/simple/0.9/'):
+                self.version = u'rss090'
+            elif loweruri == 'http://purl.org/rss/1.0/':
+                self.version = u'rss10'
+            elif loweruri == 'http://www.w3.org/2005/atom':
+                self.version = u'atom10'
         if loweruri.find(u'backend.userland.com/rss') <> -1:
             # match any backend.userland.com namespace
             uri = u'http://backend.userland.com/rss'
             loweruri = uri
-        if self._matchnamespaces.has_key(loweruri):
+        if loweruri in self._matchnamespaces:
             self.namespacemap[prefix] = self._matchnamespaces[loweruri]
             self.namespacesInUse[self._matchnamespaces[loweruri]] = uri
         else:
@@ -892,7 +922,7 @@ class _FeedParserMixin:
         # parse microformats
         # (must do this before sanitizing because some microformats
         # rely on elements that we sanitize)
-        if is_htmlish and element in ['content', 'description', 'summary']:
+        if PARSE_MICROFORMATS and is_htmlish and element in ['content', 'description', 'summary']:
             mfresults = _parseMicroformats(output, self.baseuri, self.encoding)
             if mfresults:
                 for tag in mfresults.get('tags', []):
@@ -923,13 +953,13 @@ class _FeedParserMixin:
 
         # map win-1252 extensions to the proper code points
         if isinstance(output, unicode):
-            output = u''.join([c in _cp1252.keys() and _cp1252[c] or c for c in output])
+            output = output.translate(_cp1252)
 
         # categories/tags/keywords/whatever are handled in _end_category
         if element == 'category':
             return output
 
-        if element == 'title' and self.hasTitle:
+        if element == 'title' and -1 < self.title_depth <= self.depth:
             return output
 
         # store output in appropriate place(s)
@@ -951,7 +981,10 @@ class _FeedParserMixin:
             else:
                 if element == 'description':
                     element = 'summary'
-                self.entries[-1][element] = output
+                old_value_depth = self.property_depth_map.setdefault(self.entries[-1], {}).get(element)
+                if old_value_depth is None or self.depth <= old_value_depth:
+                    self.property_depth_map[self.entries[-1]][element] = self.depth
+                    self.entries[-1][element] = output
                 if self.incontent:
                     contentparams = copy.deepcopy(self.contentparams)
                     contentparams['value'] = output
@@ -995,7 +1028,7 @@ class _FeedParserMixin:
     # data loss, this function errs on the conservative side.
     @staticmethod
     def lookslikehtml(s):
-        # must have a close tag or a entity reference to qualify
+        # must have a close tag or an entity reference to qualify
         if not (re.search(r'</(\w+)>',s) or re.search("&#?\w+;",s)):
             return
 
@@ -1077,11 +1110,11 @@ class _FeedParserMixin:
         self._cdf_common(attrsD)
 
     def _cdf_common(self, attrsD):
-        if attrsD.has_key('lastmod'):
+        if 'lastmod' in attrsD:
             self._start_modified({})
             self.elementstack[-1][-1] = attrsD['lastmod']
             self._end_modified()
-        if attrsD.has_key('href'):
+        if 'href' in attrsD:
             self._start_link({})
             self.elementstack[-1][-1] = attrsD['href']
             self._end_link()
@@ -1108,7 +1141,7 @@ class _FeedParserMixin:
         if not self.inentry:
             context.setdefault('image', FeedParserDict())
         self.inimage = 1
-        self.hasTitle = 0
+        self.title_depth = -1
         self.push('image', 0)
 
     def _end_image(self):
@@ -1119,7 +1152,7 @@ class _FeedParserMixin:
         context = self._getContext()
         context.setdefault('textinput', FeedParserDict())
         self.intextinput = 1
-        self.hasTitle = 0
+        self.title_depth = -1
         self.push('textinput', 0)
     _start_textInput = _start_textinput
 
@@ -1254,7 +1287,7 @@ class _FeedParserMixin:
     def _getContext(self):
         if self.insource:
             context = self.sourcedata
-        elif self.inimage and self.feeddata.has_key('image'):
+        elif self.inimage and 'image' in self.feeddata:
             context = self.feeddata['image']
         elif self.intextinput:
             context = self.feeddata['textinput']
@@ -1339,7 +1372,7 @@ class _FeedParserMixin:
         self.push('item', 0)
         self.inentry = 1
         self.guidislink = 0
-        self.hasTitle = 0
+        self.title_depth = -1
         id = self._getAttribute(attrsD, 'rdf:about')
         if id:
             context = self._getContext()
@@ -1373,18 +1406,19 @@ class _FeedParserMixin:
         self.push('published', 1)
     _start_dcterms_issued = _start_published
     _start_issued = _start_published
+    _start_pubdate = _start_published
 
     def _end_published(self):
         value = self.pop('published')
         self._save('published_parsed', _parse_date(value), overwrite=True)
     _end_dcterms_issued = _end_published
     _end_issued = _end_published
+    _end_pubdate = _end_published
 
     def _start_updated(self, attrsD):
         self.push('updated', 1)
     _start_modified = _start_updated
     _start_dcterms_modified = _start_updated
-    _start_pubdate = _start_updated
     _start_dc_date = _start_updated
     _start_lastbuilddate = _start_updated
 
@@ -1394,7 +1428,6 @@ class _FeedParserMixin:
         self._save('updated_parsed', parsed_value, overwrite=True)
     _end_modified = _end_updated
     _end_dcterms_modified = _end_updated
-    _end_pubdate = _end_updated
     _end_dc_date = _end_updated
     _end_lastbuilddate = _end_updated
 
@@ -1467,8 +1500,9 @@ class _FeedParserMixin:
         self._start_category(attrsD)
 
     def _end_itunes_keywords(self):
-        for term in self.pop('itunes_keywords').split():
-            self._addTag(term, u'http://www.itunes.com/', None)
+        for term in self.pop('itunes_keywords').split(','):
+            if term.strip():
+                self._addTag(term.strip(), u'http://www.itunes.com/', None)
 
     def _start_itunes_category(self, attrsD):
         self._addTag(attrsD.get('text'), u'http://www.itunes.com/', None)
@@ -1500,13 +1534,13 @@ class _FeedParserMixin:
             attrsD.setdefault('type', u'text/html')
         context = self._getContext()
         attrsD = self._itsAnHrefDamnIt(attrsD)
-        if attrsD.has_key('href'):
+        if 'href' in attrsD:
             attrsD['href'] = self.resolveURI(attrsD['href'])
         expectingText = self.infeed or self.inentry or self.insource
         context.setdefault('links', [])
         if not (self.inentry and self.inimage):
             context['links'].append(FeedParserDict(attrsD))
-        if attrsD.has_key('href'):
+        if 'href' in attrsD:
             expectingText = 0
             if (attrsD.get('rel') == u'alternate') and (self.mapContentType(attrsD.get('type')) in self.html_types):
                 context['link'] = attrsD['href']
@@ -1515,19 +1549,20 @@ class _FeedParserMixin:
 
     def _end_link(self):
         value = self.pop('link')
-        context = self._getContext()
 
     def _start_guid(self, attrsD):
         self.guidislink = (attrsD.get('ispermalink', 'true') == 'true')
         self.push('id', 1)
+    _start_id = _start_guid
 
     def _end_guid(self):
         value = self.pop('id')
-        self._save('guidislink', self.guidislink and not self._getContext().has_key('link'))
+        self._save('guidislink', self.guidislink and 'link' not in self._getContext())
         if self.guidislink:
             # guid acts as link, but only if 'ispermalink' is not present or is 'true',
             # and only if the item doesn't already have a link element
             self._save('link', value)
+    _end_id = _end_guid
 
     def _start_title(self, attrsD):
         if self.svgOK:
@@ -1542,18 +1577,17 @@ class _FeedParserMixin:
         value = self.popContent('title')
         if not value:
             return
-        context = self._getContext()
-        self.hasTitle = 1
+        self.title_depth = self.depth
     _end_dc_title = _end_title
 
     def _end_media_title(self):
-        hasTitle = self.hasTitle
+        title_depth = self.title_depth
         self._end_title()
-        self.hasTitle = hasTitle
+        self.title_depth = title_depth
 
     def _start_description(self, attrsD):
         context = self._getContext()
-        if context.has_key('summary'):
+        if 'summary' in context:
             self._summaryKey = 'content'
             self._start_content(attrsD)
         else:
@@ -1583,7 +1617,7 @@ class _FeedParserMixin:
     def _start_generator(self, attrsD):
         if attrsD:
             attrsD = self._itsAnHrefDamnIt(attrsD)
-            if attrsD.has_key('href'):
+            if 'href' in attrsD:
                 attrsD['href'] = self.resolveURI(attrsD['href'])
         self._getContext()['generator_detail'] = FeedParserDict(attrsD)
         self.push('generator', 1)
@@ -1591,7 +1625,7 @@ class _FeedParserMixin:
     def _end_generator(self):
         value = self.pop('generator')
         context = self._getContext()
-        if context.has_key('generator_detail'):
+        if 'generator_detail' in context:
             context['generator_detail']['name'] = value
 
     def _start_admin_generatoragent(self, attrsD):
@@ -1611,7 +1645,7 @@ class _FeedParserMixin:
 
     def _start_summary(self, attrsD):
         context = self._getContext()
-        if context.has_key('summary'):
+        if 'summary' in context:
             self._summaryKey = 'content'
             self._start_content(attrsD)
         else:
@@ -1635,17 +1669,17 @@ class _FeedParserMixin:
 
     def _start_source(self, attrsD):
         if 'url' in attrsD:
-          # This means that we're processing a source element from an RSS 2.0 feed
-          self.sourcedata['href'] = attrsD[u'url']
+            # This means that we're processing a source element from an RSS 2.0 feed
+            self.sourcedata['href'] = attrsD[u'url']
         self.push('source', 1)
         self.insource = 1
-        self.hasTitle = 0
+        self.title_depth = -1
 
     def _end_source(self):
         self.insource = 0
         value = self.pop('source')
         if value:
-          self.sourcedata['title'] = value
+            self.sourcedata['title'] = value
         self._getContext()['source'] = copy.deepcopy(self.sourcedata)
         self.sourcedata.clear()
 
@@ -1679,6 +1713,8 @@ class _FeedParserMixin:
         self.push('itunes_image', 0)
         if attrsD.get('href'):
             self._getContext()['image'] = FeedParserDict({'href': attrsD.get('href')})
+        elif attrsD.get('url'):
+            self._getContext()['image'] = FeedParserDict({'href': attrsD.get('url')})
     _start_itunes_link = _start_itunes_image
 
     def _end_itunes_block(self):
@@ -1707,7 +1743,7 @@ class _FeedParserMixin:
         url = self.pop('url')
         context = self._getContext()
         if url != None and len(url.strip()) != 0:
-            if not context['media_thumbnail'][-1].has_key('url'):
+            if 'url' not in context['media_thumbnail'][-1]:
                 context['media_thumbnail'][-1]['url'] = url
 
     def _start_media_player(self, attrsD):
@@ -1760,8 +1796,8 @@ if _XML_AVAILABLE:
             else:
                 givenprefix = None
             prefix = self._matchnamespaces.get(lowernamespace, givenprefix)
-            if givenprefix and (prefix == None or (prefix == '' and lowernamespace == '')) and not self.namespacesInUse.has_key(givenprefix):
-                    raise UndeclaredNamespace, "'%s' is not associated with a namespace" % givenprefix
+            if givenprefix and (prefix == None or (prefix == '' and lowernamespace == '')) and givenprefix not in self.namespacesInUse:
+                raise UndeclaredNamespace, "'%s' is not associated with a namespace" % givenprefix
             localname = str(localname).lower()
 
             # qname implementation is horribly broken in Python 2.1 (it
@@ -1781,9 +1817,9 @@ if _XML_AVAILABLE:
                 localname = prefix.lower() + ':' + localname
             elif namespace and not qname: #Expat
                 for name,value in self.namespacesInUse.items():
-                     if name and value == namespace:
-                         localname = name + ':' + localname
-                         break
+                    if name and value == namespace:
+                        localname = name + ':' + localname
+                        break
 
             for (namespace, attrlocalname), attrvalue in attrs.items():
                 lowernamespace = (namespace or '').lower()
@@ -1810,9 +1846,9 @@ if _XML_AVAILABLE:
                 localname = prefix + ':' + localname
             elif namespace and not qname: #Expat
                 for name,value in self.namespacesInUse.items():
-                     if name and value == namespace:
-                         localname = name + ':' + localname
-                         break
+                    if name and value == namespace:
+                        localname = name + ':' + localname
+                        break
             localname = str(localname).lower()
             self.unknown_endtag(localname)
 
@@ -1820,6 +1856,9 @@ if _XML_AVAILABLE:
             self.bozo = 1
             self.exc = exc
 
+        # drv_libxml2 calls warning() in some cases
+        warning = error
+
         def fatalError(self, exc):
             self.error(exc)
             raise exc
@@ -1827,11 +1866,11 @@ if _XML_AVAILABLE:
 class _BaseHTMLProcessor(sgmllib.SGMLParser):
     special = re.compile('''[<>'"]''')
     bare_ampersand = re.compile("&(?!#\d+;|#x[0-9a-fA-F]+;|\w+;)")
-    elements_no_end_tag = [
+    elements_no_end_tag = set([
       'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame',
       'hr', 'img', 'input', 'isindex', 'keygen', 'link', 'meta', 'param',
       'source', 'track', 'wbr'
-    ]
+    ])
 
     def __init__(self, encoding, _type):
         self.encoding = encoding
@@ -1871,7 +1910,6 @@ class _BaseHTMLProcessor(sgmllib.SGMLParser):
 
     def feed(self, data):
         data = re.compile(r'<!((?!DOCTYPE|--|\[))', re.IGNORECASE).sub(r'&lt;!\1', data)
-        #data = re.sub(r'<(\S+?)\s*?/>', self._shorttag_replace, data) # bug [ 1399464 ] Bad regexp for _shorttag_replace
         data = re.sub(r'<([^<>\s]+?)\s*/>', self._shorttag_replace, data)
         data = data.replace('&#39;', "'")
         data = data.replace('&#34;', '"')
@@ -1920,36 +1958,36 @@ class _BaseHTMLProcessor(sgmllib.SGMLParser):
                 except (UnicodeEncodeError, LookupError):
                     pass
         if tag in self.elements_no_end_tag:
-            self.pieces.append('<%(tag)s%(strattrs)s />' % locals())
+            self.pieces.append('<%s%s />' % (tag, strattrs))
         else:
-            self.pieces.append('<%(tag)s%(strattrs)s>' % locals())
+            self.pieces.append('<%s%s>' % (tag, strattrs))
 
     def unknown_endtag(self, tag):
         # called for each end tag, e.g. for </pre>, tag will be 'pre'
         # Reconstruct the original end tag.
         if tag not in self.elements_no_end_tag:
-            self.pieces.append("</%(tag)s>" % locals())
+            self.pieces.append("</%s>" % tag)
 
     def handle_charref(self, ref):
         # called for each character reference, e.g. for '&#160;', ref will be '160'
         # Reconstruct the original character reference.
         if ref.startswith('x'):
-            value = unichr(int(ref[1:],16))
+            value = int(ref[1:], 16)
         else:
-            value = unichr(int(ref))
+            value = int(ref)
 
-        if value in _cp1252.keys():
+        if value in _cp1252:
             self.pieces.append('&#%s;' % hex(ord(_cp1252[value]))[1:])
         else:
-            self.pieces.append('&#%(ref)s;' % locals())
+            self.pieces.append('&#%s;' % ref)
 
     def handle_entityref(self, ref):
         # called for each entity reference, e.g. for '&copy;', ref will be 'copy'
         # Reconstruct the original entity reference.
-        if name2codepoint.has_key(ref):
-            self.pieces.append('&%(ref)s;' % locals())
+        if ref in name2codepoint or ref == 'apos':
+            self.pieces.append('&%s;' % ref)
         else:
-            self.pieces.append('&amp;%(ref)s' % locals())
+            self.pieces.append('&amp;%s' % ref)
 
     def handle_data(self, text):
         # called for each block of plain text, i.e. outside of any tag and
@@ -1960,19 +1998,19 @@ class _BaseHTMLProcessor(sgmllib.SGMLParser):
     def handle_comment(self, text):
         # called for each HTML comment, e.g. <!-- insert Javascript code here -->
         # Reconstruct the original comment.
-        self.pieces.append('<!--%(text)s-->' % locals())
+        self.pieces.append('<!--%s-->' % text)
 
     def handle_pi(self, text):
         # called for each processing instruction, e.g. <?instruction>
         # Reconstruct original processing instruction.
-        self.pieces.append('<?%(text)s>' % locals())
+        self.pieces.append('<?%s>' % text)
 
     def handle_decl(self, text):
         # called for the DOCTYPE, if present, e.g.
         # <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
         #     "http://www.w3.org/TR/html4/loose.dtd">
         # Reconstruct original DOCTYPE
-        self.pieces.append('<!%(text)s>' % locals())
+        self.pieces.append('<!%s>' % text)
 
     _new_declname_match = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9:]*\s*').match
     def _scan_name(self, i, declstartpos):
@@ -2030,7 +2068,7 @@ class _LooseFeedParser(_FeedParserMixin, _BaseHTMLProcessor):
         data = data.replace('&#x22;', '&quot;')
         data = data.replace('&#39;', '&apos;')
         data = data.replace('&#x27;', '&apos;')
-        if self.contentparams.has_key('type') and not self.contentparams.get('type', u'xml').endswith(u'xml'):
+        if not self.contentparams.get('type', u'xml').endswith(u'xml'):
             data = data.replace('&lt;', '<')
             data = data.replace('&gt;', '>')
             data = data.replace('&amp;', '&')
@@ -2048,8 +2086,8 @@ class _MicroformatsParser:
     NODE = 4
     EMAIL = 5
 
-    known_xfn_relationships = ['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me']
-    known_binary_extensions =  ['zip','rar','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','rar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv']
+    known_xfn_relationships = set(['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me'])
+    known_binary_extensions =  set(['zip','rar','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','rar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv'])
 
     def __init__(self, data, baseuri, encoding):
         self.document = BeautifulSoup.BeautifulSoup(data)
@@ -2410,7 +2448,7 @@ class _MicroformatsParser:
 
     def isProbablyDownloadable(self, elm):
         attrsD = elm.attrMap
-        if not attrsD.has_key('href'):
+        if 'href' not in attrsD:
             return 0
         linktype = attrsD.get('type', '').strip()
         if linktype.startswith('audio/') or \
@@ -2459,10 +2497,7 @@ class _MicroformatsParser:
         all = lambda x: 1
         for elm in self.document(all, {'rel': re.compile('.+'), 'href': re.compile('.+')}):
             rels = elm.get('rel', u'').split()
-            xfn_rels = []
-            for rel in rels:
-                if rel in self.known_xfn_relationships:
-                    xfn_rels.append(rel)
+            xfn_rels = [r for r in rels if r in self.known_xfn_relationships]
             if xfn_rels:
                 self.xfn.append({"relationships": xfn_rels, "href": elm.get('href', ''), "name": elm.string})
 
@@ -2482,7 +2517,7 @@ def _parseMicroformats(htmlSource, baseURI, encoding):
     return {"tags": p.tags, "enclosures": p.enclosures, "xfn": p.xfn, "vcard": p.vcard}
 
 class _RelativeURIResolver(_BaseHTMLProcessor):
-    relative_uris = [('a', 'href'),
+    relative_uris = set([('a', 'href'),
                      ('applet', 'codebase'),
                      ('area', 'href'),
                      ('blockquote', 'cite'),
@@ -2506,14 +2541,14 @@ class _RelativeURIResolver(_BaseHTMLProcessor):
                      ('object', 'data'),
                      ('object', 'usemap'),
                      ('q', 'cite'),
-                     ('script', 'src')]
+                     ('script', 'src')])
 
     def __init__(self, baseuri, encoding, _type):
         _BaseHTMLProcessor.__init__(self, encoding, _type)
         self.baseuri = baseuri
 
     def resolveURI(self, uri):
-        return _makeSafeAbsoluteURI(_urljoin(self.baseuri, uri.strip()))
+        return _makeSafeAbsoluteURI(self.baseuri, uri.strip())
 
     def unknown_starttag(self, tag, attrs):
         attrs = self.normalize_attrs(attrs)
@@ -2531,21 +2566,30 @@ def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type):
 def _makeSafeAbsoluteURI(base, rel=None):
     # bail if ACCEPTABLE_URI_SCHEMES is empty
     if not ACCEPTABLE_URI_SCHEMES:
-        return _urljoin(base, rel or u'')
+        try:
+            return _urljoin(base, rel or u'')
+        except ValueError:
+            return u''
     if not base:
         return rel or u''
     if not rel:
-        scheme = urlparse.urlparse(base)[0]
+        try:
+            scheme = urlparse.urlparse(base)[0]
+        except ValueError:
+            return u''
         if not scheme or scheme in ACCEPTABLE_URI_SCHEMES:
             return base
         return u''
-    uri = _urljoin(base, rel)
+    try:
+        uri = _urljoin(base, rel)
+    except ValueError:
+        return u''
     if uri.strip().split(':', 1)[0] not in ACCEPTABLE_URI_SCHEMES:
         return u''
     return uri
 
 class _HTMLSanitizer(_BaseHTMLProcessor):
-    acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area',
+    acceptable_elements = set(['a', 'abbr', 'acronym', 'address', 'area',
         'article', 'aside', 'audio', 'b', 'big', 'blockquote', 'br', 'button',
         'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
         'command', 'datagrid', 'datalist', 'dd', 'del', 'details', 'dfn',
@@ -2557,9 +2601,9 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
         'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
         'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
         'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
-        'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video', 'noscript']
+        'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video', 'noscript'])
 
-    acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
+    acceptable_attributes = set(['abbr', 'accept', 'accept-charset', 'accesskey',
       'action', 'align', 'alt', 'autocomplete', 'autofocus', 'axis',
       'background', 'balance', 'bgcolor', 'bgproperties', 'border',
       'bordercolor', 'bordercolordark', 'bordercolorlight', 'bottompadding',
@@ -2580,11 +2624,11 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
       'start', 'step', 'summary', 'suppress', 'tabindex', 'target', 'template',
       'title', 'toppadding', 'type', 'unselectable', 'usemap', 'urn', 'valign',
       'value', 'variable', 'volume', 'vspace', 'vrml', 'width', 'wrap',
-      'xml:lang']
+      'xml:lang'])
 
-    unacceptable_elements_with_end_tag = ['script', 'applet', 'style']
+    unacceptable_elements_with_end_tag = set(['script', 'applet', 'style'])
 
-    acceptable_css_properties = ['azimuth', 'background-color',
+    acceptable_css_properties = set(['azimuth', 'background-color',
       'border-bottom-color', 'border-collapse', 'border-color',
       'border-left-color', 'border-right-color', 'border-top-color', 'clear',
       'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
@@ -2594,26 +2638,26 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
       'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
       'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
       'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
-      'white-space', 'width']
+      'white-space', 'width'])
 
     # survey of common keywords found in feeds
-    acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
+    acceptable_css_keywords = set(['auto', 'aqua', 'black', 'block', 'blue',
       'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
       'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
       'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
       'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
-      'transparent', 'underline', 'white', 'yellow']
+      'transparent', 'underline', 'white', 'yellow'])
 
     valid_css_values = re.compile('^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|' +
       '\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$')
 
-    mathml_elements = ['annotation', 'annotation-xml', 'maction', 'math',
+    mathml_elements = set(['annotation', 'annotation-xml', 'maction', 'math',
       'merror', 'mfenced', 'mfrac', 'mi', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded',
       'mphantom', 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle',
       'msub', 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
-      'munderover', 'none', 'semantics']
+      'munderover', 'none', 'semantics'])
 
-    mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
+    mathml_attributes = set(['actiontype', 'align', 'columnalign', 'columnalign',
       'columnalign', 'close', 'columnlines', 'columnspacing', 'columnspan', 'depth',
       'display', 'displaystyle', 'encoding', 'equalcolumns', 'equalrows',
       'fence', 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness',
@@ -2621,18 +2665,18 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
       'maxsize', 'minsize', 'open', 'other', 'rowalign', 'rowalign', 'rowalign',
       'rowlines', 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
       'separator', 'separators', 'stretchy', 'width', 'width', 'xlink:href',
-      'xlink:show', 'xlink:type', 'xmlns', 'xmlns:xlink']
+      'xlink:show', 'xlink:type', 'xmlns', 'xmlns:xlink'])
 
     # svgtiny - foreignObject + linearGradient + radialGradient + stop
-    svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
+    svg_elements = set(['a', 'animate', 'animateColor', 'animateMotion',
       'animateTransform', 'circle', 'defs', 'desc', 'ellipse', 'foreignObject',
       'font-face', 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern',
       'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph', 'mpath',
       'path', 'polygon', 'polyline', 'radialGradient', 'rect', 'set', 'stop',
-      'svg', 'switch', 'text', 'title', 'tspan', 'use']
+      'svg', 'switch', 'text', 'title', 'tspan', 'use'])
 
     # svgtiny + class + opacity + offset + xmlns + xmlns:xlink
-    svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
+    svg_attributes = set(['accent-height', 'accumulate', 'additive', 'alphabetic',
        'arabic-form', 'ascent', 'attributeName', 'attributeType',
        'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
        'class', 'color', 'color-rendering', 'content', 'cx', 'cy', 'd', 'dx',
@@ -2658,14 +2702,14 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
        'widths', 'x', 'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
        'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title', 'xlink:type',
        'xml:base', 'xml:lang', 'xml:space', 'xmlns', 'xmlns:xlink', 'y', 'y1',
-       'y2', 'zoomAndPan']
+       'y2', 'zoomAndPan'])
 
     svg_attr_map = None
     svg_elem_map = None
 
-    acceptable_svg_properties = [ 'fill', 'fill-opacity', 'fill-rule',
+    acceptable_svg_properties = set([ 'fill', 'fill-opacity', 'fill-rule',
       'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
-      'stroke-opacity']
+      'stroke-opacity'])
 
     def reset(self):
         _BaseHTMLProcessor.reset(self)
@@ -2718,7 +2762,7 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
 
         # declare xlink namespace, if needed
         if self.mathmlOK or self.svgOK:
-            if filter((lambda n,v: n.startswith('xlink:')),attrs):
+            if filter(lambda (n,v): n.startswith('xlink:'),attrs):
                 if not ('xmlns:xlink','http://www.w3.org/1999/xlink') in attrs:
                     attrs.append(('xmlns:xlink','http://www.w3.org/1999/xlink'))
 
@@ -2923,9 +2967,6 @@ def _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, h
     if hasattr(url_file_stream_or_string, 'read'):
         return url_file_stream_or_string
 
-    if url_file_stream_or_string == '-':
-        return sys.stdin
-
     if isinstance(url_file_stream_or_string, basestring) \
        and urlparse.urlparse(url_file_stream_or_string)[0] in ('http', 'https', 'ftp', 'file', 'feed'):
         # Deal with the feed URI scheme
@@ -2952,7 +2993,7 @@ def _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, h
 
         # try to open with urllib2 (to use optional headers)
         request = _build_urllib2_request(url_file_stream_or_string, agent, etag, modified, referrer, auth, request_headers)
-        opener = apply(urllib2.build_opener, tuple(handlers + [_FeedURLHandler()]))
+        opener = urllib2.build_opener(*tuple(handlers + [_FeedURLHandler()]))
         opener.addheaders = [] # RMK - must clear so we only send our custom User-Agent
         try:
             return opener.open(request)
@@ -2962,7 +3003,14 @@ def _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, h
     # try to open with native open function (if url_file_stream_or_string is a filename)
     try:
         return open(url_file_stream_or_string, 'rb')
-    except IOError:
+    except (IOError, UnicodeEncodeError, TypeError):
+        # if url_file_stream_or_string is a unicode object that
+        # cannot be converted to the encoding returned by
+        # sys.getfilesystemencoding(), a UnicodeEncodeError
+        # will be thrown
+        # If url_file_stream_or_string is a string that contains NULL
+        # (such as an XML document encoded in UTF-32), TypeError will
+        # be thrown.
         pass
 
     # treat url_file_stream_or_string as string
@@ -3122,7 +3170,7 @@ def _parse_date_iso8601(dateString):
         day = int(day)
     # special case of the century - is the first year of the 21st century
     # 2000 or 2001 ? The debate goes on...
-    if 'century' in params.keys():
+    if 'century' in params:
         year = (int(params['century']) - 1) * 100 + 1
     # in ISO 8601 most fields are optional
     for field in ['hour', 'minute', 'second', 'tzhour', 'tzmin']:
@@ -3197,20 +3245,6 @@ def _parse_date_nate(dateString):
     return _parse_date_w3dtf(w3dtfdate)
 registerDateHandler(_parse_date_nate)
 
-_mssql_date_re = \
-    re.compile('(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})(\.\d+)?')
-def _parse_date_mssql(dateString):
-    '''Parse a string according to the MS SQL date format'''
-    m = _mssql_date_re.match(dateString)
-    if not m:
-        return
-    w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \
-                {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\
-                 'hour': m.group(4), 'minute': m.group(5), 'second': m.group(6),\
-                 'zonediff': '+09:00'}
-    return _parse_date_w3dtf(w3dtfdate)
-registerDateHandler(_parse_date_mssql)
-
 # Unicode strings for Greek date strings
 _greek_months = \
   { \
@@ -3306,6 +3340,9 @@ registerDateHandler(_parse_date_hungarian)
 # Drake and licensed under the Python license.  Removed all range checking
 # for month, day, hour, minute, and second, since mktime will normalize
 # these later
+# Modified to also support MSSQL-style datetimes as defined at:
+# http://msdn.microsoft.com/en-us/library/ms186724.aspx
+# (which basically means allowing a space as a date/time/timezone separator)
 def _parse_date_w3dtf(dateString):
     def __extract_date(m):
         year = int(m.group('year'))
@@ -3331,7 +3368,7 @@ def _parse_date_w3dtf(dateString):
                         day = 31
                 elif jday < julian:
                     if day + diff < 28:
-                       day = day + diff
+                        day = day + diff
                     else:
                         month = month + 1
             return year, month, day
@@ -3387,12 +3424,11 @@ def _parse_date_w3dtf(dateString):
                  '(?:(?P<dsep>-|)'
                  '(?:(?P<month>\d\d)(?:(?P=dsep)(?P<day>\d\d))?'
                  '|(?P<julian>\d\d\d)))?')
-    __tzd_re = '(?P<tzd>[-+](?P<tzdhours>\d\d)(?::?(?P<tzdminutes>\d\d))|Z)'
-    __tzd_rx = re.compile(__tzd_re)
+    __tzd_re = ' ?(?P<tzd>[-+](?P<tzdhours>\d\d)(?::?(?P<tzdminutes>\d\d))|Z)?'
     __time_re = ('(?P<hours>\d\d)(?P<tsep>:|)(?P<minutes>\d\d)'
                  '(?:(?P=tsep)(?P<seconds>\d\d)(?:[.,]\d+)?)?'
                  + __tzd_re)
-    __datetime_re = '%s(?:T%s)?' % (__date_re, __time_re)
+    __datetime_re = '%s(?:[T ]%s)?' % (__date_re, __time_re)
     __datetime_rx = re.compile(__datetime_re)
     m = __datetime_rx.match(dateString)
     if (m is None) or (m.group() != dateString):
@@ -3403,41 +3439,91 @@ def _parse_date_w3dtf(dateString):
     return time.gmtime(time.mktime(gmt) + __extract_tzd(m) - time.timezone)
 registerDateHandler(_parse_date_w3dtf)
 
-def _parse_date_rfc822(dateString):
-    '''Parse an RFC822, RFC1123, RFC2822, or asctime-style date'''
-    data = dateString.split()
-    if not data:
+# Define the strings used by the RFC822 datetime parser
+_rfc822_months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun',
+          'jul', 'aug', 'sep', 'oct', 'nov', 'dec']
+_rfc822_daynames = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
+
+# Only the first three letters of the month name matter
+_rfc822_month = "(?P<month>%s)(?:[a-z]*,?)" % ('|'.join(_rfc822_months))
+# The year may be 2 or 4 digits; capture the century if it exists
+_rfc822_year = "(?P<year>(?:\d{2})?\d{2})"
+_rfc822_day = "(?P<day> *\d{1,2})"
+_rfc822_date = "%s %s %s" % (_rfc822_day, _rfc822_month, _rfc822_year)
+
+_rfc822_hour = "(?P<hour>\d{2}):(?P<minute>\d{2})(?::(?P<second>\d{2}))?"
+_rfc822_tz = "(?P<tz>ut|gmt(?:[+-]\d{2}:\d{2})?|[aecmp][sd]?t|[zamny]|[+-]\d{4})"
+_rfc822_tznames = {
+    'ut': 0, 'gmt': 0, 'z': 0,
+    'adt': -3, 'ast': -4, 'at': -4,
+    'edt': -4, 'est': -5, 'et': -5,
+    'cdt': -5, 'cst': -6, 'ct': -6,
+    'mdt': -6, 'mst': -7, 'mt': -7,
+    'pdt': -7, 'pst': -8, 'pt': -8,
+    'a': -1, 'n': 1,
+    'm': -12, 'y': 12,
+ }
+# The timezone may be prefixed by 'Etc/'
+_rfc822_time = "%s (?:etc/)?%s" % (_rfc822_hour, _rfc822_tz)
+
+_rfc822_dayname = "(?P<dayname>%s)" % ('|'.join(_rfc822_daynames))
+_rfc822_match = re.compile(
+    "(?:%s, )?%s(?: %s)?" % (_rfc822_dayname, _rfc822_date, _rfc822_time)
+).match
+
+def _parse_date_rfc822(dt):
+    """Parse RFC 822 dates and times, with one minor
+    difference: years may be 4DIGIT or 2DIGIT.
+    http://tools.ietf.org/html/rfc822#section-5"""
+    try:
+        m = _rfc822_match(dt.lower()).groupdict(0)
+    except AttributeError:
         return None
-    if data[0][-1] in (',', '.') or data[0].lower() in rfc822._daynames:
-        del data[0]
-    if len(data) == 4:
-        s = data[3]
-        i = s.find('+')
-        if i > 0:
-            data[3:] = [s[:i], s[i+1:]]
-        else:
-            data.append('')
-        dateString = " ".join(data)
-    # Account for the Etc/GMT timezone by stripping 'Etc/'
-    elif len(data) == 5 and data[4].lower().startswith('etc/'):
-        data[4] = data[4][4:]
-        dateString = " ".join(data)
-    if len(data) < 5:
-        dateString += ' 00:00:00 GMT'
-    tm = rfc822.parsedate_tz(dateString)
-    if tm:
-        # Jython doesn't adjust for 2-digit years like CPython does,
-        # so account for it by shifting the year so that it's in the
-        # range 1970-2069 (1970 being the year of the Unix epoch).
-        if tm[0] < 100:
-            tm = (tm[0] + (1900, 2000)[tm[0] < 70],) + tm[1:]
-        return time.gmtime(rfc822.mktime_tz(tm))
-# rfc822.py defines several time zones, but we define some extra ones.
-# 'ET' is equivalent to 'EST', etc.
-_additional_timezones = {'AT': -400, 'ET': -500, 'CT': -600, 'MT': -700, 'PT': -800}
-rfc822._timezones.update(_additional_timezones)
+
+    # Calculate a date and timestamp
+    for k in ('year', 'day', 'hour', 'minute', 'second'):
+        m[k] = int(m[k])
+    m['month'] = _rfc822_months.index(m['month']) + 1
+    # If the year is 2 digits, assume everything in the 90's is the 1990's
+    if m['year'] < 100:
+        m['year'] += (1900, 2000)[m['year'] < 90]
+    stamp = datetime.datetime(*[m[i] for i in 
+                ('year', 'month', 'day', 'hour', 'minute', 'second')])
+
+    # Use the timezone information to calculate the difference between
+    # the given date and timestamp and Universal Coordinated Time
+    tzhour = 0
+    tzmin = 0
+    if m['tz'] and m['tz'].startswith('gmt'):
+        # Handle GMT and GMT+hh:mm timezone syntax (the trailing
+        # timezone info will be handled by the next `if` block)
+        m['tz'] = ''.join(m['tz'][3:].split(':')) or 'gmt'
+    if not m['tz']:
+        pass
+    elif m['tz'].startswith('+'):
+        tzhour = int(m['tz'][1:3])
+        tzmin = int(m['tz'][3:])
+    elif m['tz'].startswith('-'):
+        tzhour = int(m['tz'][1:3]) * -1
+        tzmin = int(m['tz'][3:]) * -1
+    else:
+        tzhour = _rfc822_tznames[m['tz']]
+    delta = datetime.timedelta(0, 0, 0, 0, tzmin, tzhour)
+
+    # Return the date and timestamp in UTC
+    return (stamp - delta).utctimetuple()
 registerDateHandler(_parse_date_rfc822)
 
+def _parse_date_asctime(dt):
+    """Parse asctime-style dates"""
+    dayname, month, day, remainder = dt.split(None, 3)
+    # Convert month and day into zero-padded integers
+    month = '%02i ' % (_rfc822_months.index(month.lower()) + 1)
+    day = '%02i ' % (int(day),)
+    dt = month + day + remainder
+    return time.strptime(dt, '%m %d %H:%M:%S %Y')[:-1] + (0, )
+registerDateHandler(_parse_date_asctime)
+
 def _parse_date_perforce(aDateString):
     """parse a date in yyyy/mm/dd hh:mm:ss TTT format"""
     # Fri, 2006/09/15 08:19:53 EDT
@@ -3471,211 +3557,283 @@ def _parse_date(dateString):
         return date9tuple
     return None
 
-def _getCharacterEncoding(http_headers, xml_data):
-    '''Get the character encoding of the XML document
+# Each marker represents some of the characters of the opening XML
+# processing instruction ('<?xm') in the specified encoding.
+EBCDIC_MARKER = _l2bytes([0x4C, 0x6F, 0xA7, 0x94])
+UTF16BE_MARKER = _l2bytes([0x00, 0x3C, 0x00, 0x3F])
+UTF16LE_MARKER = _l2bytes([0x3C, 0x00, 0x3F, 0x00])
+UTF32BE_MARKER = _l2bytes([0x00, 0x00, 0x00, 0x3C])
+UTF32LE_MARKER = _l2bytes([0x3C, 0x00, 0x00, 0x00])
+
+ZERO_BYTES = _l2bytes([0x00, 0x00])
+
+# Match the opening XML declaration.
+# Example: <?xml version="1.0" encoding="utf-8"?>
+RE_XML_DECLARATION = re.compile('^<\?xml[^>]*?>')
+
+# Capture the value of the XML processing instruction's encoding attribute.
+# Example: <?xml version="1.0" encoding="utf-8"?>
+RE_XML_PI_ENCODING = re.compile(_s2bytes('^<\?.*encoding=[\'"](.*?)[\'"].*\?>'))
+
+def convert_to_utf8(http_headers, data):
+    '''Detect and convert the character encoding to UTF-8.
 
     http_headers is a dictionary
-    xml_data is a raw string (not Unicode)
+    data is a raw string (not Unicode)'''
 
-    This is so much trickier than it sounds, it's not even funny.
-    According to RFC 3023 ('XML Media Types'), if the HTTP Content-Type
-    is application/xml, application/*+xml,
-    application/xml-external-parsed-entity, or application/xml-dtd,
-    the encoding given in the charset parameter of the HTTP Content-Type
-    takes precedence over the encoding given in the XML prefix within the
-    document, and defaults to 'utf-8' if neither are specified.  But, if
-    the HTTP Content-Type is text/xml, text/*+xml, or
-    text/xml-external-parsed-entity, the encoding given in the XML prefix
-    within the document is ALWAYS IGNORED and only the encoding given in
-    the charset parameter of the HTTP Content-Type header should be
-    respected, and it defaults to 'us-ascii' if not specified.
+    # This is so much trickier than it sounds, it's not even funny.
+    # According to RFC 3023 ('XML Media Types'), if the HTTP Content-Type
+    # is application/xml, application/*+xml,
+    # application/xml-external-parsed-entity, or application/xml-dtd,
+    # the encoding given in the charset parameter of the HTTP Content-Type
+    # takes precedence over the encoding given in the XML prefix within the
+    # document, and defaults to 'utf-8' if neither are specified.  But, if
+    # the HTTP Content-Type is text/xml, text/*+xml, or
+    # text/xml-external-parsed-entity, the encoding given in the XML prefix
+    # within the document is ALWAYS IGNORED and only the encoding given in
+    # the charset parameter of the HTTP Content-Type header should be
+    # respected, and it defaults to 'us-ascii' if not specified.
 
-    Furthermore, discussion on the atom-syntax mailing list with the
-    author of RFC 3023 leads me to the conclusion that any document
-    served with a Content-Type of text/* and no charset parameter
-    must be treated as us-ascii.  (We now do this.)  And also that it
-    must always be flagged as non-well-formed.  (We now do this too.)
+    # Furthermore, discussion on the atom-syntax mailing list with the
+    # author of RFC 3023 leads me to the conclusion that any document
+    # served with a Content-Type of text/* and no charset parameter
+    # must be treated as us-ascii.  (We now do this.)  And also that it
+    # must always be flagged as non-well-formed.  (We now do this too.)
 
-    If Content-Type is unspecified (input was local file or non-HTTP source)
-    or unrecognized (server just got it totally wrong), then go by the
-    encoding given in the XML prefix of the document and default to
-    'iso-8859-1' as per the HTTP specification (RFC 2616).
+    # If Content-Type is unspecified (input was local file or non-HTTP source)
+    # or unrecognized (server just got it totally wrong), then go by the
+    # encoding given in the XML prefix of the document and default to
+    # 'iso-8859-1' as per the HTTP specification (RFC 2616).
 
-    Then, assuming we didn't find a character encoding in the HTTP headers
-    (and the HTTP Content-type allowed us to look in the body), we need
-    to sniff the first few bytes of the XML data and try to determine
-    whether the encoding is ASCII-compatible.  Section F of the XML
-    specification shows the way here:
-    http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info
-
-    If the sniffed encoding is not ASCII-compatible, we need to make it
-    ASCII compatible so that we can sniff further into the XML declaration
-    to find the encoding attribute, which will tell us the true encoding.
-
-    Of course, none of this guarantees that we will be able to parse the
-    feed in the declared character encoding (assuming it was declared
-    correctly, which many are not).  CJKCodecs and iconv_codec help a lot;
-    you should definitely install them if you can.
-    http://cjkpython.i18n.org/
-    '''
-
-    def _parseHTTPContentType(content_type):
-        '''takes HTTP Content-Type header and returns (content type, charset)
-
-        If no charset is specified, returns (content type, '')
-        If no content type is specified, returns ('', '')
-        Both return parameters are guaranteed to be lowercase strings
-        '''
-        content_type = content_type or ''
-        content_type, params = cgi.parse_header(content_type)
-        charset = params.get('charset', '').replace("'", "")
-        if not isinstance(charset, unicode):
-            charset = charset.decode('utf-8', 'ignore')
-        return content_type, charset
-
-    sniffed_xml_encoding = u''
-    xml_encoding = u''
-    true_encoding = u''
-    http_content_type, http_encoding = _parseHTTPContentType(http_headers.get('content-type', http_headers.get('Content-type')))
-    # Must sniff for non-ASCII-compatible character encodings before
-    # searching for XML declaration.  This heuristic is defined in
-    # section F of the XML specification:
+    # Then, assuming we didn't find a character encoding in the HTTP headers
+    # (and the HTTP Content-type allowed us to look in the body), we need
+    # to sniff the first few bytes of the XML data and try to determine
+    # whether the encoding is ASCII-compatible.  Section F of the XML
+    # specification shows the way here:
     # http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info
+
+    # If the sniffed encoding is not ASCII-compatible, we need to make it
+    # ASCII compatible so that we can sniff further into the XML declaration
+    # to find the encoding attribute, which will tell us the true encoding.
+
+    # Of course, none of this guarantees that we will be able to parse the
+    # feed in the declared character encoding (assuming it was declared
+    # correctly, which many are not).  iconv_codec can help a lot;
+    # you should definitely install it if you can.
+    # http://cjkpython.i18n.org/
+
+    bom_encoding = u''
+    xml_encoding = u''
+    rfc3023_encoding = u''
+
+    # Look at the first few bytes of the document to guess what
+    # its encoding may be. We only need to decode enough of the
+    # document that we can use an ASCII-compatible regular
+    # expression to search for an XML encoding declaration.
+    # The heuristic follows the XML specification, section F:
+    # http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info
+    # Check for BOMs first.
+    if data[:4] == codecs.BOM_UTF32_BE:
+        bom_encoding = u'utf-32be'
+        data = data[4:]
+    elif data[:4] == codecs.BOM_UTF32_LE:
+        bom_encoding = u'utf-32le'
+        data = data[4:]
+    elif data[:2] == codecs.BOM_UTF16_BE and data[2:4] != ZERO_BYTES:
+        bom_encoding = u'utf-16be'
+        data = data[2:]
+    elif data[:2] == codecs.BOM_UTF16_LE and data[2:4] != ZERO_BYTES:
+        bom_encoding = u'utf-16le'
+        data = data[2:]
+    elif data[:3] == codecs.BOM_UTF8:
+        bom_encoding = u'utf-8'
+        data = data[3:]
+    # Check for the characters '<?xm' in several encodings.
+    elif data[:4] == EBCDIC_MARKER:
+        bom_encoding = u'cp037'
+    elif data[:4] == UTF16BE_MARKER:
+        bom_encoding = u'utf-16be'
+    elif data[:4] == UTF16LE_MARKER:
+        bom_encoding = u'utf-16le'
+    elif data[:4] == UTF32BE_MARKER:
+        bom_encoding = u'utf-32be'
+    elif data[:4] == UTF32LE_MARKER:
+        bom_encoding = u'utf-32le'
+
+    tempdata = data
     try:
-        if xml_data[:4] == _l2bytes([0x4c, 0x6f, 0xa7, 0x94]):
-            # EBCDIC
-            xml_data = _ebcdic_to_ascii(xml_data)
-        elif xml_data[:4] == _l2bytes([0x00, 0x3c, 0x00, 0x3f]):
-            # UTF-16BE
-            sniffed_xml_encoding = u'utf-16be'
-            xml_data = unicode(xml_data, 'utf-16be').encode('utf-8')
-        elif (len(xml_data) >= 4) and (xml_data[:2] == _l2bytes([0xfe, 0xff])) and (xml_data[2:4] != _l2bytes([0x00, 0x00])):
-            # UTF-16BE with BOM
-            sniffed_xml_encoding = u'utf-16be'
-            xml_data = unicode(xml_data[2:], 'utf-16be').encode('utf-8')
-        elif xml_data[:4] == _l2bytes([0x3c, 0x00, 0x3f, 0x00]):
-            # UTF-16LE
-            sniffed_xml_encoding = u'utf-16le'
-            xml_data = unicode(xml_data, 'utf-16le').encode('utf-8')
-        elif (len(xml_data) >= 4) and (xml_data[:2] == _l2bytes([0xff, 0xfe])) and (xml_data[2:4] != _l2bytes([0x00, 0x00])):
-            # UTF-16LE with BOM
-            sniffed_xml_encoding = u'utf-16le'
-            xml_data = unicode(xml_data[2:], 'utf-16le').encode('utf-8')
-        elif xml_data[:4] == _l2bytes([0x00, 0x00, 0x00, 0x3c]):
-            # UTF-32BE
-            sniffed_xml_encoding = u'utf-32be'
-            xml_data = unicode(xml_data, 'utf-32be').encode('utf-8')
-        elif xml_data[:4] == _l2bytes([0x3c, 0x00, 0x00, 0x00]):
-            # UTF-32LE
-            sniffed_xml_encoding = u'utf-32le'
-            xml_data = unicode(xml_data, 'utf-32le').encode('utf-8')
-        elif xml_data[:4] == _l2bytes([0x00, 0x00, 0xfe, 0xff]):
-            # UTF-32BE with BOM
-            sniffed_xml_encoding = u'utf-32be'
-            xml_data = unicode(xml_data[4:], 'utf-32be').encode('utf-8')
-        elif xml_data[:4] == _l2bytes([0xff, 0xfe, 0x00, 0x00]):
-            # UTF-32LE with BOM
-            sniffed_xml_encoding = u'utf-32le'
-            xml_data = unicode(xml_data[4:], 'utf-32le').encode('utf-8')
-        elif xml_data[:3] == _l2bytes([0xef, 0xbb, 0xbf]):
-            # UTF-8 with BOM
-            sniffed_xml_encoding = u'utf-8'
-            xml_data = unicode(xml_data[3:], 'utf-8').encode('utf-8')
-        else:
-            # ASCII-compatible
-            pass
-        xml_encoding_match = re.compile(_s2bytes('^<\?.*encoding=[\'"](.*?)[\'"].*\?>')).match(xml_data)
-    except UnicodeDecodeError:
+        if bom_encoding:
+            tempdata = data.decode(bom_encoding).encode('utf-8')
+    except (UnicodeDecodeError, LookupError):
+        # feedparser recognizes UTF-32 encodings that aren't
+        # available in Python 2.4 and 2.5, so it's possible to
+        # encounter a LookupError during decoding.
         xml_encoding_match = None
+    else:
+        xml_encoding_match = RE_XML_PI_ENCODING.match(tempdata)
+
     if xml_encoding_match:
         xml_encoding = xml_encoding_match.groups()[0].decode('utf-8').lower()
-        if sniffed_xml_encoding and (xml_encoding in (u'iso-10646-ucs-2', u'ucs-2', u'csunicode', u'iso-10646-ucs-4', u'ucs-4', u'csucs4', u'utf-16', u'utf-32', u'utf_16', u'utf_32', u'utf16', u'u16')):
-            xml_encoding = sniffed_xml_encoding
+        # Normalize the xml_encoding if necessary.
+        if bom_encoding and (xml_encoding in (
+            u'u16', u'utf-16', u'utf16', u'utf_16',
+            u'u32', u'utf-32', u'utf32', u'utf_32',
+            u'iso-10646-ucs-2', u'iso-10646-ucs-4',
+            u'csucs4', u'csunicode', u'ucs-2', u'ucs-4'
+        )):
+            xml_encoding = bom_encoding
+
+    # Find the HTTP Content-Type and, hopefully, a character
+    # encoding provided by the server. The Content-Type is used
+    # to choose the "correct" encoding among the BOM encoding,
+    # XML declaration encoding, and HTTP encoding, following the
+    # heuristic defined in RFC 3023.
+    http_content_type = http_headers.get('content-type') or ''
+    http_content_type, params = cgi.parse_header(http_content_type)
+    http_encoding = params.get('charset', '').replace("'", "")
+    if not isinstance(http_encoding, unicode):
+        http_encoding = http_encoding.decode('utf-8', 'ignore')
+
     acceptable_content_type = 0
-    application_content_types = (u'application/xml', u'application/xml-dtd', u'application/xml-external-parsed-entity')
+    application_content_types = (u'application/xml', u'application/xml-dtd',
+                                 u'application/xml-external-parsed-entity')
     text_content_types = (u'text/xml', u'text/xml-external-parsed-entity')
     if (http_content_type in application_content_types) or \
-       (http_content_type.startswith(u'application/') and http_content_type.endswith(u'+xml')):
+       (http_content_type.startswith(u'application/') and 
+        http_content_type.endswith(u'+xml')):
         acceptable_content_type = 1
-        true_encoding = http_encoding or xml_encoding or u'utf-8'
+        rfc3023_encoding = http_encoding or xml_encoding or u'utf-8'
     elif (http_content_type in text_content_types) or \
-         (http_content_type.startswith(u'text/')) and http_content_type.endswith(u'+xml'):
+         (http_content_type.startswith(u'text/') and
+          http_content_type.endswith(u'+xml')):
         acceptable_content_type = 1
-        true_encoding = http_encoding or u'us-ascii'
+        rfc3023_encoding = http_encoding or u'us-ascii'
     elif http_content_type.startswith(u'text/'):
-        true_encoding = http_encoding or u'us-ascii'
-    elif http_headers and (not (http_headers.has_key('content-type') or http_headers.has_key('Content-type'))):
-        true_encoding = xml_encoding or u'iso-8859-1'
+        rfc3023_encoding = http_encoding or u'us-ascii'
+    elif http_headers and 'content-type' not in http_headers:
+        rfc3023_encoding = xml_encoding or u'iso-8859-1'
     else:
-        true_encoding = xml_encoding or u'utf-8'
-    # some feeds claim to be gb2312 but are actually gb18030.
-    # apparently MSIE and Firefox both do the following switch:
-    if true_encoding.lower() == u'gb2312':
-        true_encoding = u'gb18030'
-    return true_encoding, http_encoding, xml_encoding, sniffed_xml_encoding, acceptable_content_type
+        rfc3023_encoding = xml_encoding or u'utf-8'
+    # gb18030 is a superset of gb2312, so always replace gb2312
+    # with gb18030 for greater compatibility.
+    if rfc3023_encoding.lower() == u'gb2312':
+        rfc3023_encoding = u'gb18030'
+    if xml_encoding.lower() == u'gb2312':
+        xml_encoding = u'gb18030'
 
-def _toUTF8(data, encoding):
-    '''Changes an XML data stream on the fly to specify a new encoding
+    # there are four encodings to keep track of:
+    # - http_encoding is the encoding declared in the Content-Type HTTP header
+    # - xml_encoding is the encoding declared in the <?xml declaration
+    # - bom_encoding is the encoding sniffed from the first 4 bytes of the XML data
+    # - rfc3023_encoding is the actual encoding, as per RFC 3023 and a variety of other conflicting specifications
+    error = None
 
-    data is a raw sequence of bytes (not Unicode) that is presumed to be in %encoding already
-    encoding is a string recognized by encodings.aliases
-    '''
-    # strip Byte Order Mark (if present)
-    if (len(data) >= 4) and (data[:2] == _l2bytes([0xfe, 0xff])) and (data[2:4] != _l2bytes([0x00, 0x00])):
-        encoding = 'utf-16be'
-        data = data[2:]
-    elif (len(data) >= 4) and (data[:2] == _l2bytes([0xff, 0xfe])) and (data[2:4] != _l2bytes([0x00, 0x00])):
-        encoding = 'utf-16le'
-        data = data[2:]
-    elif data[:3] == _l2bytes([0xef, 0xbb, 0xbf]):
-        encoding = 'utf-8'
-        data = data[3:]
-    elif data[:4] == _l2bytes([0x00, 0x00, 0xfe, 0xff]):
-        encoding = 'utf-32be'
-        data = data[4:]
-    elif data[:4] == _l2bytes([0xff, 0xfe, 0x00, 0x00]):
-        encoding = 'utf-32le'
-        data = data[4:]
-    newdata = unicode(data, encoding)
-    declmatch = re.compile('^<\?xml[^>]*?>')
-    newdecl = '''<?xml version='1.0' encoding='utf-8'?>'''
-    if declmatch.search(newdata):
-        newdata = declmatch.sub(newdecl, newdata)
-    else:
-        newdata = newdecl + u'\n' + newdata
-    return newdata.encode('utf-8')
+    if http_headers and (not acceptable_content_type):
+        if 'content-type' in http_headers:
+            msg = '%s is not an XML media type' % http_headers['content-type']
+        else:
+            msg = 'no Content-type specified'
+        error = NonXMLContentType(msg)
 
-def _stripDoctype(data):
-    '''Strips DOCTYPE from XML document, returns (rss_version, stripped_data)
+    # determine character encoding
+    known_encoding = 0
+    chardet_encoding = None
+    tried_encodings = []
+    if chardet:
+        chardet_encoding = unicode(chardet.detect(data)['encoding'] or '', 'ascii', 'ignore')
+    # try: HTTP encoding, declared XML encoding, encoding sniffed from BOM
+    for proposed_encoding in (rfc3023_encoding, xml_encoding, bom_encoding,
+                              chardet_encoding, u'utf-8', u'windows-1252', u'iso-8859-2'):
+        if not proposed_encoding:
+            continue
+        if proposed_encoding in tried_encodings:
+            continue
+        tried_encodings.append(proposed_encoding)
+        try:
+            data = data.decode(proposed_encoding)
+        except (UnicodeDecodeError, LookupError):
+            pass
+        else:
+            known_encoding = 1
+            # Update the encoding in the opening XML processing instruction.
+            new_declaration = '''<?xml version='1.0' encoding='utf-8'?>'''
+            if RE_XML_DECLARATION.search(data):
+                data = RE_XML_DECLARATION.sub(new_declaration, data)
+            else:
+                data = new_declaration + u'\n' + data
+            data = data.encode('utf-8')
+            break
+    # if still no luck, give up
+    if not known_encoding:
+        error = CharacterEncodingUnknown(
+            'document encoding unknown, I tried ' +
+            '%s, %s, utf-8, windows-1252, and iso-8859-2 but nothing worked' %
+            (rfc3023_encoding, xml_encoding))
+        rfc3023_encoding = u''
+    elif proposed_encoding != rfc3023_encoding:
+        error = CharacterEncodingOverride(
+            'document declared as %s, but parsed as %s' %
+            (rfc3023_encoding, proposed_encoding))
+        rfc3023_encoding = proposed_encoding
+
+    return data, rfc3023_encoding, error
+
+# Match XML entity declarations.
+# Example: <!ENTITY copyright "(C)">
+RE_ENTITY_PATTERN = re.compile(_s2bytes(r'^\s*<!ENTITY([^>]*?)>'), re.MULTILINE)
+
+# Match XML DOCTYPE declarations.
+# Example: <!DOCTYPE feed [ ]>
+RE_DOCTYPE_PATTERN = re.compile(_s2bytes(r'^\s*<!DOCTYPE([^>]*?)>'), re.MULTILINE)
+
+# Match safe entity declarations.
+# This will allow hexadecimal character references through,
+# as well as text, but not arbitrary nested entities.
+# Example: cubed "&#179;"
+# Example: copyright "(C)"
+# Forbidden: explode1 "&explode2;&explode2;"
+RE_SAFE_ENTITY_PATTERN = re.compile(_s2bytes('\s+(\w+)\s+"(&#\w+;|[^&"]*)"'))
+
+def replace_doctype(data):
+    '''Strips and replaces the DOCTYPE, returns (rss_version, stripped_data)
 
     rss_version may be 'rss091n' or None
-    stripped_data is the same XML document, minus the DOCTYPE
+    stripped_data is the same XML document with a replaced DOCTYPE
     '''
+
+    # Divide the document into two groups by finding the location
+    # of the first element that doesn't begin with '<?' or '<!'.
     start = re.search(_s2bytes('<\w'), data)
     start = start and start.start() or -1
-    head,data = data[:start+1], data[start+1:]
+    head, data = data[:start+1], data[start+1:]
 
-    entity_pattern = re.compile(_s2bytes(r'^\s*<!ENTITY([^>]*?)>'), re.MULTILINE)
-    entity_results=entity_pattern.findall(head)
-    head = entity_pattern.sub(_s2bytes(''), head)
-    doctype_pattern = re.compile(_s2bytes(r'^\s*<!DOCTYPE([^>]*?)>'), re.MULTILINE)
-    doctype_results = doctype_pattern.findall(head)
+    # Save and then remove all of the ENTITY declarations.
+    entity_results = RE_ENTITY_PATTERN.findall(head)
+    head = RE_ENTITY_PATTERN.sub(_s2bytes(''), head)
+
+    # Find the DOCTYPE declaration and check the feed type.
+    doctype_results = RE_DOCTYPE_PATTERN.findall(head)
     doctype = doctype_results and doctype_results[0] or _s2bytes('')
-    if doctype.lower().count(_s2bytes('netscape')):
+    if _s2bytes('netscape') in doctype.lower():
         version = u'rss091n'
     else:
         version = None
 
-    # only allow in 'safe' inline entity definitions
-    replacement=_s2bytes('')
-    if len(doctype_results)==1 and entity_results:
-       safe_pattern=re.compile(_s2bytes('\s+(\w+)\s+"(&#\w+;|[^&"]*)"'))
-       safe_entities=filter(lambda e: safe_pattern.match(e),entity_results)
-       if safe_entities:
-           replacement=_s2bytes('<!DOCTYPE feed [\n  <!ENTITY') + _s2bytes('>\n  <!ENTITY ').join(safe_entities) + _s2bytes('>\n]>')
-    data = doctype_pattern.sub(replacement, head) + data
+    # Re-insert the safe ENTITY declarations if a DOCTYPE was found.
+    replacement = _s2bytes('')
+    if len(doctype_results) == 1 and entity_results:
+        match_safe_entities = lambda e: RE_SAFE_ENTITY_PATTERN.match(e)
+        safe_entities = filter(match_safe_entities, entity_results)
+        if safe_entities:
+            replacement = _s2bytes('<!DOCTYPE feed [\n<!ENTITY') \
+                        + _s2bytes('>\n<!ENTITY ').join(safe_entities) \
+                        + _s2bytes('>\n]>')
+    data = RE_DOCTYPE_PATTERN.sub(replacement, head) + data
 
-    return version, data, dict(replacement and [(k.decode('utf-8'), v.decode('utf-8')) for k, v in safe_pattern.findall(replacement)])
+    # Precompute the safe entities for the loose parser.
+    safe_entities = dict((k.decode('utf-8'), v.decode('utf-8'))
+                      for k, v in RE_SAFE_ENTITY_PATTERN.findall(replacement))
+    return version, data, safe_entities
 
 def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, referrer=None, handlers=None, request_headers=None, response_headers=None):
     '''Parse a feed from a URL, file, stream, or string.
@@ -3714,41 +3872,51 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
     elif response_headers:
         result['headers'] = copy.deepcopy(response_headers)
 
+    # lowercase all of the HTTP headers for comparisons per RFC 2616
+    if 'headers' in result:
+        http_headers = dict((k.lower(), v) for k, v in result['headers'].items())
+    else:
+        http_headers = {}
+
     # if feed is gzip-compressed, decompress it
-    if f and data and 'headers' in result:
-        if gzip and 'gzip' in (result['headers'].get('content-encoding'), result['headers'].get('Content-Encoding')):
+    if f and data and http_headers:
+        if gzip and 'gzip' in http_headers.get('content-encoding', ''):
             try:
                 data = gzip.GzipFile(fileobj=_StringIO(data)).read()
             except (IOError, struct.error), e:
-                # IOError can occur if the gzip header is bad
-                # struct.error can occur if the data is damaged
-                # Some feeds claim to be gzipped but they're not, so
-                # we get garbage.  Ideally, we should re-request the
-                # feed without the 'Accept-encoding: gzip' header,
-                # but we don't.
+                # IOError can occur if the gzip header is bad.
+                # struct.error can occur if the data is damaged.
                 result['bozo'] = 1
                 result['bozo_exception'] = e
-                data = None
-        elif zlib and 'deflate' in (result['headers'].get('content-encoding'), result['headers'].get('Content-Encoding')):
+                if isinstance(e, struct.error):
+                    # A gzip header was found but the data is corrupt.
+                    # Ideally, we should re-request the feed without the
+                    # 'Accept-encoding: gzip' header, but we don't.
+                    data = None
+        elif zlib and 'deflate' in http_headers.get('content-encoding', ''):
             try:
                 data = zlib.decompress(data)
             except zlib.error, e:
-                result['bozo'] = 1
-                result['bozo_exception'] = e
-                data = None
+                try:
+                    # The data may have no headers and no checksum.
+                    data = zlib.decompress(data, -15)
+                except zlib.error, e:
+                    result['bozo'] = 1
+                    result['bozo_exception'] = e
 
     # save HTTP headers
-    if 'headers' in result:
-        if 'etag' in result['headers'] or 'ETag' in result['headers']:
-            etag = result['headers'].get('etag', result['headers'].get('ETag', u''))
+    if http_headers:
+        if 'etag' in http_headers:
+            etag = http_headers.get('etag', u'')
             if not isinstance(etag, unicode):
                 etag = etag.decode('utf-8', 'ignore')
             if etag:
                 result['etag'] = etag
-        if 'last-modified' in result['headers'] or 'Last-Modified' in result['headers']:
-            modified = result['headers'].get('last-modified', result['headers'].get('Last-Modified'))
+        if 'last-modified' in http_headers:
+            modified = http_headers.get('last-modified', u'')
             if modified:
-                result['modified'] = _parse_date(modified)
+                result['modified'] = modified
+                result['modified_parsed'] = _parse_date(modified)
     if hasattr(f, 'url'):
         if not isinstance(f.url, unicode):
             result['href'] = f.url.decode('utf-8', 'ignore')
@@ -3763,118 +3931,29 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
     if data is None:
         return result
 
-    # there are four encodings to keep track of:
-    # - http_encoding is the encoding declared in the Content-Type HTTP header
-    # - xml_encoding is the encoding declared in the <?xml declaration
-    # - sniffed_encoding is the encoding sniffed from the first 4 bytes of the XML data
-    # - result['encoding'] is the actual encoding, as per RFC 3023 and a variety of other conflicting specifications
-    http_headers = result.get('headers', {})
-    result['encoding'], http_encoding, xml_encoding, sniffed_xml_encoding, acceptable_content_type = \
-        _getCharacterEncoding(http_headers, data)
-    if http_headers and (not acceptable_content_type):
-        if http_headers.has_key('content-type') or http_headers.has_key('Content-type'):
-            bozo_message = '%s is not an XML media type' % http_headers.get('content-type', http_headers.get('Content-type'))
-        else:
-            bozo_message = 'no Content-type specified'
-        result['bozo'] = 1
-        result['bozo_exception'] = NonXMLContentType(bozo_message)
-
-    if data is not None:
-        result['version'], data, entities = _stripDoctype(data)
-
-    # ensure that baseuri is an absolute uri using an acceptable URI scheme
-    contentloc = http_headers.get('content-location', http_headers.get('Content-Location', u''))
-    href = result.get('href', u'')
-    baseuri = _makeSafeAbsoluteURI(href, contentloc) or _makeSafeAbsoluteURI(contentloc) or href
-
-    baselang = http_headers.get('content-language', http_headers.get('Content-Language', None))
-    if not isinstance(baselang, unicode) and baselang is not None:
-        baselang = baselang.decode('utf-8', 'ignore')
-
-    # if server sent 304, we're done
-    if result.get('status', 0) == 304:
+    # Stop processing if the server sent HTTP 304 Not Modified.
+    if getattr(f, 'code', 0) == 304:
         result['version'] = u''
         result['debug_message'] = 'The feed has not changed since you last checked, ' + \
             'so the server sent no data.  This is a feature, not a bug!'
         return result
 
-    # if there was a problem downloading, we're done
-    if data is None:
-        return result
+    data, result['encoding'], error = convert_to_utf8(http_headers, data)
+    use_strict_parser = result['encoding'] and True or False
+    if error is not None:
+        result['bozo'] = 1
+        result['bozo_exception'] = error
 
-    # determine character encoding
-    use_strict_parser = 0
-    known_encoding = 0
-    tried_encodings = []
-    # try: HTTP encoding, declared XML encoding, encoding sniffed from BOM
-    for proposed_encoding in (result['encoding'], xml_encoding, sniffed_xml_encoding):
-        if not proposed_encoding:
-            continue
-        if proposed_encoding in tried_encodings:
-            continue
-        tried_encodings.append(proposed_encoding)
-        try:
-            data = _toUTF8(data, proposed_encoding)
-        except (UnicodeDecodeError, LookupError):
-            pass
-        else:
-            known_encoding = use_strict_parser = 1
-            break
-    # if no luck and we have auto-detection library, try that
-    if (not known_encoding) and chardet:
-        proposed_encoding = chardet.detect(data)['encoding']
-        if proposed_encoding and (proposed_encoding not in tried_encodings):
-            tried_encodings.append(proposed_encoding)
-            try:
-                data = _toUTF8(data, proposed_encoding)
-            except (UnicodeDecodeError, LookupError):
-                pass
-            else:
-                known_encoding = use_strict_parser = 1
-    # if still no luck and we haven't tried utf-8 yet, try that
-    if (not known_encoding) and (u'utf-8' not in tried_encodings):
-        proposed_encoding = u'utf-8'
-        tried_encodings.append(proposed_encoding)
-        try:
-            data = _toUTF8(data, proposed_encoding)
-        except UnicodeDecodeError:
-            pass
-        else:
-            known_encoding = use_strict_parser = 1
-    # if still no luck and we haven't tried windows-1252 yet, try that
-    if (not known_encoding) and (u'windows-1252' not in tried_encodings):
-        proposed_encoding = u'windows-1252'
-        tried_encodings.append(proposed_encoding)
-        try:
-            data = _toUTF8(data, proposed_encoding)
-        except UnicodeDecodeError:
-            pass
-        else:
-            known_encoding = use_strict_parser = 1
-    # if still no luck and we haven't tried iso-8859-2 yet, try that.
-    if (not known_encoding) and (u'iso-8859-2' not in tried_encodings):
-        proposed_encoding = u'iso-8859-2'
-        tried_encodings.append(proposed_encoding)
-        try:
-            data = _toUTF8(data, proposed_encoding)
-        except UnicodeDecodeError:
-            pass
-        else:
-            known_encoding = use_strict_parser = 1
-    # if still no luck, give up
-    if not known_encoding:
-        result['bozo'] = 1
-        result['bozo_exception'] = CharacterEncodingUnknown( \
-            'document encoding unknown, I tried ' + \
-            '%s, %s, utf-8, windows-1252, and iso-8859-2 but nothing worked' % \
-            (result['encoding'], xml_encoding))
-        result['encoding'] = u''
-    elif proposed_encoding != result['encoding']:
-        result['bozo'] = 1
-        result['bozo_exception'] = CharacterEncodingOverride( \
-            'document declared as %s, but parsed as %s' % \
-            (result['encoding'], proposed_encoding))
-        result['encoding'] = proposed_encoding
+    result['version'], data, entities = replace_doctype(data)
+
+    # Ensure that baseuri is an absolute URI using an acceptable URI scheme.
+    contentloc = http_headers.get('content-location', u'')
+    href = result.get('href', u'')
+    baseuri = _makeSafeAbsoluteURI(href, contentloc) or _makeSafeAbsoluteURI(contentloc) or href
+
+    baselang = http_headers.get('content-language', None)
+    if not isinstance(baselang, unicode) and baselang is not None:
+        baselang = baselang.decode('utf-8', 'ignore')
 
     if not _XML_AVAILABLE:
         use_strict_parser = 0
@@ -3883,17 +3962,18 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
         feedparser = _StrictFeedParser(baseuri, baselang, 'utf-8')
         saxparser = xml.sax.make_parser(PREFERRED_XML_PARSERS)
         saxparser.setFeature(xml.sax.handler.feature_namespaces, 1)
+        try:
+            # disable downloading external doctype references, if possible
+            saxparser.setFeature(xml.sax.handler.feature_external_ges, 0)
+        except xml.sax.SAXNotSupportedException:
+            pass
         saxparser.setContentHandler(feedparser)
         saxparser.setErrorHandler(feedparser)
         source = xml.sax.xmlreader.InputSource()
         source.setByteStream(_StringIO(data))
-        if hasattr(saxparser, '_ns_stack'):
-            # work around bug in built-in SAX parser (doesn't recognize xml: namespace)
-            # PyXML doesn't have this problem, and it doesn't have _ns_stack either
-            saxparser._ns_stack.append({'http://www.w3.org/XML/1998/namespace':'xml'})
         try:
             saxparser.parse(source)
-        except xml.sax.SAXParseException, e:
+        except xml.sax.SAXException, e:
             result['bozo'] = 1
             result['bozo_exception'] = feedparser.exc or e
             use_strict_parser = 0
diff --git a/gluon/contrib/rss2.py b/gluon/contrib/rss2.py
index c25fee86..a39f15a1 100644
--- a/gluon/contrib/rss2.py
+++ b/gluon/contrib/rss2.py
@@ -1,58 +1,95 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+"""
+PyRSS2Gen - A Python library for generating RSS 2.0 feeds.
 
-"""PyRSS2Gen - A Python library for generating RSS 2.0 feeds."""
+(This is the BSD license, based on the template at
+   http://www.opensource.org/licenses/bsd-license.php )
 
-__name__ = 'PyRSS2Gen'
-__version__ = (1, 0, 0)
-__author__ = 'Andrew Dalke <dalke@dalkescientific.com>'
+Copyright (c) 2003, Dalke Scientific Software, LLC
 
-_generator_name = __name__ + '-' + '.'.join(map(str, __version__))
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the Dalke Scientific Softare, LLC, Andrew
+    Dalke, nor the names of its contributors may be used to endorse or
+    promote products derived from this software without specific prior
+    written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
+__name__ = "PyRSS2Gen"
+__version__ = (1, 1, 0)
+__author__ = "Andrew Dalke <dalke@dalkescientific.com>"
+
+_generator_name = __name__ + "-" + ".".join(map(str, __version__))
 
 import datetime
-import cStringIO
+
+import sys
+
+if sys.version_info[0] == 3:
+    # Python 3
+    basestring = str
+    from io import StringIO
+else:
+    # Python 2
+    try:
+        from cStringIO import StringIO
+    except ImportError:
+        # Very old (or memory constrained) systems might
+        # have left out the compiled C version. Fall back
+        # to the pure Python one. Haven't seen this sort
+        # of system since the early 2000s.
+        from StringIO import StringIO
 
 # Could make this the base class; will need to add 'publish'
 
 
 class WriteXmlMixin:
-
-    def write_xml(self, outfile, encoding='iso-8859-1'):
+    def write_xml(self, outfile, encoding="iso-8859-1"):
         from xml.sax import saxutils
         handler = saxutils.XMLGenerator(outfile, encoding)
         handler.startDocument()
         self.publish(handler)
         handler.endDocument()
 
-    def to_xml(self, encoding='iso-8859-1'):
-        try:
-            import cStringIO as StringIO
-        except ImportError:
-            import StringIO
-        f = StringIO.StringIO()
+    def to_xml(self, encoding="iso-8859-1"):
+        f = StringIO()
         self.write_xml(f, encoding)
         return f.getvalue()
 
 
-def _element(
-    handler,
-    name,
-    obj,
-    d={},
-    ):
+def _element(handler, name, obj, d={}):
     if isinstance(obj, basestring) or obj is None:
-
         # special-case handling to make the API easier
         # to use for the common case.
-
         handler.startElement(name, d)
         if obj is not None:
             handler.characters(obj)
         handler.endElement(name)
     else:
-
         # It better know how to emit the correct XML.
-
         obj.publish(handler)
 
 
@@ -67,7 +104,6 @@ def _format_date(dt):
 
     Input date must be in GMT.
     """
-
     # Looks like:
     #   Sat, 07 Sep 2002 00:00:01 GMT
     # Can't use strftime because that's locale dependent
@@ -75,46 +111,18 @@ def _format_date(dt):
     # Isn't there a standard way to do this for Python?  The
     # rfc822 and email.Utils modules assume a timestamp.  The
     # following is based on the rfc822 module.
-
-    return '%s, %02d %s %04d %02d:%02d:%02d GMT' % (
-        [
-            'Mon',
-            'Tue',
-            'Wed',
-            'Thu',
-            'Fri',
-            'Sat',
-            'Sun',
-            ][dt.weekday()],
+    return "%s, %02d %s %04d %02d:%02d:%02d GMT" % (
+        ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][dt.weekday()],
         dt.day,
-        [
-            'Jan',
-            'Feb',
-            'Mar',
-            'Apr',
-            'May',
-            'Jun',
-            'Jul',
-            'Aug',
-            'Sep',
-            'Oct',
-            'Nov',
-            'Dec',
-            ][dt.month - 1],
-        dt.year,
-        dt.hour,
-        dt.minute,
-        dt.second,
-        )
+        ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
+         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][dt.month - 1],
+        dt.year, dt.hour, dt.minute, dt.second)
 
 
 ##
 # A couple simple wrapper objects for the fields which
 # take a simple value other than a string.
-
-
 class IntElement:
-
     """implements the 'publish' API for integers
 
     Takes the tag name and the integer value to publish.
@@ -122,7 +130,6 @@ class IntElement:
     (Could be used for anything which uses str() to be published
     to text for XML.)
     """
-
     element_attrs = {}
 
     def __init__(self, name, val):
@@ -136,29 +143,23 @@ class IntElement:
 
 
 class DateElement:
-
     """implements the 'publish' API for a datetime.datetime
 
     Takes the tag name and the datetime to publish.
 
     Converts the datetime to RFC 2822 timestamp (4-digit year).
     """
-
     def __init__(self, name, dt):
         self.name = name
         self.dt = dt
 
     def publish(self, handler):
         _element(handler, self.name, _format_date(self.dt))
-
-
-# ###
+####
 
 
 class Category:
-
     """Publish a category element"""
-
     def __init__(self, category, domain=None):
         self.category = category
         self.domain = domain
@@ -166,22 +167,14 @@ class Category:
     def publish(self, handler):
         d = {}
         if self.domain is not None:
-            d['domain'] = self.domain
-        _element(handler, 'category', self.category, d)
+            d["domain"] = self.domain
+        _element(handler, "category", self.category, d)
 
 
 class Cloud:
-
     """Publish a cloud"""
-
-    def __init__(
-        self,
-        domain,
-        port,
-        path,
-        registerProcedure,
-        protocol,
-        ):
+    def __init__(self, domain, port, path,
+                 registerProcedure, protocol):
         self.domain = domain
         self.port = port
         self.path = path
@@ -189,30 +182,20 @@ class Cloud:
         self.protocol = protocol
 
     def publish(self, handler):
-        _element(handler, 'cloud', None, {
-            'domain': self.domain,
-            'port': str(self.port),
-            'path': self.path,
-            'registerProcedure': self.registerProcedure,
-            'protocol': self.protocol,
-            })
+        _element(handler, "cloud", None, {
+            "domain": self.domain,
+            "port": str(self.port),
+            "path": self.path,
+            "registerProcedure": self.registerProcedure,
+            "protocol": self.protocol})
 
 
 class Image:
-
     """Publish a channel Image"""
-
     element_attrs = {}
 
-    def __init__(
-        self,
-        url,
-        title,
-        link,
-        width=None,
-        height=None,
-        description=None,
-        ):
+    def __init__(self, url, title, link,
+                 width=None, height=None, description=None):
         self.url = url
         self.title = title
         self.link = link
@@ -221,35 +204,33 @@ class Image:
         self.description = description
 
     def publish(self, handler):
-        handler.startElement('image', self.element_attrs)
+        handler.startElement("image", self.element_attrs)
 
-        _element(handler, 'url', self.url)
-        _element(handler, 'title', self.title)
-        _element(handler, 'link', self.link)
+        _element(handler, "url", self.url)
+        _element(handler, "title", self.title)
+        _element(handler, "link", self.link)
 
         width = self.width
         if isinstance(width, int):
-            width = IntElement('width', width)
-        _opt_element(handler, 'width', width)
+            width = IntElement("width", width)
+        _opt_element(handler, "width", width)
 
         height = self.height
         if isinstance(height, int):
-            height = IntElement('height', height)
-        _opt_element(handler, 'height', height)
+            height = IntElement("height", height)
+        _opt_element(handler, "height", height)
 
-        _opt_element(handler, 'description', self.description)
+        _opt_element(handler, "description", self.description)
 
-        handler.endElement('image')
+        handler.endElement("image")
 
 
 class Guid:
-
     """Publish a guid
 
     Defaults to being a permalink, which is the assumption if it's
     omitted.  Hence strings are always permalinks.
     """
-
     def __init__(self, guid, isPermaLink=1):
         self.guid = guid
         self.isPermaLink = isPermaLink
@@ -257,80 +238,64 @@ class Guid:
     def publish(self, handler):
         d = {}
         if self.isPermaLink:
-            d['isPermaLink'] = 'true'
+            d["isPermaLink"] = "true"
         else:
-            d['isPermaLink'] = 'false'
-        _element(handler, 'guid', self.guid, d)
+            d["isPermaLink"] = "false"
+        _element(handler, "guid", self.guid, d)
 
 
 class TextInput:
-
     """Publish a textInput
 
     Apparently this is rarely used.
     """
-
     element_attrs = {}
 
-    def __init__(
-        self,
-        title,
-        description,
-        name,
-        link,
-        ):
+    def __init__(self, title, description, name, link):
         self.title = title
         self.description = description
         self.name = name
         self.link = link
 
     def publish(self, handler):
-        handler.startElement('textInput', self.element_attrs)
-        _element(handler, 'title', self.title)
-        _element(handler, 'description', self.description)
-        _element(handler, 'name', self.name)
-        _element(handler, 'link', self.link)
-        handler.endElement('textInput')
+        handler.startElement("textInput", self.element_attrs)
+        _element(handler, "title", self.title)
+        _element(handler, "description", self.description)
+        _element(handler, "name", self.name)
+        _element(handler, "link", self.link)
+        handler.endElement("textInput")
 
 
 class Enclosure:
-
     """Publish an enclosure"""
-
-    def __init__(
-        self,
-        url,
-        length,
-        type,
-        ):
+    def __init__(self, url, length, type):
         self.url = url
         self.length = length
         self.type = type
 
     def publish(self, handler):
-        _element(handler, 'enclosure', None,
-            {'url': self.url, 'length': str(self.length), 'type': self.type})
+        _element(handler, "enclosure", None,
+                 {"url": self.url,
+                  "length": str(self.length),
+                  "type": self.type,
+                  })
 
 
 class Source:
-
     """Publish the item's original source, used by aggregators"""
-
     def __init__(self, name, url):
         self.name = name
         self.url = url
 
     def publish(self, handler):
-        _element(handler, 'source', self.name, {'url': self.url})
+        _element(handler, "source", self.name, {"url": self.url})
 
 
 class SkipHours:
-
     """Publish the skipHours
 
     This takes a list of hours, as integers.
     """
-
     element_attrs = {}
 
     def __init__(self, hours):
@@ -338,19 +303,17 @@ class SkipHours:
 
     def publish(self, handler):
         if self.hours:
-            handler.startElement('skipHours', self.element_attrs)
+            handler.startElement("skipHours", self.element_attrs)
             for hour in self.hours:
-                _element(handler, 'hour', str(hour))
-            handler.endElement('skipHours')
+                _element(handler, "hour", str(hour))
+            handler.endElement("skipHours")
 
 
 class SkipDays:
-
     """Publish the skipDays
 
     This takes a list of days as strings.
     """
-
     element_attrs = {}
 
     def __init__(self, days):
@@ -358,47 +321,48 @@ class SkipDays:
 
     def publish(self, handler):
         if self.days:
-            handler.startElement('skipDays', self.element_attrs)
+            handler.startElement("skipDays", self.element_attrs)
             for day in self.days:
-                _element(handler, 'day', day)
-            handler.endElement('skipDays')
+                _element(handler, "day", day)
+            handler.endElement("skipDays")
 
 
 class RSS2(WriteXmlMixin):
-
     """The main RSS class.
 
-    Stores the channel attributes, with the \"category\" elements under
-    \".categories\" and the RSS items under \".items\".
+    Stores the channel attributes, with the "category" elements under
+    ".categories" and the RSS items under ".items".
     """
 
-    rss_attrs = {'version': '2.0'}
+    rss_attrs = {"version": "2.0"}
     element_attrs = {}
 
-    def __init__(
-        self,
-        title,
-        link,
-        description,
-        language=None,
-        copyright=None,
-        managingEditor=None,
-        webMaster=None,
-        pubDate=None,
-        lastBuildDate=None,
-        categories=None,
-        generator=_generator_name,
-        docs='http://blogs.law.harvard.edu/tech/rss',
-        cloud=None,
-        ttl=None,
-        image=None,
-        rating=None,
-        textInput=None,
-        skipHours=None,
-        skipDays=None,
-        items=None,
-        ):
+    def __init__(self,
+                 title,
+                 link,
+                 description,
 
+                 language=None,
+                 copyright=None,
+                 managingEditor=None,
+                 webMaster=None,
+                 pubDate=None,  # a datetime, *in* *GMT*
+                 lastBuildDate=None,  # a datetime
+
+                 categories=None,  # list of strings or Category
+                 generator=_generator_name,
+                 docs="http://blogs.law.harvard.edu/tech/rss",
+                 cloud=None,    # a Cloud
+                 ttl=None,      # integer number of minutes
+
+                 image=None,     # an Image
+                 rating=None,    # a string; I don't know how it's used
+                 textInput=None,  # a TextInput
+                 skipHours=None,  # a SkipHours with a list of integers
+                 skipDays=None,  # a SkipDays with a list of strings
+
+                 items=None,     # list of RSSItems
+                 ):
         self.title = title
         self.link = link
         self.description = description
@@ -428,49 +392,49 @@ class RSS2(WriteXmlMixin):
         self.items = items
 
     def publish(self, handler):
-        handler.startElement('rss', self.rss_attrs)
-        handler.startElement('channel', self.element_attrs)
-        _element(handler, 'title', self.title)
-        _element(handler, 'link', self.link)
-        _element(handler, 'description', self.description)
+        handler.startElement("rss", self.rss_attrs)
+        handler.startElement("channel", self.element_attrs)
+        _element(handler, "title", self.title)
+        _element(handler, "link", self.link)
+        _element(handler, "description", self.description)
 
         self.publish_extensions(handler)
 
-        _opt_element(handler, 'language', self.language)
-        _opt_element(handler, 'copyright', self.copyright)
-        _opt_element(handler, 'managingEditor', self.managingEditor)
-        _opt_element(handler, 'webMaster', self.webMaster)
+        _opt_element(handler, "language", self.language)
+        _opt_element(handler, "copyright", self.copyright)
+        _opt_element(handler, "managingEditor", self.managingEditor)
+        _opt_element(handler, "webMaster", self.webMaster)
 
         pubDate = self.pubDate
         if isinstance(pubDate, datetime.datetime):
-            pubDate = DateElement('pubDate', pubDate)
-        _opt_element(handler, 'pubDate', pubDate)
+            pubDate = DateElement("pubDate", pubDate)
+        _opt_element(handler, "pubDate", pubDate)
 
         lastBuildDate = self.lastBuildDate
         if isinstance(lastBuildDate, datetime.datetime):
-            lastBuildDate = DateElement('lastBuildDate', lastBuildDate)
-        _opt_element(handler, 'lastBuildDate', lastBuildDate)
+            lastBuildDate = DateElement("lastBuildDate", lastBuildDate)
+        _opt_element(handler, "lastBuildDate", lastBuildDate)
 
         for category in self.categories:
             if isinstance(category, basestring):
                 category = Category(category)
             category.publish(handler)
 
-        _opt_element(handler, 'generator', self.generator)
-        _opt_element(handler, 'docs', self.docs)
+        _opt_element(handler, "generator", self.generator)
+        _opt_element(handler, "docs", self.docs)
 
         if self.cloud is not None:
             self.cloud.publish(handler)
 
         ttl = self.ttl
         if isinstance(self.ttl, int):
-            ttl = IntElement('ttl', ttl)
-        _opt_element(handler, 'tt', ttl)
+            ttl = IntElement("ttl", ttl)
+        _opt_element(handler, "ttl", ttl)
 
         if self.image is not None:
             self.image.publish(handler)
 
-        _opt_element(handler, 'rating', self.rating)
+        _opt_element(handler, "rating", self.rating)
         if self.textInput is not None:
             self.textInput.publish(handler)
         if self.skipHours is not None:
@@ -481,40 +445,35 @@ class RSS2(WriteXmlMixin):
         for item in self.items:
             item.publish(handler)
 
-        handler.endElement('channel')
-        handler.endElement('rss')
+        handler.endElement("channel")
+        handler.endElement("rss")
 
     def publish_extensions(self, handler):
-
         # Derived classes can hook into this to insert
         # output after the three required fields.
-
         pass
 
 
 class RSSItem(WriteXmlMixin):
-
     """Publish an RSS Item"""
-
     element_attrs = {}
 
-    def __init__(
-        self,
-        title=None,
-        link=None,
-        description=None,
-        author=None,
-        categories=None,
-        comments=None,
-        enclosure=None,
-        guid=None,
-        pubDate=None,
-        source=None,
-        ):
+    def __init__(self,
+                 title=None,  # string
+                 link=None,   # url as string
+                 description=None,  # string
+                 author=None,      # email address as string
+                 categories=None,  # list of string or Category
+                 comments=None,  # url as string
+                 enclosure=None,  # an Enclosure
+                 guid=None,    # a unique string
+                 pubDate=None,  # a datetime
+                 source=None,  # a Source
+                 ):
 
         if title is None and description is None:
             raise TypeError(
-                "RSSItem must define at least one of 'title' or 'description'")
+                "must define at least one of 'title' or 'description'")
         self.title = title
         self.link = link
         self.description = description
@@ -527,62 +486,37 @@ class RSSItem(WriteXmlMixin):
         self.guid = guid
         self.pubDate = pubDate
         self.source = source
-
         # It sure does get tedious typing these names three times...
 
     def publish(self, handler):
-        handler.startElement('item', self.element_attrs)
-        _opt_element(handler, 'title', self.title)
-        _opt_element(handler, 'link', self.link)
+        handler.startElement("item", self.element_attrs)
+        _opt_element(handler, "title", self.title)
+        _opt_element(handler, "link", self.link)
         self.publish_extensions(handler)
-        _opt_element(handler, 'description', self.description)
-        _opt_element(handler, 'author', self.author)
+        _opt_element(handler, "description", self.description)
+        _opt_element(handler, "author", self.author)
 
         for category in self.categories:
             if isinstance(category, basestring):
                 category = Category(category)
             category.publish(handler)
 
-        _opt_element(handler, 'comments', self.comments)
+        _opt_element(handler, "comments", self.comments)
         if self.enclosure is not None:
             self.enclosure.publish(handler)
-        _opt_element(handler, 'guid', self.guid)
+        _opt_element(handler, "guid", self.guid)
 
         pubDate = self.pubDate
         if isinstance(pubDate, datetime.datetime):
-            pubDate = DateElement('pubDate', pubDate)
-        _opt_element(handler, 'pubDate', pubDate)
+            pubDate = DateElement("pubDate", pubDate)
+        _opt_element(handler, "pubDate", pubDate)
 
         if self.source is not None:
             self.source.publish(handler)
 
-        handler.endElement('item')
+        handler.endElement("item")
 
     def publish_extensions(self, handler):
-
         # Derived classes can hook into this to insert
         # output after the title and link elements
-
         pass
-
-
-def dumps(rss, encoding='utf-8'):
-    s = cStringIO.StringIO()
-    rss.write_xml(s, encoding)
-    return s.getvalue()
-
-
-def test():
-    rss = RSS2(title='web2py feed', link='http://www.web2py.com',
-               description='About web2py',
-               lastBuildDate=datetime.datetime.now(),
-               items=[RSSItem(title='web2py and PyRSS2Gen-0.0',
-               link='http://www.web2py.com/examples/simple_examples/getrss',
-               description='web2py can now make rss feeds!',
-               guid=Guid('http://www.web2py.com/'),
-               pubDate=datetime.datetime(2007, 11, 14, 10, 30))])
-    return dumps(rss)
-
-
-if __name__ == '__main__':
-    print test()

From 17f495e9c52358501b2a7f951c9d1353128b79a4 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 14:13:37 -0500
Subject: [PATCH 40/49] fixed pep8 in apps

---
 VERSION                                       |   2 +-
 applications/admin/controllers/appadmin.py    | 114 ++--
 applications/admin/controllers/debug.py       |  60 +-
 applications/admin/controllers/default.py     | 556 +++++++++-------
 applications/admin/controllers/gae.py         |  77 ++-
 applications/admin/controllers/mercurial.py   |  33 +-
 applications/admin/controllers/openshift.py   |  39 +-
 .../admin/controllers/plugin_jqmobile.py      |   6 +-
 applications/admin/controllers/shell.py       |  29 +-
 applications/admin/controllers/toolbar.py     |   8 +-
 applications/admin/controllers/webservices.py |   6 +-
 applications/admin/controllers/wizard.py      | 591 ++++++++++--------
 applications/admin/models/0.py                |  10 +-
 applications/admin/models/access.py           |  47 +-
 applications/admin/models/buttons.py          |  26 +-
 applications/admin/models/db.py               |  24 +-
 applications/admin/models/menu.py             |  17 +-
 .../admin/models/plugin_multiselect.py        |   7 +-
 applications/examples/controllers/appadmin.py | 114 ++--
 .../examples/controllers/cache_examples.py    |   6 +-
 applications/examples/controllers/default.py  |  22 +-
 .../examples/controllers/form_examples.py     |   2 +-
 applications/examples/controllers/global.py   |   6 +-
 .../examples/controllers/layout_examples.py   |   6 +-
 .../examples/controllers/simple_examples.py   |   6 +-
 .../examples/controllers/spreadsheet.py       |   6 +-
 applications/examples/models/feeds_reader.py  |  42 +-
 applications/examples/models/markmin.py       |  30 +-
 applications/examples/models/menu.py          |  39 +-
 applications/welcome/controllers/appadmin.py  | 114 ++--
 applications/welcome/controllers/default.py   |   4 +-
 applications/welcome/models/db.py             |   6 +-
 applications/welcome/models/menu.py           | 160 +++--
 33 files changed, 1254 insertions(+), 961 deletions(-)

diff --git a/VERSION b/VERSION
index f34c30cf..4e40b239 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 12:59:55) dev
+Version 2.1.1 (2012-10-19 14:13:30) dev
diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py
index 6802c419..f62af94c 100644
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -23,7 +23,7 @@ remote_addr = request.env.remote_addr
 try:
     hosts = (http_host, socket.gethostname(),
              socket.gethostbyname(http_host),
-             '::1','127.0.0.1','::ffff:127.0.0.1')
+             '::1', '127.0.0.1', '::ffff:127.0.0.1')
 except:
     hosts = (http_host, )
 
@@ -32,10 +32,10 @@ if request.env.http_x_forwarded_for or request.is_https:
 elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
     raise HTTP(200, T('appadmin is disabled because insecure channel'))
 
-if (request.application=='admin' and not session.authorized) or \
-        (request.application!='admin' and not gluon.fileutils.check_credentials(request)):
+if (request.application == 'admin' and not session.authorized) or \
+        (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
     redirect(URL('admin', 'default', 'index',
-                 vars=dict(send=URL(args=request.args,vars=request.vars))))
+                 vars=dict(send=URL(args=request.args, vars=request.vars))))
 
 ignore_rw = True
 response.view = 'appadmin.html'
@@ -95,24 +95,23 @@ def get_query(request):
         return None
 
 
-def query_by_table_type(tablename,db,request=request):
-    keyed = hasattr(db[tablename],'_primarykey')
+def query_by_table_type(tablename, db, request=request):
+    keyed = hasattr(db[tablename], '_primarykey')
     if keyed:
         firstkey = db[tablename][db[tablename]._primarykey[0]]
         cond = '>0'
         if firstkey.type in ['string', 'text']:
             cond = '!=""'
-        qry = '%s.%s.%s%s' % (request.args[0], request.args[1], firstkey.name, cond)
+        qry = '%s.%s.%s%s' % (
+            request.args[0], request.args[1], firstkey.name, cond)
     else:
         qry = '%s.%s.id>0' % tuple(request.args[:2])
     return qry
 
 
-
 # ##########################################################
 # ## list all databases and tables
 # ###########################################################
-
 def index():
     return dict(databases=databases)
 
@@ -127,7 +126,7 @@ def insert():
     form = SQLFORM(db[table], ignore_rw=ignore_rw)
     if form.accepts(request.vars, session):
         response.flash = T('new record inserted')
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])
 
 
 # ##########################################################
@@ -138,7 +137,8 @@ def insert():
 def download():
     import os
     db = get_database(request)
-    return response.download(request,db)
+    return response.download(request, db)
+
 
 def csv():
     import gluon.contenttype
@@ -149,26 +149,27 @@ def csv():
     if not query:
         return None
     response.headers['Content-disposition'] = 'attachment; filename=%s_%s.csv'\
-         % tuple(request.vars.query.split('.')[:2])
-    return str(db(query,ignore_common_filters=True).select())
+        % tuple(request.vars.query.split('.')[:2])
+    return str(db(query, ignore_common_filters=True).select())
 
 
 def import_csv(table, file):
     table.import_from_csv_file(file)
 
+
 def select():
     import re
     db = get_database(request)
     dbname = request.args[0]
     regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
-    if len(request.args)>1 and hasattr(db[request.args[1]],'_primarykey'):
+    if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
         regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
     if request.vars.query:
         match = regex.match(request.vars.query)
         if match:
             request.vars.query = '%s.%s.%s==%s' % (request.args[0],
-                    match.group('table'), match.group('field'),
-                    match.group('value'))
+                                                   match.group('table'), match.group('field'),
+                                                   match.group('value'))
     else:
         request.vars.query = session.last_query
     query = get_query(request)
@@ -192,14 +193,15 @@ def select():
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
                 _name='query', _value=request.vars.query or '',
-                requires=IS_NOT_EMPTY(error_message=T("Cannot be empty")))), TR(T('Update:'),
+                requires=IS_NOT_EMPTY(
+                    error_message=T("Cannot be empty")))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
-                 or '')), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
-                _action=URL(r=request,args=request.args))
+                _action=URL(r=request, args=request.args))
 
     tb = None
     if form.accepts(request.vars, formname=None):
@@ -211,28 +213,30 @@ def select():
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
-                                  % form.vars.update_fields))
+                                                      % form.vars.update_fields))
                 response.flash = T('%s %%{row} updated', nrows)
             elif form.vars.delete_check:
                 db(query).delete()
                 response.flash = T('%s %%{row} deleted', nrows)
             nrows = db(query).count()
             if orderby:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby))
+                rows = db(query, ignore_common_filters=True).select(limitby=(
+                    start, stop), orderby=eval_in_global_env(orderby))
             else:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop))
+                rows = db(query, ignore_common_filters=True).select(
+                    limitby=(start, stop))
         except Exception, e:
             import traceback
             tb = traceback.format_exc()
             (rows, nrows) = ([], 0)
-            response.flash = DIV(T('Invalid Query'),PRE(str(e)))
+            response.flash = DIV(T('Invalid Query'), PRE(str(e)))
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file'))+" ",
-                       INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=csv_table,_name='table'),
-                       INPUT(_type='submit',_value=T('import')))
+        formcsv = FORM(str(T('or import from csv file')) + " ",
+                       INPUT(_type='file', _name='csvfile'),
+                       INPUT(_type='hidden', _value=csv_table, _name='table'),
+                       INPUT(_type='submit', _value=T('import')))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -241,7 +245,7 @@ def select():
                        request.vars.csvfile.file)
             response.flash = T('data uploaded')
         except Exception, e:
-            response.flash = DIV(T('unable to parse csv file'),PRE(str(e)))
+            response.flash = DIV(T('unable to parse csv file'), PRE(str(e)))
     # end handle upload csv
 
     return dict(
@@ -252,9 +256,9 @@ def select():
         nrows=nrows,
         rows=rows,
         query=request.vars.query,
-        formcsv = formcsv,
-        tb = tb,
-        )
+        formcsv=formcsv,
+        tb=tb,
+    )
 
 
 # ##########################################################
@@ -264,14 +268,16 @@ def select():
 
 def update():
     (db, table) = get_table(request)
-    keyed = hasattr(db[table],'_primarykey')
+    keyed = hasattr(db[table], '_primarykey')
     record = None
     if keyed:
         key = [f for f in request.vars if f in db[table]._primarykey]
         if key:
-            record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first()
+            record = db(db[table][key[0]] == request.vars[key[
+                        0]], ignore_common_filters=True).select().first()
     else:
-        record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first()
+        record = db(db[table].id == request.args(
+            2), ignore_common_filters=True).select().first()
 
     if not record:
         qry = query_by_table_type(table, db)
@@ -281,20 +287,21 @@ def update():
 
     if keyed:
         for k in db[table]._primarykey:
-            db[table][k].writable=False
+            db[table][k].writable = False
 
-    form = SQLFORM(db[table], record, deletable=True, delete_label=T('Check to delete'),
-                   ignore_rw=ignore_rw and not keyed,
-                   linkto=URL('select',
+    form = SQLFORM(
+        db[table], record, deletable=True, delete_label=T('Check to delete'),
+        ignore_rw=ignore_rw and not keyed,
+        linkto=URL('select',
                    args=request.args[:1]), upload=URL(r=request,
-                   f='download', args=request.args[:1]))
+                                                      f='download', args=request.args[:1]))
 
     if form.accepts(request.vars, session):
         session.flash = T('done!')
         qry = query_by_table_type(table, db)
         redirect(URL('select', args=request.args[:1],
                  vars=dict(query=qry)))
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])
 
 
 # ##########################################################
@@ -305,11 +312,15 @@ def update():
 def state():
     return dict()
 
+
 def ccache():
     form = FORM(
-        P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
-        P(TAG.BUTTON(T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
-        P(TAG.BUTTON(T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+        P(TAG.BUTTON(
+            T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+        P(TAG.BUTTON(
+            T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+        P(TAG.BUTTON(
+            T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
     )
 
     if form.accepts(request.vars, session):
@@ -333,11 +344,16 @@ def ccache():
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy; hp=hpy()
+        from guppy import hpy
+        hp = hpy()
     except ImportError:
         hp = False
 
-    import shelve, os, copy, time, math
+    import shelve
+    import os
+    import copy
+    import time
+    import math
     from gluon import portalocker
 
     ram = {
@@ -382,9 +398,10 @@ def ccache():
             ram['keys'].append((key, GetInHMS(time.time() - value[0])))
 
     locker = open(os.path.join(request.folder,
-                                        'cache/cache.lock'), 'a')
+                               'cache/cache.lock'), 'a')
     portalocker.lock(locker, portalocker.LOCK_EX)
-    disk_storage = shelve.open(os.path.join(request.folder, 'cache/cache.shelve'))
+    disk_storage = shelve.open(
+        os.path.join(request.folder, 'cache/cache.shelve'))
     try:
         for key, value in disk_storage.items():
             if isinstance(value, dict):
@@ -415,7 +432,8 @@ def ccache():
     total['misses'] = ram['misses'] + disk['misses']
     total['keys'] = ram['keys'] + disk['keys']
     try:
-        total['ratio'] = total['hits'] * 100 / (total['hits'] + total['misses'])
+        total['ratio'] = total['hits'] * 100 / (total['hits'] +
+                                                total['misses'])
     except (KeyError, ZeroDivisionError):
         total['ratio'] = 0
 
diff --git a/applications/admin/controllers/debug.py b/applications/admin/controllers/debug.py
index f7c73d31..0b289420 100644
--- a/applications/admin/controllers/debug.py
+++ b/applications/admin/controllers/debug.py
@@ -5,35 +5,39 @@ import gluon.contrib.shell
 import gluon.dal
 import gluon.html
 import gluon.validators
-import code, thread
+import code
+import thread
 from gluon.debug import communicate, web_debugger, qdb_debugger
 import pydoc
 
 
 if DEMO_MODE or MULTI_USER_MODE:
     session.flash = T('disabled in demo mode')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+FE = 10 ** 9
 
-FE=10**9
 
 def index():
     app = request.args(0) or 'admin'
     reset()
     # read buffer
     data = communicate()
-    return dict(app=app,data=data)
+    return dict(app=app, data=data)
+
 
 def callback():
     app = request.args[0]
     command = request.vars.statement
-    session['debug_commands:'+app].append(command)
+    session['debug_commands:' + app].append(command)
     output = communicate(command)
-    k = len(session['debug_commands:'+app]) - 1
+    k = len(session['debug_commands:' + app]) - 1
     return '[%i] %s%s\n' % (k + 1, command, output)
 
+
 def reset():
     app = request.args(0) or 'admin'
-    session['debug_commands:'+app] = []
+    session['debug_commands:' + app] = []
     return 'done'
 
 
@@ -50,9 +54,9 @@ def interact():
     filename = web_debugger.filename
     lineno = web_debugger.lineno
     if filename:
-        lines = dict([(i+1, l) for (i, l) in enumerate(
-                            [l.strip("\n").strip("\r") for l
-                                in open(filename).readlines()])])
+        lines = dict([(i + 1, l) for (i, l) in enumerate(
+            [l.strip("\n").strip("\r") for l
+             in open(filename).readlines()])])
         filename = os.path.basename(filename)
     else:
         lines = {}
@@ -64,8 +68,8 @@ def interact():
         f_globals = {}
         for name, value in env['globals'].items():
             if name not in gluon.html.__all__ and \
-               name not in gluon.validators.__all__ and \
-               name not in gluon.dal.__all__:
+                name not in gluon.validators.__all__ and \
+                    name not in gluon.dal.__all__:
                 f_globals[name] = pydoc.text.repr(value)
     else:
         f_locals = {}
@@ -81,37 +85,43 @@ def interact():
                 f_globals=f_globals, f_locals=f_locals,
                 exception=web_debugger.exception_info)
 
+
 def step():
     web_debugger.do_step()
     redirect(URL("interact"))
 
+
 def next():
     web_debugger.do_next()
     redirect(URL("interact"))
 
+
 def cont():
     web_debugger.do_continue()
     redirect(URL("interact"))
 
+
 def ret():
     web_debugger.do_return()
     redirect(URL("interact"))
 
+
 def stop():
     web_debugger.do_quit()
     redirect(URL("interact"))
 
+
 def execute():
     app = request.args[0]
     command = request.vars.statement
-    session['debug_commands:'+app].append(command)
+    session['debug_commands:' + app].append(command)
     try:
         output = web_debugger.do_exec(command)
         if output is None:
             output = ""
     except Exception, e:
-        output =  T("Exception %s") % str(e)
-    k = len(session['debug_commands:'+app]) - 1
+        output = T("Exception %s") % str(e)
+    k = len(session['debug_commands:' + app]) - 1
     return '[%i] %s%s\n' % (k + 1, command, output)
 
 
@@ -122,8 +132,8 @@ def breakpoints():
     files = listdir(apath('', r=request), '.*\.py$')
     files = [filename for filename in files
              if filename and 'languages' not in filename
-                and not filename.startswith("admin")
-                and not filename.startswith("examples")]
+             and not filename.startswith("admin")
+             and not filename.startswith("examples")]
 
     form = SQLFORM.factory(
         Field('filename', requires=IS_IN_SET(files), label=T("Filename")),
@@ -133,17 +143,17 @@ def breakpoints():
               comment=T("deleted after first hit")),
         Field('condition', 'string', label=T("Condition"),
               comment=T("honored only if the expression evaluates to true")),
-        )
+    )
 
     if form.accepts(request.vars, session):
         filename = os.path.join(request.env['applications_parent'],
                                 'applications', form.vars.filename)
         err = qdb_debugger.do_set_breakpoint(filename,
-                                            form.vars.lineno,
-                                            form.vars.temporary,
-                                            form.vars.condition)
+                                             form.vars.lineno,
+                                             form.vars.temporary,
+                                             form.vars.condition)
         response.flash = T("Set Breakpoint on %s at line %s: %s") % (
-                            filename, form.vars.lineno, err or T('successful'))
+            filename, form.vars.lineno, err or T('successful'))
 
     for item in request.vars:
         if item[:7] == 'delete_':
@@ -153,7 +163,7 @@ def breakpoints():
                     'path': bp[1], 'lineno': bp[2],
                     'temporary': bp[3], 'enabled': bp[4], 'hits': bp[5],
                     'condition': bp[6]}
-                    for bp in qdb_debugger.do_list_breakpoint()]
+                   for bp in qdb_debugger.do_list_breakpoint()]
 
     return dict(breakpoints=breakpoints, form=form)
 
@@ -185,13 +195,13 @@ def toggle_breakpoint():
                 if filename == bp_filename and lineno == bp_lineno:
                     err = qdb_debugger.do_clear_breakpoint(filename, lineno)
                     response.flash = T("Removed Breakpoint on %s at line %s", (
-                                        filename, lineno))
+                        filename, lineno))
                     ok = False
                     break
             else:
                 err = qdb_debugger.do_set_breakpoint(filename, lineno)
                 response.flash = T("Set Breakpoint on %s at line %s: %s") % (
-                                    filename, lineno, err or T('successful'))
+                    filename, lineno, err or T('successful'))
                 ok = True
         else:
             response.flash = T("Unable to determine the line number!")
diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 0ecae821..97293161 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -4,7 +4,7 @@ EXPERIMENTAL_STUFF = True
 
 if EXPERIMENTAL_STUFF:
     if is_mobile:
-        response.view = response.view.replace('default/','default.mobile/')
+        response.view = response.view.replace('default/', 'default.mobile/')
         response.menu = []
 
 import re
@@ -25,12 +25,12 @@ from gluon.languages import (read_possible_languages, read_dict, write_dict,
                              read_plural_dict, write_plural_dict)
 
 
-if DEMO_MODE and request.function in ['change_password','pack','pack_plugin','upgrade_web2py','uninstall','cleanup','compile_app','remove_compiled_app','delete','delete_plugin','create_file','upload_file','update_languages','reload_routes','git_push','git_pull']:
+if DEMO_MODE and request.function in ['change_password', 'pack', 'pack_plugin', 'upgrade_web2py', 'uninstall', 'cleanup', 'compile_app', 'remove_compiled_app', 'delete', 'delete_plugin', 'create_file', 'upload_file', 'update_languages', 'reload_routes', 'git_push', 'git_pull']:
     session.flash = T('disabled in demo mode')
     redirect(URL('site'))
 
 
-if not is_manager() and request.function in ['change_password','upgrade_web2py']:
+if not is_manager() and request.function in ['change_password', 'upgrade_web2py']:
     session.flash = T('disabled in multi user mode')
     redirect(URL('site'))
 
@@ -39,25 +39,32 @@ if FILTER_APPS and request.args(0) and not request.args(0) in FILTER_APPS:
     redirect(URL('site'))
 
 
-if not session.token: session.token = web2py_uuid()
+if not session.token:
+    session.token = web2py_uuid()
+
 
 def count_lines(data):
     return len([line for line in data.split('\n') if line.strip() and not line.startswith('#')])
 
-def log_progress(app,mode='EDIT',filename=None,progress=0):
+
+def log_progress(app, mode='EDIT', filename=None, progress=0):
     progress_file = os.path.join(apath(app, r=request), 'progress.log')
     now = str(request.now)[:19]
     if not os.path.exists(progress_file):
-        safe_open(progress_file,'w').write('[%s] START\n' % now)
+        safe_open(progress_file, 'w').write('[%s] START\n' % now)
     if filename:
-        safe_open(progress_file,'a').write('[%s] %s %s: %s\n' % (now,mode,filename,progress))
+        safe_open(progress_file, 'a').write(
+            '[%s] %s %s: %s\n' % (now, mode, filename, progress))
 
-def safe_open(a,b):
+
+def safe_open(a, b):
     if DEMO_MODE and ('w' in b or 'a' in b):
         class tmp:
-            def write(self,data): pass
+            def write(self, data):
+                pass
         return tmp()
-    return open(a,b)
+    return open(a, b)
+
 
 def safe_read(a, b='r'):
     safe_file = safe_open(a, b)
@@ -66,6 +73,7 @@ def safe_read(a, b='r'):
     finally:
         safe_file.close()
 
+
 def safe_write(a, value, b='w'):
     safe_file = safe_open(a, b)
     try:
@@ -73,14 +81,16 @@ def safe_write(a, value, b='w'):
     finally:
         safe_file.close()
 
+
 def get_app(name=None):
     app = name or request.args(0)
-    if app and (not MULTI_USER_MODE or is_manager() or \
-                    db(db.app.name==app)(db.app.owner==auth.user.id).count()):
+    if app and (not MULTI_USER_MODE or is_manager() or
+                db(db.app.name == app)(db.app.owner == auth.user.id).count()):
         return app
     session.flash = T('App does not exist or your are not authorized')
     redirect(URL('site'))
 
+
 def index():
     """ Index handler """
 
@@ -127,18 +137,19 @@ def check_version():
     session._unlock(response)
 
     new_version, version_number = check_new_version(request.env.web2py_version,
-                                    WEB2PY_VERSION_URL)
+                                                    WEB2PY_VERSION_URL)
 
     if new_version == -1:
         return A(T('Unable to check for upgrades'), _href=WEB2PY_URL)
     elif new_version != True:
         return A(T('web2py is up to date'), _href=WEB2PY_URL)
-    elif platform.system().lower() in ('windows','win32','win64') and os.path.exists("web2py.exe"):
+    elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"):
         return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3])
     else:
         return sp_button(URL('upgrade_web2py'), T('upgrade now')) \
-            + XML(' <strong class="upgrade_version">%s.%s.%s</strong>' \
-                      % version_number[:3])
+            + XML(' <strong class="upgrade_version">%s.%s.%s</strong>'
+                  % version_number[:3])
+
 
 def logout():
     """ Logout handler """
@@ -151,11 +162,13 @@ def logout():
 def change_password():
 
     if session.pam_user:
-        session.flash = T('PAM authenticated user, cannot change password here')
+        session.flash = T(
+            'PAM authenticated user, cannot change password here')
         redirect(URL('site'))
-    form=SQLFORM.factory(Field('current_admin_password','password'),
-                         Field('new_admin_password','password',requires=IS_STRONG()),
-                         Field('new_admin_password_again','password'))
+    form = SQLFORM.factory(Field('current_admin_password', 'password'),
+                           Field('new_admin_password',
+                                 'password', requires=IS_STRONG()),
+                           Field('new_admin_password_again', 'password'))
     if form.accepts(request.vars):
         if not verify_password(request.vars.current_admin_password):
             form.errors.current_admin_password = T('invalid password')
@@ -163,7 +176,8 @@ def change_password():
             form.errors.new_admin_password_again = T('no match')
         else:
             path = abspath('parameters_%s.py' % request.env.server_port)
-            safe_write(path, 'password="%s"' % CRYPT()(request.vars.new_admin_password)[0])
+            safe_write(path, 'password="%s"' % CRYPT()(
+                request.vars.new_admin_password)[0])
             session.flash = T('password changed')
             redirect(URL('site'))
     return dict(form=form)
@@ -178,21 +192,21 @@ def site():
     file_or_appurl = 'file' in request.vars or 'appurl' in request.vars
 
     class IS_VALID_APPNAME(object):
-        def __call__(self,value):
+        def __call__(self, value):
             if not re.compile('\w+').match(value):
-                return (value,T('Invalid application name'))
+                return (value, T('Invalid application name'))
             if not request.vars.overwrite and \
-                    os.path.exists(os.path.join(apath(r=request),value)):
-                return (value,T('Application exists already'))
-            return (value,None)
+                    os.path.exists(os.path.join(apath(r=request), value)):
+                return (value, T('Application exists already'))
+            return (value, None)
 
     is_appname = IS_VALID_APPNAME()
-    form_create = SQLFORM.factory(Field('name',requires=is_appname),
+    form_create = SQLFORM.factory(Field('name', requires=is_appname),
                                   table_name='appcreate')
-    form_update = SQLFORM.factory(Field('name',requires=is_appname),
-                                  Field('file','upload',uploadfield=False),
+    form_update = SQLFORM.factory(Field('name', requires=is_appname),
+                                  Field('file', 'upload', uploadfield=False),
                                   Field('url'),
-                                  Field('overwrite','boolean'),
+                                  Field('overwrite', 'boolean'),
                                   table_name='appupdate')
     form_create.process()
     form_update.process()
@@ -203,13 +217,13 @@ def site():
     elif form_create.accepted:
         # create a new application
         appname = cleanpath(form_create.vars.name)
-        created, error = app_create(appname, request,info=True)
+        created, error = app_create(appname, request, info=True)
         if created:
             if MULTI_USER_MODE:
-                db.app.insert(name=appname,owner=auth.user.id)
+                db.app.insert(name=appname, owner=auth.user.id)
             log_progress(appname)
             session.flash = T('new application "%s" created', appname)
-            redirect(URL('design',args=appname))
+            redirect(URL('design', args=appname))
         else:
             session.flash = \
                 DIV(T('unable to create application "%s"' % appname),
@@ -221,9 +235,9 @@ def site():
             if not have_git:
                 session.flash = GIT_MISSING
                 redirect(URL(r=request))
-            target = os.path.join(apath(r=request),form_update.vars.name)
+            target = os.path.join(apath(r=request), form_update.vars.name)
             try:
-                new_repo = Repo.clone_from(form_update.vars.url,target)
+                new_repo = Repo.clone_from(form_update.vars.url, target)
                 session.flash = T('new application "%s" imported',
                                   form_update.vars.name)
             except GitCommandError, err:
@@ -238,7 +252,7 @@ def site():
                     raise Exception("404 file not found")
             except Exception, e:
                 session.flash = \
-                    DIV(T('Unable to download app because:'),PRE(str(e)))
+                    DIV(T('Unable to download app because:'), PRE(str(e)))
                 redirect(URL(r=request))
             fname = form_update.vars.url
 
@@ -258,7 +272,7 @@ def site():
         if f and installed:
             msg = 'application %(appname)s installed with md5sum: %(digest)s'
             if MULTI_USER_MODE:
-                db.app.insert(name=appname,owner=auth.user.id)
+                db.app.insert(name=appname, owner=auth.user.id)
             log_progress(appname)
             session.flash = T(msg, dict(appname=appname,
                                         digest=md5_hash(installed)))
@@ -275,12 +289,12 @@ def site():
     if is_manager():
         apps = [f for f in os.listdir(apath(r=request)) if regex.match(f)]
     else:
-        apps = [f.name for f in db(db.app.owner==auth.user_id).select()]
+        apps = [f.name for f in db(db.app.owner == auth.user_id).select()]
 
     if FILTER_APPS:
         apps = [f for f in apps if f in FILTER_APPS]
 
-    apps = sorted(apps,lambda a,b:cmp(a.upper(),b.upper()))
+    apps = sorted(apps, lambda a, b: cmp(a.upper(), b.upper()))
 
     return dict(app=None, apps=apps, myversion=myversion,
                 form_create=form_create, form_update=form_update)
@@ -292,13 +306,15 @@ def report_progress(app):
     regex = re.compile('\[(.*?)\][^\:]+\:\s+(\-?\d+)')
     if not os.path.exists(progress_file):
         return []
-    matches = regex.findall(open(progress_file,'r').read())
-    events,counter = [],0
+    matches = regex.findall(open(progress_file, 'r').read())
+    events, counter = [], 0
     for m in matches:
-        if not m: continue
-        days = -(request.now - datetime.datetime.strptime(m[0],'%Y-%m-%d %H:%M:%S')).days
+        if not m:
+            continue
+        days = -(request.now - datetime.datetime.strptime(m[0],
+                 '%Y-%m-%d %H:%M:%S')).days
         counter += int(m[1])
-        events.append([days,counter])
+        events.append([days, counter])
     return events
 
 
@@ -324,6 +340,7 @@ def pack():
         session.flash = T('internal error: %s' % e)
         redirect(URL('site'))
 
+
 def pack_plugin():
     app = get_app()
     if len(request.args) == 2:
@@ -336,11 +353,12 @@ def pack_plugin():
         return safe_read(filename, 'rb')
     else:
         session.flash = T('internal error')
-        redirect(URL('plugin',args=request.args))
+        redirect(URL('plugin', args=request.args))
+
 
 def upgrade_web2py():
     dialog = FORM.confirm(T('Upgrade'),
-                         {T('Cancel'):URL('site')})
+                          {T('Cancel'): URL('site')})
     if dialog.accepted:
         (success, error) = upgrade(request)
         if success:
@@ -350,17 +368,18 @@ def upgrade_web2py():
         redirect(URL('site'))
     return dict(dialog=dialog)
 
+
 def uninstall():
     app = get_app()
 
     dialog = FORM.confirm(T('Uninstall'),
-                         {T('Cancel'):URL('site')})
+                          {T('Cancel'): URL('site')})
 
     if dialog.accepted:
         if MULTI_USER_MODE:
-            if is_manager() and db(db.app.name==app).delete():
+            if is_manager() and db(db.app.name == app).delete():
                 pass
-            elif db(db.app.name==app)(db.app.owner==auth.user.id).delete():
+            elif db(db.app.name == app)(db.app.owner == auth.user.id).delete():
                 pass
             else:
                 session.flash = T('no permission to uninstall "%s"', app)
@@ -396,7 +415,7 @@ def compile_app():
         session.flash = T('application compiled')
     else:
         session.flash = DIV(T('Cannot compile: there are errors in your app:'),
-                              CODE(c))
+                            CODE(c))
     redirect(URL('site'))
 
 
@@ -407,6 +426,7 @@ def remove_compiled_app():
     session.flash = T('compiled application removed')
     redirect(URL('site'))
 
+
 def delete():
     """ Object delete handler """
     app = get_app()
@@ -421,9 +441,9 @@ def delete():
     elif 'delete' in request.vars:
         try:
             full_path = apath(filename, r=request)
-            lineno = count_lines(open(full_path,'r').read())
+            lineno = count_lines(open(full_path, 'r').read())
             os.unlink(full_path)
-            log_progress(app,'DELETE',filename,progress=-lineno)
+            log_progress(app, 'DELETE', filename, progress=-lineno)
             session.flash = T('file "%(filename)s" deleted',
                               dict(filename=filename))
         except Exception:
@@ -432,6 +452,7 @@ def delete():
         redirect(URL(sender, anchor=request.vars.id2))
     return dict(filename=filename, sender=sender)
 
+
 def delete():
     """ Object delete handler """
     app = get_app()
@@ -442,33 +463,35 @@ def delete():
         sender = sender[0]
 
     dialog = FORM.confirm(T('Delete'),
-                         {T('Cancel'):URL(sender, anchor=request.vars.id)})
+                          {T('Cancel'): URL(sender, anchor=request.vars.id)})
 
     if dialog.accepted:
         try:
             full_path = apath(filename, r=request)
-            lineno = count_lines(open(full_path,'r').read())
+            lineno = count_lines(open(full_path, 'r').read())
             os.unlink(full_path)
-            log_progress(app,'DELETE',filename,progress=-lineno)
+            log_progress(app, 'DELETE', filename, progress=-lineno)
             session.flash = T('file "%(filename)s" deleted',
                               dict(filename=filename))
         except Exception:
             session.flash = T('unable to delete file "%(filename)s"',
                               dict(filename=filename))
         redirect(URL(sender, anchor=request.vars.id2))
-    return dict(dialog=dialog,filename=filename)
+    return dict(dialog=dialog, filename=filename)
+
 
 def enable():
     app = get_app()
-    filename = os.path.join(apath(app, r=request),'DISABLED')
+    filename = os.path.join(apath(app, r=request), 'DISABLED')
     if is_gae:
-        return SPAN(T('Not supported'),_style='color:yellow')
+        return SPAN(T('Not supported'), _style='color:yellow')
     elif os.path.exists(filename):
         os.unlink(filename)
-        return SPAN(T('Disable'),_style='color:green')
+        return SPAN(T('Disable'), _style='color:green')
     else:
-        safe_open(filename,'wb').write(time.ctime())
-        return SPAN(T('Enable'),_style='color:red')
+        safe_open(filename, 'wb').write(time.ctime())
+        return SPAN(T('Enable'), _style='color:red')
+
 
 def peek():
     """ Visualize object code """
@@ -479,7 +502,7 @@ def peek():
     else:
         path = apath(filename, r=request)
     try:
-        data = safe_read(path).replace('\r','')
+        data = safe_read(path).replace('\r', '')
     except IOError:
         session.flash = T('file does not exist')
         redirect(URL('site'))
@@ -491,6 +514,7 @@ def peek():
                 data=data,
                 extension=extension)
 
+
 def test():
     """ Execute controller tests """
     app = get_app()
@@ -499,28 +523,34 @@ def test():
     else:
         file = '.*\.py'
 
-    controllers = listdir(apath('%s/controllers/' % app, r=request), file + '$')
+    controllers = listdir(
+        apath('%s/controllers/' % app, r=request), file + '$')
 
     return dict(app=app, controllers=controllers)
 
+
 def keepalive():
     return ''
 
+
 def search():
-    keywords=request.vars.keywords or ''
+    keywords = request.vars.keywords or ''
     app = get_app()
-    def match(filename,keywords):
-        filename=os.path.join(apath(app, r=request),filename)
-        if keywords in read_file(filename,'rb'):
+
+    def match(filename, keywords):
+        filename = os.path.join(apath(app, r=request), filename)
+        if keywords in read_file(filename, 'rb'):
             return True
         return False
     path = apath(request.args[0], r=request)
-    files1 = glob(os.path.join(path,'*/*.py'))
-    files2 = glob(os.path.join(path,'*/*.html'))
-    files3 = glob(os.path.join(path,'*/*/*.html'))
-    files=[x[len(path)+1:].replace('\\','/') for x in files1+files2+files3 if match(x,keywords)]
+    files1 = glob(os.path.join(path, '*/*.py'))
+    files2 = glob(os.path.join(path, '*/*.html'))
+    files3 = glob(os.path.join(path, '*/*/*.html'))
+    files = [x[len(path) + 1:].replace(
+        '\\', '/') for x in files1 + files2 + files3 if match(x, keywords)]
     return response.json(dict(files=files, message=T.M('Searching: **%s** %%{file}', len(files))))
 
+
 def edit():
     """ File edit handler """
     # Load json only if it is ajax edited...
@@ -552,7 +582,7 @@ def edit():
         except IOError:
             session.flash = T('Invalid action')
             if 'from_ajax' in request.vars:
-                 return response.json({'error': str(T('Invalid action'))})
+                return response.json({'error': str(T('Invalid action'))})
             else:
                 redirect(URL('site'))
 
@@ -590,7 +620,8 @@ def edit():
             data = request.vars.data.replace('\r\n', '\n').strip() + '\n'
             safe_write(path, data)
             lineno_new = count_lines(data)
-            log_progress(app,'EDIT',filename,progress=lineno_new-lineno_old)
+            log_progress(
+                app, 'EDIT', filename, progress=lineno_new - lineno_old)
             file_hash = md5_hash(data)
             saved_on = time.ctime(os.stat(path)[stat.ST_MTIME])
             response.flash = T('file saved on %s', saved_on)
@@ -602,35 +633,40 @@ def edit():
     if filetype == 'python' and request.vars.data:
         import _ast
         try:
-            code = request.vars.data.rstrip().replace('\r\n','\n')+'\n'
+            code = request.vars.data.rstrip().replace('\r\n', '\n') + '\n'
             compile(code, path, "exec", _ast.PyCF_ONLY_AST)
         except Exception, e:
-            start = sum([len(line)+1 for l, line
-                            in enumerate(request.vars.data.split("\n"))
-                            if l < e.lineno-1])
+            start = sum([len(line) + 1 for l, line
+                         in enumerate(request.vars.data.split("\n"))
+                         if l < e.lineno - 1])
             if e.text and e.offset:
-                offset = e.offset - (len(e.text) - len(e.text.splitlines()[-1]))
+                offset = e.offset - (len(e.text) - len(
+                    e.text.splitlines()[-1]))
             else:
                 offset = 0
-            highlight = {'start': start, 'end': start + offset + 1, 'lineno': e.lineno}
+            highlight = {'start': start, 'end': start +
+                         offset + 1, 'lineno': e.lineno}
             try:
                 ex_name = e.__class__.__name__
             except:
                 ex_name = 'unknown exception!'
             response.flash = DIV(T('failed to compile file because:'), BR(),
-                                 B(ex_name), ' '+T('at line %s', e.lineno),
-                                 offset and ' '+T('at char %s', offset) or '',
+                                 B(ex_name), ' ' + T('at line %s', e.lineno),
+                                 offset and ' ' +
+                                 T('at char %s', offset) or '',
                                  PRE(str(e)))
 
     if data_or_revert and request.args[1] == 'modules':
         # Lets try to reload the modules
         try:
             mopath = '.'.join(request.args[2:])[:-3]
-            exec 'import applications.%s.modules.%s' % (request.args[0], mopath)
+            exec 'import applications.%s.modules.%s' % (
+                request.args[0], mopath)
             reload(sys.modules['applications.%s.modules.%s'
-                    % (request.args[0], mopath)])
+                               % (request.args[0], mopath)])
         except Exception, e:
-            response.flash = DIV(T('failed to reload module because:'),PRE(str(e)))
+            response.flash = DIV(
+                T('failed to reload module because:'), PRE(str(e)))
 
     edit_controller = None
     editviewlinks = None
@@ -640,28 +676,28 @@ def edit():
                                  request.args[2] + '.py')
         if os.path.exists(apath(cfilename, r=request)):
             edit_controller = URL('edit', args=[cfilename])
-            view = request.args[3].replace('.html','')
-            view_link = URL(request.args[0],request.args[2],view)
+            view = request.args[3].replace('.html', '')
+            view_link = URL(request.args[0], request.args[2], view)
     elif filetype == 'python' and request.args[1] == 'controllers':
         ## it's a controller file.
         ## Create links to all of the associated view files.
         app = get_app()
         viewname = os.path.splitext(request.args[2])[0]
-        viewpath = os.path.join(app,'views',viewname)
+        viewpath = os.path.join(app, 'views', viewname)
         aviewpath = apath(viewpath, r=request)
         viewlist = []
         if os.path.exists(aviewpath):
             if os.path.isdir(aviewpath):
-                viewlist = glob(os.path.join(aviewpath,'*.html'))
-        elif os.path.exists(aviewpath+'.html'):
-            viewlist.append(aviewpath+'.html')
+                viewlist = glob(os.path.join(aviewpath, '*.html'))
+        elif os.path.exists(aviewpath + '.html'):
+            viewlist.append(aviewpath + '.html')
         if len(viewlist):
             editviewlinks = []
             for v in viewlist:
                 vf = os.path.split(v)[-1]
-                vargs = "/".join([viewpath.replace(os.sep,"/"),vf])
-                editviewlinks.append(A(vf.split(".")[0],\
-                    _href=URL('edit',args=[vargs])))
+                vargs = "/".join([viewpath.replace(os.sep, "/"), vf])
+                editviewlinks.append(A(vf.split(".")[0],
+                                       _href=URL('edit', args=[vargs])))
 
     if len(request.args) > 2 and request.args[1] == 'controllers':
         controller = (request.args[2])[:-3]
@@ -670,7 +706,7 @@ def edit():
         (controller, functions) = (None, None)
 
     if 'from_ajax' in request.vars:
-        return response.json({'file_hash': file_hash, 'saved_on': saved_on, 'functions':functions, 'controller': controller, 'application': request.args[0], 'highlight': highlight })
+        return response.json({'file_hash': file_hash, 'saved_on': saved_on, 'functions': functions, 'controller': controller, 'application': request.args[0], 'highlight': highlight})
     else:
 
         editarea_preferences = {}
@@ -680,8 +716,8 @@ def edit():
         editarea_preferences['REPLACE_TAB_BY_SPACES'] = '4'
         editarea_preferences['DISPLAY'] = 'onload'
         for key in editarea_preferences:
-            if globals().has_key(key):
-                editarea_preferences[key]=globals()[key]
+            if key in globals():
+                editarea_preferences[key] = globals()[key]
         return dict(app=request.args[0],
                     filename=filename,
                     filetype=filetype,
@@ -695,6 +731,7 @@ def edit():
                     editarea_preferences=editarea_preferences,
                     editviewlinks=editviewlinks)
 
+
 def resolve():
     """
     """
@@ -739,19 +776,19 @@ def resolve():
             return 'minus'
 
     if request.vars:
-        c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0] \
-                           == ' ' or 'line%i' % i in request.vars])
+        c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0]
+                       == ' ' or 'line%i' % i in request.vars])
         safe_write(path, c)
         session.flash = 'files merged'
         redirect(URL('edit', args=request.args))
     else:
         # Making the short circuit compatible with <= python2.4
-        gen_data = lambda index,item: not item[:1] in ['+','-'] and "" \
-                   or INPUT(_type='checkbox',
-                            _name='line%i' % index,
-                            value=item[0] == '+')
+        gen_data = lambda index, item: not item[:1] in ['+', '-'] and "" \
+            or INPUT(_type='checkbox',
+                     _name='line%i' % index,
+                     value=item[0] == '+')
 
-        diff = TABLE(*[TR(TD(gen_data(i,item)),
+        diff = TABLE(*[TR(TD(gen_data(i, item)),
                           TD(item[0]),
                           TD(leading(item[2:]),
                           TT(item[2:].rstrip())), _class=getclass(item))
@@ -767,10 +804,11 @@ def edit_language():
     strings = read_dict(apath(filename, r=request))
 
     if '__corrupted__' in strings:
-       form = SPAN(strings['__corrupted__'],_class='error')
-       return dict(filename=filename, form=form)
+        form = SPAN(strings['__corrupted__'], _class='error')
+        return dict(filename=filename, form=form)
 
-    keys = sorted(strings.keys(),lambda x,y: cmp(unicode(x,'utf-8').lower(), unicode(y,'utf-8').lower()))
+    keys = sorted(strings.keys(), lambda x, y: cmp(
+        unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()))
     rows = []
     rows.append(H2(T('Original/Translation')))
 
@@ -779,16 +817,16 @@ def edit_language():
         s = strings[key]
         (prefix, sep, key) = key.partition('\x01')
         if sep:
-            prefix = SPAN(prefix+': ', _class='tm_ftag')
+            prefix = SPAN(prefix + ': ', _class='tm_ftag')
             k = key
         else:
             (k, prefix) = (prefix, '')
 
-        _class='untranslated' if k==s else 'translated'
+        _class = 'untranslated' if k == s else 'translated'
 
         if len(s) <= 40:
             elem = INPUT(_type='text', _name=name, value=s,
-                         _size=70,_class=_class)
+                         _size=70, _class=_class)
         else:
             elem = TEXTAREA(_name=name, value=s, _cols=70,
                             _rows=5, _class=_class)
@@ -797,7 +835,7 @@ def edit_language():
         k = (s != k) and k or B(k)
 
         rows.append(P(prefix, k, BR(), elem, TAG.BUTTON(T('delete'),
-                            _onclick='return delkey("%s")' % name), _id=name))
+                                                        _onclick='return delkey("%s")' % name), _id=name))
 
     rows.append(INPUT(_type='submit', _value=T('update')))
     form = FORM(*rows)
@@ -805,57 +843,66 @@ def edit_language():
         strs = dict()
         for key in keys:
             name = md5_hash(key)
-            if form.vars[name]==chr(127): continue
+            if form.vars[name] == chr(127):
+                continue
             strs[key] = form.vars[name]
         write_dict(apath(filename, r=request), strs)
         session.flash = T('file saved on %(time)s', dict(time=time.ctime()))
-        redirect(URL(r=request,args=request.args))
+        redirect(URL(r=request, args=request.args))
     return dict(app=request.args[0], filename=filename, form=form)
 
+
 def edit_plurals():
     """ Edit plurals file """
     app = get_app()
     filename = '/'.join(request.args)
-    plurals = read_plural_dict(apath(filename, r=request)) # plural forms dictionary
-    nplurals = int(request.vars.nplurals)-1 # plural forms quantity
+    plurals = read_plural_dict(
+        apath(filename, r=request))  # plural forms dictionary
+    nplurals = int(request.vars.nplurals) - 1  # plural forms quantity
     xnplurals = xrange(nplurals)
 
     if '__corrupted__' in plurals:
-       # show error message and exit
-       form = SPAN(plurals['__corrupted__'],_class='error')
-       return dict(filename=filename, form=form)
+        # show error message and exit
+        form = SPAN(plurals['__corrupted__'], _class='error')
+        return dict(filename=filename, form=form)
 
-    keys = sorted(plurals.keys(),lambda x,y: cmp(unicode(x,'utf-8').lower(), unicode(y,'utf-8').lower()))
+    keys = sorted(plurals.keys(), lambda x, y: cmp(
+        unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()))
     rows = []
 
-    row=[T("Singular Form")]
-    row.extend([T("Plural Form #%s", n+1) for n in xnplurals])
-    table=TABLE(THEAD(TR(row)))
+    row = [T("Singular Form")]
+    row.extend([T("Plural Form #%s", n + 1) for n in xnplurals])
+    table = TABLE(THEAD(TR(row)))
 
     for key in keys:
         name = md5_hash(key)
         forms = plurals[key]
 
         if len(forms) < nplurals:
-            forms.extend(None for i in xrange(nplurals-len(forms)))
+            forms.extend(None for i in xrange(nplurals - len(forms)))
 
         row = [B(key)]
-        row.extend([INPUT(_type='text', _name=name+'_'+str(n), value=forms[n], _size=20) for n in xnplurals])
-        row.append(TD(TAG.BUTTON(T('delete'), _onclick='return delkey("%s")' % name)))
+        row.extend([INPUT(_type='text', _name=name + '_' + str(n),
+                   value=forms[n], _size=20) for n in xnplurals])
+        row.append(TD(
+            TAG.BUTTON(T('delete'), _onclick='return delkey("%s")' % name)))
         rows.append(TR(row, _id=name))
     if rows:
         table.append(TBODY(rows))
-    rows=[table, INPUT(_type='submit', _value=T('update'))]
+    rows = [table, INPUT(_type='submit', _value=T('update'))]
     form = FORM(*rows)
     if form.accepts(request.vars, keepvalues=True):
         new_plurals = dict()
         for key in keys:
             name = md5_hash(key)
-            if form.vars[name+'_0']==chr(127): continue
-            new_plurals[key] = [form.vars[name+'_'+str(n)] for n in xnplurals]
+            if form.vars[name + '_0'] == chr(127):
+                continue
+            new_plurals[key] = [form.vars[name + '_' + str(n)]
+                                for n in xnplurals]
         write_plural_dict(apath(filename, r=request), new_plurals)
         session.flash = T('file saved on %(time)s', dict(time=time.ctime()))
-        redirect(URL(r=request, args=request.args, vars=dict(nplurals=request.vars.nplurals)))
+        redirect(URL(r=request, args=request.args, vars=dict(
+            nplurals=request.vars.nplurals)))
     return dict(app=request.args[0], filename=filename, form=form)
 
 
@@ -865,7 +912,7 @@ def about():
     # ## check if file is not there
     about = safe_read(apath('%s/ABOUT' % app, r=request))
     license = safe_read(apath('%s/LICENSE' % app, r=request))
-    return dict(app=app, about=MARKMIN(about), license=MARKMIN(license),progress=report_progress(app))
+    return dict(app=app, about=MARKMIN(about), license=MARKMIN(license), progress=report_progress(app))
 
 
 def design():
@@ -876,24 +923,23 @@ def design():
         msg = T('ATTENTION: you cannot edit the running application!')
         response.flash = msg
 
-    if request.vars and not request.vars.token==session.token:
+    if request.vars and not request.vars.token == session.token:
         redirect(URL('logout'))
 
-    if request.vars.pluginfile!=None and not isinstance(request.vars.pluginfile,str):
-        filename=os.path.basename(request.vars.pluginfile.filename)
+    if request.vars.pluginfile is not None and not isinstance(request.vars.pluginfile, str):
+        filename = os.path.basename(request.vars.pluginfile.filename)
         if plugin_install(app, request.vars.pluginfile.file,
                           request, filename):
             session.flash = T('new plugin installed')
-            redirect(URL('design',args=app))
+            redirect(URL('design', args=app))
         else:
             session.flash = \
                 T('unable to create application "%s"', request.vars.filename)
         redirect(URL(r=request))
-    elif isinstance(request.vars.pluginfile,str):
+    elif isinstance(request.vars.pluginfile, str):
         session.flash = T('plugin not specified')
         redirect(URL(r=request))
 
-
     # If we have only pyc files it means that
     # we cannot design
     if os.path.exists(apath('%s/compiled' % app, r=request)):
@@ -903,7 +949,7 @@ def design():
 
     # Get all models
     models = listdir(apath('%s/models/' % app, r=request), '.*\.py$')
-    models=[x.replace('\\','/') for x in models]
+    models = [x.replace('\\', '/') for x in models]
     defines = {}
     for m in models:
         data = safe_read(apath('%s/models/%s' % (app, m), r=request))
@@ -911,8 +957,9 @@ def design():
         defines[m].sort()
 
     # Get all controllers
-    controllers = sorted(listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
-    controllers = [x.replace('\\','/') for x in controllers]
+    controllers = sorted(
+        listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
+    controllers = [x.replace('\\', '/') for x in controllers]
     functions = {}
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
@@ -920,8 +967,9 @@ def design():
         functions[c] = items
 
     # Get all views
-    views = sorted(listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$'))
-    views = [x.replace('\\','/') for x in views if not x.endswith('.bak')]
+    views = sorted(
+        listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$'))
+    views = [x.replace('\\', '/') for x in views if not x.endswith('.bak')]
     extend = {}
     include = {}
     for c in views:
@@ -936,72 +984,76 @@ def design():
 
     # Get all modules
     modules = listdir(apath('%s/modules/' % app, r=request), '.*\.py$')
-    modules = modules=[x.replace('\\','/') for x in modules]
+    modules = modules = [x.replace('\\', '/') for x in modules]
     modules.sort()
 
     # Get all private files
     privates = listdir(apath('%s/private/' % app, r=request), '[^\.#].*')
-    privates = [x.replace('\\','/') for x in privates]
+    privates = [x.replace('\\', '/') for x in privates]
     privates.sort()
 
     # Get all static files
     statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*')
-    statics = [x.replace('\\','/') for x in statics]
+    statics = [x.replace('\\', '/') for x in statics]
     statics.sort()
 
     # Get all languages
-    languages=dict([(lang,info) for lang,info
-                   in read_possible_languages(
-                       apath(app, r=request)).iteritems()
-                   if info[2]!=0]) # info[2] is langfile_mtime:
+    languages = dict([(lang, info) for lang, info
+                      in read_possible_languages(
+                      apath(app, r=request)).iteritems()
+                      if info[2] != 0])  # info[2] is langfile_mtime:
                                    # get only existed files
 
     #Get crontab
     cronfolder = apath('%s/cron' % app, r=request)
-    if not os.path.exists(cronfolder): os.mkdir(cronfolder)
+    if not os.path.exists(cronfolder):
+        os.mkdir(cronfolder)
     crontab = apath('%s/cron/crontab' % app, r=request)
     if not os.path.exists(crontab):
         safe_write(crontab, '#crontab')
 
-    plugins=[]
-    def filter_plugins(items,plugins):
-        plugins+=[item[7:].split('/')[0].split('.')[0] for item in items if item.startswith('plugin_')]
-        plugins[:]=list(set(plugins))
+    plugins = []
+
+    def filter_plugins(items, plugins):
+        plugins += [item[7:].split('/')[0].split(
+            '.')[0] for item in items if item.startswith('plugin_')]
+        plugins[:] = list(set(plugins))
         plugins.sort()
         return [item for item in items if not item.startswith('plugin_')]
 
     return dict(app=app,
-                models=filter_plugins(models,plugins),
+                models=filter_plugins(models, plugins),
                 defines=defines,
-                controllers=filter_plugins(controllers,plugins),
+                controllers=filter_plugins(controllers, plugins),
                 functions=functions,
-                views=filter_plugins(views,plugins),
-                modules=filter_plugins(modules,plugins),
+                views=filter_plugins(views, plugins),
+                modules=filter_plugins(modules, plugins),
                 extend=extend,
                 include=include,
-                privates=filter_plugins(privates,plugins),
-                statics=filter_plugins(statics,plugins),
+                privates=filter_plugins(privates, plugins),
+                statics=filter_plugins(statics, plugins),
                 languages=languages,
                 crontab=crontab,
                 plugins=plugins)
 
+
 def delete_plugin():
     """ Object delete handler """
-    app=request.args(0)
+    app = request.args(0)
     plugin = request.args(1)
-    plugin_name='plugin_'+plugin
+    plugin_name = 'plugin_' + plugin
 
     dialog = FORM.confirm(
         T('Delete'),
-        {T('Cancel'):URL('design', args=app)})
+        {T('Cancel'): URL('design', args=app)})
 
     if dialog.accepted:
         try:
-            for folder in ['models','views','controllers','static','modules', 'private']:
-                path=os.path.join(apath(app,r=request),folder)
+            for folder in ['models', 'views', 'controllers', 'static', 'modules', 'private']:
+                path = os.path.join(apath(app, r=request), folder)
                 for item in os.listdir(path):
-                    if item.rsplit('.',1)[0] == plugin_name:
-                        filename=os.path.join(path,item)
+                    if item.rsplit('.', 1)[0] == plugin_name:
+                        filename = os.path.join(path, item)
                         if os.path.isdir(filename):
                             shutil.rmtree(filename)
                         else:
@@ -1012,7 +1064,8 @@ def delete_plugin():
             session.flash = T('unable to delete file plugin "%(plugin)s"',
                               dict(plugin=plugin))
         redirect(URL('design', args=request.args(0), anchor=request.vars.id2))
-    return dict(dialog=dialog,plugin=plugin)
+    return dict(dialog=dialog, plugin=plugin)
+
 
 def plugin():
     """ Application design handler """
@@ -1032,7 +1085,7 @@ def plugin():
 
     # Get all models
     models = listdir(apath('%s/models/' % app, r=request), '.*\.py$')
-    models=[x.replace('\\','/') for x in models]
+    models = [x.replace('\\', '/') for x in models]
     defines = {}
     for m in models:
         data = safe_read(apath('%s/models/%s' % (app, m), r=request))
@@ -1040,8 +1093,9 @@ def plugin():
         defines[m].sort()
 
     # Get all controllers
-    controllers = sorted(listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
-    controllers = [x.replace('\\','/') for x in controllers]
+    controllers = sorted(
+        listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
+    controllers = [x.replace('\\', '/') for x in controllers]
     functions = {}
     for c in controllers:
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
@@ -1049,8 +1103,9 @@ def plugin():
         functions[c] = items
 
     # Get all views
-    views = sorted(listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$'))
-    views = [x.replace('\\','/') for x in views]
+    views = sorted(
+        listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$'))
+    views = [x.replace('\\', '/') for x in views]
     extend = {}
     include = {}
     for c in views:
@@ -1064,23 +1119,23 @@ def plugin():
 
     # Get all modules
     modules = listdir(apath('%s/modules/' % app, r=request), '.*\.py$')
-    modules = modules=[x.replace('\\','/') for x in modules]
+    modules = modules = [x.replace('\\', '/') for x in modules]
     modules.sort()
 
     # Get all private files
     privates = listdir(apath('%s/private/' % app, r=request), '[^\.#].*')
-    privates = [x.replace('\\','/') for x in privates]
+    privates = [x.replace('\\', '/') for x in privates]
     privates.sort()
 
     # Get all static files
     statics = listdir(apath('%s/static/' % app, r=request), '[^\.#].*')
-    statics = [x.replace('\\','/') for x in statics]
+    statics = [x.replace('\\', '/') for x in statics]
     statics.sort()
 
     # Get all languages
-    languages = sorted([lang+'.py' for lang, info in
-                    T.get_possible_languages_info().iteritems()
-                    if info[2]!=0]) # info[2] is langfile_mtime:
+    languages = sorted([lang + '.py' for lang, info in
+                        T.get_possible_languages_info().iteritems()
+                        if info[2] != 0])  # info[2] is langfile_mtime:
                                     # get only existed files
 
     #Get crontab
@@ -1089,7 +1144,7 @@ def plugin():
         safe_write(crontab, '#crontab')
 
     def filter_plugins(items):
-        regex=re.compile('^plugin_'+plugin+'(/.*|\..*)?$')
+        regex = re.compile('^plugin_' + plugin + '(/.*|\..*)?$')
         return [item for item in items if item and regex.match(item)]
 
     return dict(app=app,
@@ -1109,10 +1164,10 @@ def plugin():
 
 def create_file():
     """ Create files handler """
-    if request.vars and not request.vars.token==session.token:
+    if request.vars and not request.vars.token == session.token:
         redirect(URL('logout'))
     try:
-        anchor='#'+request.vars.id if request.vars.id else ''
+        anchor = '#' + request.vars.id if request.vars.id else ''
         if request.vars.app:
             app = get_app(request.vars.app)
             path = abspath(request.vars.location)
@@ -1126,7 +1181,7 @@ def create_file():
                 raise SyntaxError
             if not filename[-3:] == '.py':
                 filename += '.py'
-            lang = re.match('^plural_rules-(.*)\.py$',filename).group(1)
+            lang = re.match('^plural_rules-(.*)\.py$', filename).group(1)
             langinfo = read_possible_languages(apath(app, r=request))[lang]
             text = dedent("""
                    #!/usr/bin/env python
@@ -1154,14 +1209,14 @@ def create_file():
                 raise SyntaxError
             if not filename[-3:] == '.py':
                 filename += '.py'
-            path=os.path.join(apath(app, r=request),'languages',filename)
+            path = os.path.join(apath(app, r=request), 'languages', filename)
             if not os.path.exists(path):
                 safe_write(path, '')
             # create language xx[-yy].py file:
             findT(apath(app, r=request), filename[:-3])
             session.flash = T('language file "%(filename)s" created/updated',
-                               dict(filename=filename))
-            redirect(request.vars.sender+anchor)
+                              dict(filename=filename))
+            redirect(request.vars.sender + anchor)
 
         elif path[-8:] == '/models/':
             # Handle python models
@@ -1188,21 +1243,22 @@ def create_file():
             if request.vars.plugin and not filename.startswith('plugin_%s/' % request.vars.plugin):
                 filename = 'plugin_%s/%s' % (request.vars.plugin, filename)
             # Handle template (html) views
-            if filename.find('.')<0:
+            if filename.find('.') < 0:
                 filename += '.html'
             extension = filename.split('.')[-1].lower()
 
             if len(filename) == 5:
                 raise SyntaxError
 
-            msg = T('This is the %(filename)s template', dict(filename=filename))
+            msg = T(
+                'This is the %(filename)s template', dict(filename=filename))
             if extension == 'html':
                 text = dedent("""
                    {{extend 'layout.html'}}
                    <h1>%s</h1>
                    {{=BEAUTIFY(response._vars)}}""" % msg)[1:]
             else:
-                generic = os.path.join(path,'generic.'+extension)
+                generic = os.path.join(path, 'generic.' + extension)
                 if os.path.exists(generic):
                     text = read_file(generic)
                 else:
@@ -1229,7 +1285,7 @@ def create_file():
             text = ''
 
         else:
-            redirect(request.vars.sender+anchor)
+            redirect(request.vars.sender + anchor)
 
         full_filename = os.path.join(path, filename)
         dirpath = os.path.dirname(full_filename)
@@ -1241,24 +1297,26 @@ def create_file():
             raise SyntaxError
 
         safe_write(full_filename, text)
-        log_progress(app,'CREATE',filename)
+        log_progress(app, 'CREATE', filename)
         session.flash = T('file "%(filename)s" created',
                           dict(filename=full_filename[len(path):]))
-        vars={}
-        if request.vars.id: vars['id']=request.vars.id
-        if request.vars.app: vars['app']=request.vars.app
+        vars = {}
+        if request.vars.id:
+            vars['id'] = request.vars.id
+        if request.vars.app:
+            vars['app'] = request.vars.app
         redirect(URL('edit',
                  args=[os.path.join(request.vars.location, filename)], vars=vars))
     except Exception, e:
-        if not isinstance(e,HTTP):
+        if not isinstance(e, HTTP):
             session.flash = T('cannot create file')
 
-    redirect(request.vars.sender+anchor)
+    redirect(request.vars.sender + anchor)
 
 
 def upload_file():
     """ File uploading handler """
-    if request.vars and not request.vars.token==session.token:
+    if request.vars and not request.vars.token == session.token:
         redirect(URL('logout'))
     try:
         filename = None
@@ -1294,14 +1352,14 @@ def upload_file():
         data = request.vars.file.file.read()
         lineno = count_lines(data)
         safe_write(filename, data, 'wb')
-        log_progress(app,'UPLOAD',filename,lineno)
+        log_progress(app, 'UPLOAD', filename, lineno)
         session.flash = T('file "%(filename)s" uploaded',
                           dict(filename=filename[len(path):]))
     except Exception:
         if filename:
-            d = dict(filename = filename[len(path):])
+            d = dict(filename=filename[len(path):])
         else:
-            d = dict(filename = 'unkown')
+            d = dict(filename='unkown')
         session.flash = T('cannot upload file "%(filename)s"', d)
 
     redirect(request.vars.sender)
@@ -1319,7 +1377,8 @@ def errors():
     method = request.args(1) or 'new'
     db_ready = {}
     db_ready['status'] = get_ticket_storage(app)
-    db_ready['errmessage'] = T("No ticket_storage.txt found under /private folder")
+    db_ready['errmessage'] = T(
+        "No ticket_storage.txt found under /private folder")
     db_ready['errlink'] = "http://web2py.com/books/default/chapter/29/13#Collecting-tickets"
 
     if method == 'new':
@@ -1334,7 +1393,8 @@ def errors():
 
         for fn in listdir(errors_path, '^[a-fA-F0-9.\-]+$'):
             fullpath = os.path.join(errors_path, fn)
-            if not os.path.isfile(fullpath): continue
+            if not os.path.isfile(fullpath):
+                continue
             try:
                 fullpath_file = open(fullpath, 'r')
                 try:
@@ -1360,13 +1420,12 @@ def errors():
                     hash2error[hash] = dict(count=1, pickel=error,
                                             causer=error_causer,
                                             last_line=last_line,
-                                            hash=hash,ticket=fn)
+                                            hash=hash, ticket=fn)
 
         decorated = [(x['count'], x) for x in hash2error.values()]
         decorated.sort(key=operator.itemgetter(0), reverse=True)
 
-        return dict(errors = [x[1] for x in decorated], app=app, method=method, db_ready=db_ready)
-
+        return dict(errors=[x[1] for x in decorated], app=app, method=method, db_ready=db_ready)
 
     elif method == 'dbnew':
         errors_path = apath('%s/errors' % app, r=request)
@@ -1379,7 +1438,7 @@ def errors():
 
         hash2error = dict()
 
-        for fn in tk_db(tk_table.id>0).select():
+        for fn in tk_db(tk_table.id > 0).select():
             try:
                 error = pickle.loads(fn.ticket_data)
             except AttributeError:
@@ -1401,13 +1460,13 @@ def errors():
                     hash2error[hash] = dict(count=1, pickel=error,
                                             causer=error_causer,
                                             last_line=last_line,
-                                            hash=hash,ticket=fn.ticket_id)
+                                            hash=hash, ticket=fn.ticket_id)
 
         decorated = [(x['count'], x) for x in hash2error.values()]
 
         decorated.sort(key=operator.itemgetter(0), reverse=True)
 
-        return dict(errors = [x[1] for x in decorated], app=app, method=method)
+        return dict(errors=[x[1] for x in decorated], app=app, method=method)
 
     elif method == 'dbold':
         tk_db, tk_table = get_ticket_storage(app)
@@ -1415,9 +1474,10 @@ def errors():
             if item[:7] == 'delete_':
                 tk_db(tk_table.ticket_id == item[7:]).delete()
                 tk_db.commit()
-        tickets_ = tk_db(tk_table.id>0).select(tk_table.ticket_id, tk_table.created_datetime, orderby=~tk_table.created_datetime)
+        tickets_ = tk_db(tk_table.id > 0).select(tk_table.ticket_id, tk_table.created_datetime, orderby=~tk_table.created_datetime)
         tickets = [row.ticket_id for row in tickets_]
-        times = dict([(row.ticket_id, row.created_datetime) for row in tickets_])
+        times = dict(
+            [(row.ticket_id, row.created_datetime) for row in tickets_])
 
         return dict(app=app, tickets=tickets, method=method, times=times)
 
@@ -1425,20 +1485,22 @@ def errors():
         for item in request.vars:
             if item[:7] == 'delete_':
                 os.unlink(apath('%s/errors/%s' % (app, item[7:]), r=request))
-        func = lambda p: os.stat(apath('%s/errors/%s' % \
-                                           (app, p), r=request)).st_mtime
-        tickets = sorted(listdir(apath('%s/errors/' % app, r=request), '^\w.*'),
-                         key=func,
-                         reverse=True)
+        func = lambda p: os.stat(apath('%s/errors/%s' %
+                                       (app, p), r=request)).st_mtime
+        tickets = sorted(
+            listdir(apath('%s/errors/' % app, r=request), '^\w.*'),
+            key=func,
+            reverse=True)
 
         return dict(app=app, tickets=tickets, method=method, db_ready=db_ready)
 
+
 def get_ticket_storage(app):
     private_folder = apath('%s/private' % app, r=request)
     ticket_file = os.path.join(private_folder, 'ticket_storage.txt')
     if os.path.exists(ticket_file):
         db_string = open(ticket_file).read()
-        db_string = db_string.strip().replace('\r','').replace('\n','')
+        db_string = db_string.strip().replace('\r', '').replace('\n', '')
     else:
         return False
     tickets_table = 'web2py_ticket'
@@ -1447,12 +1509,13 @@ def get_ticket_storage(app):
     ticketsdb = DAL(db_string, folder=db_path, auto_import=True)
     if not ticketsdb.get(tablename):
         table = ticketsdb.define_table(
-                tablename,
-                Field('ticket_id', length=100),
-                Field('ticket_data', 'text'),
-                Field('created_datetime', 'datetime'),
-                )
-    return ticketsdb , ticketsdb.get(tablename)
+            tablename,
+            Field('ticket_id', length=100),
+            Field('ticket_data', 'text'),
+            Field('created_datetime', 'datetime'),
+        )
+    return ticketsdb, ticketsdb.get(tablename)
+
 
 def make_link(path):
     """ Create a link from a path """
@@ -1465,7 +1528,7 @@ def make_link(path):
 
         editable = {'controllers': '.py', 'models': '.py', 'views': '.html'}
         for key in editable.keys():
-            check_extension = folder.endswith("%s/%s" % (app,key))
+            check_extension = folder.endswith("%s/%s" % (app, key))
             if ext.lower() == editable[key] and check_extension:
                 return A('"' + tryFile + '"',
                          _href=URL(r=request,
@@ -1536,6 +1599,7 @@ def ticket():
                 layer=e.layer,
                 myversion=myversion)
 
+
 def ticketdb():
     """ Ticket handler """
 
@@ -1559,17 +1623,19 @@ def ticketdb():
                 layer=e.layer,
                 myversion=myversion)
 
+
 def error():
     """ Generate a ticket (for testing) """
     raise RuntimeError('admin ticket generator at your service')
 
+
 def update_languages():
     """ Update available languages """
 
     app = get_app()
     update_all_languages(apath(app, r=request))
     session.flash = T('Language files (static strings) updated')
-    redirect(URL('design',args=app,anchor='languages'))
+    redirect(URL('design', args=app, anchor='languages'))
 
 
 def twitter():
@@ -1585,11 +1651,11 @@ def twitter():
             for e in data:
                 d[e["id"]] = e
             r = reversed(sorted(d))
-            return dict(tweets = [d[k] for k in r])
+            return dict(tweets=[d[k] for k in r])
         else:
             return 'disabled'
     except Exception, e:
-        return DIV(T('Unable to download because:'),BR(),str(e))
+        return DIV(T('Unable to download because:'), BR(), str(e))
 
 
 def user():
@@ -1600,12 +1666,14 @@ def user():
     else:
         return dict(form=T("Disabled"))
 
+
 def reload_routes():
     """ Reload routes.py """
     import gluon.rewrite
     gluon.rewrite.load()
     redirect(URL('site'))
 
+
 def manage_students():
     if not (MULTI_USER_MODE and is_manager()):
         session.flash = T('Not Authorized')
@@ -1614,18 +1682,19 @@ def manage_students():
     grid = SQLFORM.grid(db.auth_user)
     return locals()
 
+
 def bulk_register():
     if not (MULTI_USER_MODE and is_manager()):
         session.flash = T('Not Authorized')
         redirect(URL('site'))
-    form = SQLFORM.factory(Field('emails','text'))
+    form = SQLFORM.factory(Field('emails', 'text'))
     if form.process().accepted:
         emails = [x.strip() for x in form.vars.emails.split('\n') if x.strip()]
         n = 0
         for email in emails:
             if not db.auth_user(email=email):
-                n += db.auth_user.insert(email = email) and 1 or 0
-        session.flash = T('%s students registered',n)
+                n += db.auth_user.insert(email=email) and 1 or 0
+        session.flash = T('%s students registered', n)
         redirect(URL('site'))
     return locals()
 
@@ -1634,6 +1703,7 @@ def bulk_register():
 # 2) should not prompt user at console
 # 3) should give option to force commit and not reuqire manual merge
 
+
 def git_pull():
     """ Git Pull handler """
     app = get_app()
@@ -1641,10 +1711,10 @@ def git_pull():
         session.flash = GIT_MISSING
         redirect(URL('site'))
     dialog = FORM.confirm(T('Pull'),
-                         {T('Cancel'):URL('site')})
+                          {T('Cancel'): URL('site')})
     if dialog.accepted:
         try:
-            repo = Repo(os.path.join(apath(r=request),app))
+            repo = Repo(os.path.join(apath(r=request), app))
             origin = repo.remotes.origin
             origin.fetch()
             origin.pull()
@@ -1660,14 +1730,16 @@ def git_pull():
             session.flash = T("Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.")
             redirect(URL('site'))
         except GitCommandError, status:
-            session.flash = T("Pull failed, git exited abnormally. See logs for details.")
+            session.flash = T(
+                "Pull failed, git exited abnormally. See logs for details.")
             redirect(URL('site'))
-        except Exception,e:
-            session.flash = T("Pull failed, git exited abnormally. See logs for details.")
+        except Exception, e:
+            session.flash = T(
+                "Pull failed, git exited abnormally. See logs for details.")
             redirect(URL('site'))
     elif 'cancel' in request.vars:
         redirect(URL('site'))
-    return dict(app=app,dialog=dialog)
+    return dict(app=app, dialog=dialog)
 
 
 def git_push():
@@ -1676,24 +1748,26 @@ def git_push():
     if not have_git:
         session.flash = GIT_MISSING
         redirect(URL('site'))
-    form = SQLFORM.factory(Field('changelog',requires=IS_NOT_EMPTY()))
-    form.element('input[type=submit]')['_value']=T('Push')
-    form.add_button(T('Cancel'),URL('site'))
+    form = SQLFORM.factory(Field('changelog', requires=IS_NOT_EMPTY()))
+    form.element('input[type=submit]')['_value'] = T('Push')
+    form.add_button(T('Cancel'), URL('site'))
     form.process()
     if form.accepted:
         try:
-            repo = Repo(os.path.join(apath(r=request),app))
+            repo = Repo(os.path.join(apath(r=request), app))
             index = repo.index
-            index.add([apath(r=request)+app+'/*'])
+            index.add([apath(r=request) + app + '/*'])
             new_commit = index.commit(form.vars.changelog)
             origin = repo.remotes.origin
             origin.push()
-            session.flash = T("Git repo updated with latest application changes.")
+            session.flash = T(
+                "Git repo updated with latest application changes.")
             redirect(URL('site'))
         except UnmergedEntriesError:
             session.flash = T("Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.")
             redirect(URL('site'))
         except Exception, e:
-            session.flash = T("Push failed, git exited abnormally. See logs for details.")
+            session.flash = T(
+                "Push failed, git exited abnormally. See logs for details.")
             redirect(URL('site'))
-    return dict(app=app,form=form)
+    return dict(app=app, form=form)
diff --git a/applications/admin/controllers/gae.py b/applications/admin/controllers/gae.py
index 2047a3e7..ddb13e0a 100644
--- a/applications/admin/controllers/gae.py
+++ b/applications/admin/controllers/gae.py
@@ -9,83 +9,92 @@ try:
     import shutil
     from gluon.fileutils import read_file, write_file
 except:
-    session.flash='sorry, only on Unix systems'
-    redirect(URL(request.application,'default','site'))
+    session.flash = 'sorry, only on Unix systems'
+    redirect(URL(request.application, 'default', 'site'))
 
 if MULTI_USER_MODE and not is_manager():
     session.flash = 'Not Authorized'
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+forever = 10 ** 8
 
-forever=10**8
 
 def kill():
-    p = cache.ram('gae_upload',lambda:None,forever)
-    if not p or p.poll()!=None:
+    p = cache.ram('gae_upload', lambda: None, forever)
+    if not p or p.poll() is not None:
         return 'oops'
     os.kill(p.pid, signal.SIGKILL)
-    cache.ram('gae_upload',lambda:None,-1)
+    cache.ram('gae_upload', lambda: None, -1)
+
 
 class EXISTS(object):
     def __init__(self, error_message='file not found'):
         self.error_message = error_message
+
     def __call__(self, value):
         if os.path.exists(value):
-            return (value,None)
-        return (value,self.error_message)
+            return (value, None)
+        return (value, self.error_message)
+
 
 def deploy():
     regex = re.compile('^\w+$')
-    apps = sorted(file for file in os.listdir(apath(r=request)) if regex.match(file))
+    apps = sorted(
+        file for file in os.listdir(apath(r=request)) if regex.match(file))
     form = SQLFORM.factory(
-        Field('appcfg',default=GAE_APPCFG,label=T('Path to appcfg.py'),
+        Field('appcfg', default=GAE_APPCFG, label=T('Path to appcfg.py'),
               requires=EXISTS(error_message=T('file not found'))),
-        Field('google_application_id',requires=IS_MATCH('[\w\-]+'),label=T('Google Application Id')),
-        Field('applications','list:string',
-              requires=IS_IN_SET(apps,multiple=True),
+        Field('google_application_id', requires=IS_MATCH(
+            '[\w\-]+'), label=T('Google Application Id')),
+        Field('applications', 'list:string',
+              requires=IS_IN_SET(apps, multiple=True),
               label=T('web2py apps to deploy')),
-        Field('email',requires=IS_EMAIL(),label=T('GAE Email')),
-        Field('password','password',requires=IS_NOT_EMPTY(),label=T('GAE Password')))
-    cmd = output = errors= ""
-    if form.accepts(request,session):
+        Field('email', requires=IS_EMAIL(), label=T('GAE Email')),
+        Field('password', 'password', requires=IS_NOT_EMPTY(), label=T('GAE Password')))
+    cmd = output = errors = ""
+    if form.accepts(request, session):
         try:
             kill()
         except:
             pass
-        ignore_apps = [item for item in apps \
-                           if not item in form.vars.applications]
+        ignore_apps = [item for item in apps
+                       if not item in form.vars.applications]
         regex = re.compile('\(applications/\(.*')
         yaml = apath('../app.yaml', r=request)
         if not os.path.exists(yaml):
             example = apath('../app.example.yaml', r=request)
-            shutil.copyfile(example,yaml)
+            shutil.copyfile(example, yaml)
         data = read_file(yaml)
-        data = re.sub('application:.*','application: %s' % form.vars.google_application_id,data)
-        data = regex.sub('(applications/(%s)/.*)|' % '|'.join(ignore_apps),data)
+        data = re.sub('application:.*', 'application: %s' %
+                      form.vars.google_application_id, data)
+        data = regex.sub(
+            '(applications/(%s)/.*)|' % '|'.join(ignore_apps), data)
         write_file(yaml, data)
 
         path = request.env.applications_parent
         cmd = '%s --email=%s --passin update %s' % \
             (form.vars.appcfg, form.vars.email, path)
         p = cache.ram('gae_upload',
-                      lambda s=subprocess,c=cmd:s.Popen(c, shell=True,
-                                                        stdin=s.PIPE,
-                                                        stdout=s.PIPE,
-                                                        stderr=s.PIPE, close_fds=True),-1)
-        p.stdin.write(form.vars.password+'\n')
+                      lambda s=subprocess, c=cmd: s.Popen(c, shell=True,
+                                                          stdin=s.PIPE,
+                                                          stdout=s.PIPE,
+                                                          stderr=s.PIPE, close_fds=True), -1)
+        p.stdin.write(form.vars.password + '\n')
         fcntl.fcntl(p.stdout.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
         fcntl.fcntl(p.stderr.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
-    return dict(form=form,command=cmd)
+    return dict(form=form, command=cmd)
+
 
 def callback():
-    p = cache.ram('gae_upload',lambda:None,forever)
-    if not p or p.poll()!=None:
+    p = cache.ram('gae_upload', lambda: None, forever)
+    if not p or p.poll() is not None:
         return '<done/>'
     try:
         output = p.stdout.read()
     except:
-        output=''
+        output = ''
     try:
         errors = p.stderr.read()
     except:
-        errors=''
-    return (output+errors).replace('\n','<br/>')
+        errors = ''
+    return (output + errors).replace('\n', '<br/>')
diff --git a/applications/admin/controllers/mercurial.py b/applications/admin/controllers/mercurial.py
index 34e0516b..dd70a85e 100644
--- a/applications/admin/controllers/mercurial.py
+++ b/applications/admin/controllers/mercurial.py
@@ -2,10 +2,10 @@ from gluon.fileutils import read_file, write_file
 
 if DEMO_MODE or MULTI_USER_MODE:
     session.flash = T('disabled in demo mode')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
 if not have_mercurial:
-    session.flash=T("Sorry, could not find mercurial installed")
-    redirect(URL('default','design',args=request.args(0)))
+    session.flash = T("Sorry, could not find mercurial installed")
+    redirect(URL('default', 'design', args=request.args(0)))
 
 _hgignore_content = """\
 syntax: glob
@@ -22,6 +22,7 @@ sessions/*
 errors/*
 """
 
+
 def hg_repo(path):
     import os
     uio = ui.ui()
@@ -37,13 +38,14 @@ def hg_repo(path):
         write_file(hgignore, _hgignore_content)
     return repo
 
+
 def commit():
     app = request.args(0)
     path = apath(app, r=request)
     repo = hg_repo(path)
-    form = FORM('Comment:',INPUT(_name='comment',requires=IS_NOT_EMPTY()),
-                INPUT(_type='submit',_value=T('Commit')))
-    if form.accepts(request.vars,session):
+    form = FORM('Comment:', INPUT(_name='comment', requires=IS_NOT_EMPTY()),
+                INPUT(_type='submit', _value=T('Commit')))
+    if form.accepts(request.vars, session):
         oldid = repo[repo.lookup('.')]
         addremove(repo)
         repo.commit(text=form.vars.comment)
@@ -51,32 +53,33 @@ def commit():
             response.flash = 'no changes'
     try:
         files = TABLE(*[TR(file) for file in repo[repo.lookup('.')].files()])
-        changes = TABLE(TR(TH('revision'),TH('description')))
+        changes = TABLE(TR(TH('revision'), TH('description')))
         for change in repo.changelog:
-            ctx=repo.changectx(change)
+            ctx = repo.changectx(change)
             revision, description = ctx.rev(), ctx.description()
-            changes.append(TR(A(revision,_href=URL('revision',
-                                                   args=(app,revision))),
+            changes.append(TR(A(revision, _href=URL('revision',
+                                                    args=(app, revision))),
                               description))
     except:
         files = []
         changes = []
-    return dict(form=form,files=files,changes=changes,repo=repo)
+    return dict(form=form, files=files, changes=changes, repo=repo)
+
 
 def revision():
     app = request.args(0)
     path = apath(app, r=request)
     repo = hg_repo(path)
     revision = request.args(1)
-    ctx=repo.changectx(revision)
-    form=FORM(INPUT(_type='submit',_value=T('Revert')))
+    ctx = repo.changectx(revision)
+    form = FORM(INPUT(_type='submit', _value=T('Revert')))
     if form.accepts(request.vars):
         hg.update(repo, revision)
         session.flash = "reverted to revision %s" % ctx.rev()
-        redirect(URL('default','design',args=app))
+        redirect(URL('default', 'design', args=app))
     return dict(
         files=ctx.files(),
         rev=str(ctx.rev()),
         desc=ctx.description(),
         form=form
-        )
+    )
diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py
index df9e6d8b..e42b61fc 100644
--- a/applications/admin/controllers/openshift.py
+++ b/applications/admin/controllers/openshift.py
@@ -3,31 +3,34 @@ try:
     from distutils import dir_util
 except ImportError:
     session.flash = T('requires distutils, but not installed')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
 try:
     from git import *
 except ImportError:
     session.flash = T('requires python-git, but not installed')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
 
 def deploy():
     apps = sorted(file for file in os.listdir(apath(r=request)))
     form = SQLFORM.factory(
-        Field('osrepo',default='/tmp',label=T('Path to local openshift repo root.'),
-              requires=EXISTS(error_message=T('directory not found'))),
-        Field('osname',default='web2py',label=T('WSGI reference name')),
-        Field('applications','list:string',
-              requires=IS_IN_SET(apps,multiple=True),
+        Field(
+            'osrepo', default='/tmp', label=T('Path to local openshift repo root.'),
+            requires=EXISTS(error_message=T('directory not found'))),
+        Field('osname', default='web2py', label=T('WSGI reference name')),
+        Field('applications', 'list:string',
+              requires=IS_IN_SET(apps, multiple=True),
               label=T('web2py apps to deploy')))
 
-    cmd = output = errors= ""
-    if form.accepts(request,session):
+    cmd = output = errors = ""
+    if form.accepts(request, session):
         try:
             kill()
         except:
             pass
 
-        ignore_apps = [item for item in apps if not item in form.vars.applications]
+        ignore_apps = [
+            item for item in apps if not item in form.vars.applications]
         regex = re.compile('\(applications/\(.*')
         w2p_origin = os.getcwd()
         osrepo = form.vars.osrepo
@@ -38,23 +41,25 @@ def deploy():
         assert repo.bare == False
 
         for i in form.vars.applications:
-            appsrc = os.path.join(apath(r=request),i)
-            appdest = os.path.join(osrepo,'wsgi',osname,'applications',i)
-            dir_util.copy_tree(appsrc,appdest)
+            appsrc = os.path.join(apath(r=request), i)
+            appdest = os.path.join(osrepo, 'wsgi', osname, 'applications', i)
+            dir_util.copy_tree(appsrc, appdest)
             #shutil.copytree(appsrc,appdest)
-            index.add(['wsgi/'+osname+'/applications/'+i])
+            index.add(['wsgi/' + osname + '/applications/' + i])
             new_commit = index.commit("Deploy from Web2py IDE")
 
         origin = repo.remotes.origin
         origin.push
         origin.push()
         #Git code ends here
-    return dict(form=form,command=cmd)
+    return dict(form=form, command=cmd)
+
 
 class EXISTS(object):
     def __init__(self, error_message='file not found'):
         self.error_message = error_message
+
     def __call__(self, value):
         if os.path.exists(value):
-            return (value,None)
-        return (value,self.error_message)
+            return (value, None)
+        return (value, self.error_message)
diff --git a/applications/admin/controllers/plugin_jqmobile.py b/applications/admin/controllers/plugin_jqmobile.py
index b9265a63..18fc67d7 100644
--- a/applications/admin/controllers/plugin_jqmobile.py
+++ b/applications/admin/controllers/plugin_jqmobile.py
@@ -1,8 +1,10 @@
-response.files=response.files[:3]
-response.menu=[]
+response.files = response.files[:3]
+response.menu = []
+
 
 def index():
     return locals()
 
+
 def about():
     return locals()
diff --git a/applications/admin/controllers/shell.py b/applications/admin/controllers/shell.py
index 561e06eb..1abc0f72 100644
--- a/applications/admin/controllers/shell.py
+++ b/applications/admin/controllers/shell.py
@@ -1,25 +1,29 @@
 import sys
 import cStringIO
 import gluon.contrib.shell
-import code, thread
+import code
+import thread
 from gluon.shell import env
 
 if DEMO_MODE or MULTI_USER_MODE:
     session.flash = T('disabled in demo mode')
-    redirect(URL('default','site'))
+    redirect(URL('default', 'site'))
+
+FE = 10 ** 9
 
-FE=10**9
 
 def index():
     app = request.args(0) or 'admin'
     reset()
     return dict(app=app)
 
+
 def callback():
     app = request.args[0]
     command = request.vars.statement
-    escape = command[:1]!='!'
-    history = session['history:'+app] = session.get('history:'+app,gluon.contrib.shell.History())
+    escape = command[:1] != '!'
+    history = session['history:' + app] = session.get(
+        'history:' + app, gluon.contrib.shell.History())
     if not escape:
         command = command[1:]
     if command == '%reset':
@@ -27,19 +31,20 @@ def callback():
         return '*** reset ***'
     elif command[0] == '%':
         try:
-            command=session['commands:'+app][int(command[1:])]
+            command = session['commands:' + app][int(command[1:])]
         except ValueError:
             return ''
-    session['commands:'+app].append(command)
-    environ=env(app,True)
-    output = gluon.contrib.shell.run(history,command,environ)
-    k = len(session['commands:'+app]) - 1
+    session['commands:' + app].append(command)
+    environ = env(app, True)
+    output = gluon.contrib.shell.run(history, command, environ)
+    k = len(session['commands:' + app]) - 1
     #output = PRE(output)
     #return TABLE(TR('In[%i]:'%k,PRE(command)),TR('Out[%i]:'%k,output))
     return 'In [%i] : %s%s\n' % (k + 1, command, output)
 
+
 def reset():
     app = request.args(0) or 'admin'
-    session['commands:'+app] = []
-    session['history:'+app] = gluon.contrib.shell.History()
+    session['commands:' + app] = []
+    session['history:' + app] = gluon.contrib.shell.History()
     return 'done'
diff --git a/applications/admin/controllers/toolbar.py b/applications/admin/controllers/toolbar.py
index 9e0294a3..83a25f83 100644
--- a/applications/admin/controllers/toolbar.py
+++ b/applications/admin/controllers/toolbar.py
@@ -2,10 +2,12 @@ import os
 from gluon.settings import global_settings, read_file
 #
 
+
 def index():
     app = request.args(0)
     return dict(app=app)
 
+
 def profiler():
     """
     to use the profiler start web2py with -F profiler.log
@@ -19,11 +21,11 @@ def profiler():
         else:
             size = 0
         if os.path.exists(filename):
-            data = read_file('profiler.log','rb')
-            if size<len(data):
+            data = read_file('profiler.log', 'rb')
+            if size < len(data):
                 data = data[size:]
             else:
-                size=0
+                size = 0
             size += len(data)
             response.cookies[KEY] = size
     return data
diff --git a/applications/admin/controllers/webservices.py b/applications/admin/controllers/webservices.py
index 7f38c7f8..a043aab5 100644
--- a/applications/admin/controllers/webservices.py
+++ b/applications/admin/controllers/webservices.py
@@ -33,7 +33,7 @@ def list_apps():
 @service.jsonrpc
 def list_files(app, pattern='.*\.py$'):
     files = listdir(apath('%s/' % app, r=request), pattern)
-    return [x.replace('\\','/') for x in files]
+    return [x.replace('\\', '/') for x in files]
 
 
 @service.jsonrpc
@@ -43,7 +43,7 @@ def read_file(filename, b64=False):
     try:
         data = f.read()
         if not b64:
-            data = data.replace('\r','')
+            data = data.replace('\r', '')
         else:
             data = base64.b64encode(data)
     finally:
@@ -82,6 +82,7 @@ def install(app_name, filename, data, overwrite=True):
 
     return installed
 
+
 @service.jsonrpc
 def attach_debugger(host='localhost', port=6000, authkey='secret password'):
     import gluon.contrib.qdb as qdb
@@ -124,6 +125,7 @@ def detach_debugger():
     gluon.debug.qdb_debugger = None
     return True
 
+
 def call():
     session.forget()
     return service()
diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py
index e8b3ac8c..974a2c88 100644
--- a/applications/admin/controllers/wizard.py
+++ b/applications/admin/controllers/wizard.py
@@ -1,64 +1,73 @@
 # -*- coding: utf-8 -*-
 
-import os, uuid, re, pickle, urllib, glob
+import os
+import uuid
+import re
+import pickle
+import urllib
+import glob
 from gluon.admin import app_create, plugin_install
 from gluon.fileutils import abspath, read_file, write_file
 
-def reset(session):
-    session.app={
-        'name':'',
-        'params':[('title','My New App'),
-                  ('subtitle','powered by web2py'),
-                  ('author','you'),
-                  ('author_email','you@example.com'),
-                  ('keywords',''),
-                  ('description',''),
-                  ('layout_theme','Default'),
-                  ('database_uri','sqlite://storage.sqlite'),
-                  ('security_key',str(uuid.uuid4())),
-                  ('email_server','localhost'),
-                  ('email_sender','you@example.com'),
-                  ('email_login',''),
-                  ('login_method','local'),
-                  ('login_config',''),
-                  ('plugins',[])],
-        'tables':['auth_user'],
-        'table_auth_user':['username','first_name',
-                           'last_name','email','password'],
-        'pages':['index','error'],
-        'page_index':'# Welcome to my new app',
-        'page_error':'# Error: the document does not exist',
-        }
 
-if not session.app: reset(session)
+def reset(session):
+    session.app = {
+        'name': '',
+        'params': [('title', 'My New App'),
+                   ('subtitle', 'powered by web2py'),
+                   ('author', 'you'),
+                   ('author_email', 'you@example.com'),
+                   ('keywords', ''),
+                   ('description', ''),
+                   ('layout_theme', 'Default'),
+                   ('database_uri', 'sqlite://storage.sqlite'),
+                   ('security_key', str(uuid.uuid4())),
+                   ('email_server', 'localhost'),
+                   ('email_sender', 'you@example.com'),
+                   ('email_login', ''),
+                   ('login_method', 'local'),
+                   ('login_config', ''),
+                   ('plugins', [])],
+        'tables': ['auth_user'],
+        'table_auth_user': ['username', 'first_name',
+                            'last_name', 'email', 'password'],
+        'pages': ['index', 'error'],
+        'page_index': '# Welcome to my new app',
+        'page_error': '# Error: the document does not exist',
+    }
+
+if not session.app:
+    reset(session)
+
 
 def listify(x):
-    if not isinstance(x,(list,tuple)):
+    if not isinstance(x, (list, tuple)):
         return x and [x] or []
     return x
 
+
 def clean(name):
-    return re.sub('\W+','_',name.strip().lower())
+    return re.sub('\W+', '_', name.strip().lower())
+
 
 def index():
-    response.view='wizard/step.html'
+    response.view = 'wizard/step.html'
     reset(session)
-    apps=os.listdir(os.path.join(request.folder,'..'))
-    form=SQLFORM.factory(Field('name',requires=[IS_NOT_EMPTY(),
-                                                IS_ALPHANUMERIC()]))
+    apps = os.listdir(os.path.join(request.folder, '..'))
+    form = SQLFORM.factory(Field('name', requires=[IS_NOT_EMPTY(),
+                                                   IS_ALPHANUMERIC()]))
     if form.accepts(request.vars):
         app = form.vars.name
         session.app['name'] = app
-        if MULTI_USER_MODE and db(db.app.name==app)\
-                (db.app.owner!=auth.user.id).count():
+        if MULTI_USER_MODE and db(db.app.name == app)(db.app.owner != auth.user.id).count():
             session.flash = 'App belongs already to other user'
         elif app in apps:
-            meta = os.path.normpath(\
+            meta = os.path.normpath(
                 os.path.join(os.path.normpath(request.folder),
-                             '..',app,'wizard.metadata'))
+                             '..', app, 'wizard.metadata'))
             if os.path.exists(meta):
                 try:
-                    metafile = open(meta,'rb')
+                    metafile = open(meta, 'rb')
                     try:
                         session.app = pickle.load(metafile)
                     finally:
@@ -67,14 +76,14 @@ def index():
                 except:
                     session.flash = T("The app exists, was NOT created by wizard, continue to overwrite!")
         redirect(URL('step1'))
-    return dict(step='Start',form=form)
+    return dict(step='Start', form=form)
 
 
 def step1():
     from gluon.contrib.simplejson import loads
     import urllib
     if not session.themes:
-        url=LAYOUTS_APP+'/default/layouts.json'
+        url = LAYOUTS_APP + '/default/layouts.json'
         try:
             data = urllib.urlopen(url).read()
             session.themes = ['Default'] + loads(data)['layouts']
@@ -82,145 +91,158 @@ def step1():
             session.themes = ['Default']
     themes = session.themes
     if not session.plugins:
-        url = PLUGINS_APP+'/default/plugins.json'
+        url = PLUGINS_APP + '/default/plugins.json'
         try:
             data = urllib.urlopen(url).read()
             session.plugins = loads(data)['plugins']
         except:
             session.plugins = []
     plugins = [x.split('.')[2] for x in session.plugins]
-    response.view='wizard/step.html'
+    response.view = 'wizard/step.html'
     params = dict(session.app['params'])
-    form=SQLFORM.factory(
-                Field('title',default=params.get('title',None),
-                                      requires=IS_NOT_EMPTY()),
-                Field('subtitle',default=params.get('subtitle',None)),
-                Field('author',default=params.get('author',None)),
-                Field('author_email',default=params.get('author_email',None)),
-                Field('keywords',default=params.get('keywords',None)),
-                Field('description','text',
-                      default=params.get('description',None)),
-                Field('layout_theme',requires=IS_IN_SET(themes),
-                      default=params.get('layout_theme',themes[0])),
-                Field('database_uri',default=params.get('database_uri',None)),
-                Field('security_key',default=params.get('security_key',None)),
-                Field('email_server',default=params.get('email_server',None)),
-                Field('email_sender',default=params.get('email_sender',None)),
-                Field('email_login',default=params.get('email_login',None)),
-                Field('login_method',requires=IS_IN_SET(('local','janrain')),
-                      default=params.get('login_method','local')),
-                Field('login_config',default=params.get('login_config',None)),
-                Field('plugins','list:string',requires=IS_IN_SET(plugins,multiple=True)))
+    form = SQLFORM.factory(
+        Field('title', default=params.get('title', None),
+              requires=IS_NOT_EMPTY()),
+        Field('subtitle', default=params.get('subtitle', None)),
+        Field('author', default=params.get('author', None)),
+        Field(
+            'author_email', default=params.get('author_email', None)),
+        Field('keywords', default=params.get('keywords', None)),
+        Field('description', 'text',
+              default=params.get('description', None)),
+        Field('layout_theme', requires=IS_IN_SET(themes),
+              default=params.get('layout_theme', themes[0])),
+        Field(
+            'database_uri', default=params.get('database_uri', None)),
+        Field(
+            'security_key', default=params.get('security_key', None)),
+        Field(
+            'email_server', default=params.get('email_server', None)),
+        Field(
+            'email_sender', default=params.get('email_sender', None)),
+        Field('email_login', default=params.get('email_login', None)),
+        Field('login_method', requires=IS_IN_SET(('local', 'janrain')),
+              default=params.get('login_method', 'local')),
+        Field(
+            'login_config', default=params.get('login_config', None)),
+        Field('plugins', 'list:string', requires=IS_IN_SET(plugins, multiple=True)))
 
     if form.accepts(request.vars):
-        session.app['params']=[(key,form.vars.get(key,None))
-                               for key,value in session.app['params']]
+        session.app['params'] = [(key, form.vars.get(key, None))
+                                 for key, value in session.app['params']]
         redirect(URL('step2'))
-    return dict(step='1: Setting Parameters',form=form)
+    return dict(step='1: Setting Parameters', form=form)
+
 
 def step2():
-    response.view='wizard/step.html'
-    form=SQLFORM.factory(Field('table_names','list:string',
-                               default=session.app['tables']))
+    response.view = 'wizard/step.html'
+    form = SQLFORM.factory(Field('table_names', 'list:string',
+                                 default=session.app['tables']))
     if form.accepts(request.vars):
-        table_names = [clean(t) for t in listify(form.vars.table_names) \
-                           if t.strip()]
-        if [t for t in table_names if t.startswith('auth_') and \
-                not t=='auth_user']:
+        table_names = [clean(t) for t in listify(form.vars.table_names)
+                       if t.strip()]
+        if [t for t in table_names if t.startswith('auth_') and
+                not t == 'auth_user']:
             form.error.table_names = \
                 T('invalid table names (auth_* tables already defined)')
         else:
-            session.app['tables']=table_names
+            session.app['tables'] = table_names
             for table in session.app['tables']:
-                if not 'table_'+table in session.app:
-                    session.app['table_'+table]=['name']
-                if not table=='auth_user':
-                    name = table+'_manage'
+                if not 'table_' + table in session.app:
+                    session.app['table_' + table] = ['name']
+                if not table == 'auth_user':
+                    name = table + '_manage'
                     if not name in session.app['pages']:
                         session.app['pages'].append(name)
-                        session.app['page_'+name] = \
+                        session.app['page_' + name] = \
                             '## Manage %s\n\n{{=form}}' % (table)
             if session.app['tables']:
-                redirect(URL('step3',args=0))
+                redirect(URL('step3', args=0))
             else:
                 redirect(URL('step4'))
-    return dict(step='2: Tables',form=form)
+    return dict(step='2: Tables', form=form)
+
 
 def step3():
-    response.view='wizard/step.html'
-    n=int(request.args(0) or 0)
-    m=len(session.app['tables'])
-    if n>=m: redirect(URL('step2'))
-    table=session.app['tables'][n]
-    form=SQLFORM.factory(Field('field_names','list:string',
-                               default=session.app.get('table_'+table,[])))
+    response.view = 'wizard/step.html'
+    n = int(request.args(0) or 0)
+    m = len(session.app['tables'])
+    if n >= m:
+        redirect(URL('step2'))
+    table = session.app['tables'][n]
+    form = SQLFORM.factory(Field('field_names', 'list:string',
+                                 default=session.app.get('table_' + table, [])))
     if form.accepts(request.vars) and form.vars.field_names:
-        fields=listify(form.vars.field_names)
-        if table=='auth_user':
-            for field in ['first_name','last_name','username','email','password']:
+        fields = listify(form.vars.field_names)
+        if table == 'auth_user':
+            for field in ['first_name', 'last_name', 'username', 'email', 'password']:
                 if not field in fields:
                     fields.append(field)
-        session.app['table_'+table]=[t.strip().lower()
-                                       for t in listify(form.vars.field_names)
-                                       if t.strip()]
+        session.app['table_' + table] = [t.strip().lower()
+                                         for t in listify(form.vars.field_names)
+                                         if t.strip()]
         try:
-            tables=sort_tables(session.app['tables'])
+            tables = sort_tables(session.app['tables'])
         except RuntimeError:
-            response.flash=T('invalid circular reference')
+            response.flash = T('invalid circular reference')
         else:
-            if n<m-1:
-                redirect(URL('step3',args=n+1))
+            if n < m - 1:
+                redirect(URL('step3', args=n + 1))
             else:
                 redirect(URL('step4'))
-    return dict(step='3: Fields for table "%s" (%s of %s)' \
-                    % (table,n+1,m),table=table,form=form)
+    return dict(step='3: Fields for table "%s" (%s of %s)'
+                % (table, n + 1, m), table=table, form=form)
+
 
 def step4():
-    response.view='wizard/step.html'
-    form=SQLFORM.factory(Field('pages','list:string',
-                               default=session.app['pages']))
+    response.view = 'wizard/step.html'
+    form = SQLFORM.factory(Field('pages', 'list:string',
+                                 default=session.app['pages']))
     if form.accepts(request.vars):
-        session.app['pages']=[clean(t)
-                              for t in listify(form.vars.pages)
-                              if t.strip()]
+        session.app['pages'] = [clean(t)
+                                for t in listify(form.vars.pages)
+                                if t.strip()]
         if session.app['pages']:
-            redirect(URL('step5',args=0))
+            redirect(URL('step5', args=0))
         else:
             redirect(URL('step6'))
-    return dict(step='4: Pages',form=form)
+    return dict(step='4: Pages', form=form)
+
 
 def step5():
-    response.view='wizard/step.html'
-    n=int(request.args(0) or 0)
-    m=len(session.app['pages'])
-    if n>=m: redirect(URL('step4'))
-    page=session.app['pages'][n]
-    markmin_url='http://web2py.com/examples/static/markmin.html'
-    form=SQLFORM.factory(Field('content','text',
-                               default=session.app.get('page_'+page,[]),
-                               comment=A('use markmin',
-                                         _href=markmin_url,_target='_blank')),
-                         formstyle='table2cols')
+    response.view = 'wizard/step.html'
+    n = int(request.args(0) or 0)
+    m = len(session.app['pages'])
+    if n >= m:
+        redirect(URL('step4'))
+    page = session.app['pages'][n]
+    markmin_url = 'http://web2py.com/examples/static/markmin.html'
+    form = SQLFORM.factory(Field('content', 'text',
+                                 default=session.app.get('page_' + page, []),
+                                 comment=A('use markmin',
+                                           _href=markmin_url, _target='_blank')),
+                           formstyle='table2cols')
     if form.accepts(request.vars):
-        session.app['page_'+page]=form.vars.content
-        if n<m-1:
-            redirect(URL('step5',args=n+1))
+        session.app['page_' + page] = form.vars.content
+        if n < m - 1:
+            redirect(URL('step5', args=n + 1))
         else:
             redirect(URL('step6'))
-    return dict(step='5: View for page "%s" (%s of %s)' % (page,n+1,m),form=form)
+    return dict(step='5: View for page "%s" (%s of %s)' % (page, n + 1, m), form=form)
+
 
 def step6():
-    response.view='wizard/step.html'
+    response.view = 'wizard/step.html'
     params = dict(session.app['params'])
     app = session.app['name']
-    form=SQLFORM.factory(
-        Field('generate_model','boolean',default=True),
-        Field('generate_controller','boolean',default=True),
-        Field('generate_views','boolean',default=True),
-        Field('generate_menu','boolean',default=True),
-        Field('apply_layout','boolean',default=True),
-        Field('erase_database','boolean',default=True),
-        Field('populate_database','boolean',default=True))
+    form = SQLFORM.factory(
+        Field('generate_model', 'boolean', default=True),
+        Field('generate_controller', 'boolean', default=True),
+        Field('generate_views', 'boolean', default=True),
+        Field('generate_menu', 'boolean', default=True),
+        Field('apply_layout', 'boolean', default=True),
+        Field('erase_database', 'boolean', default=True),
+        Field('populate_database', 'boolean', default=True))
     if form.accepts(request.vars):
         if DEMO_MODE:
             session.flash = T('Application cannot be generated in demo mode')
@@ -228,159 +250,173 @@ def step6():
         create(form.vars)
         session.flash = 'Application %s created' % app
         redirect(URL('generated'))
-    return dict(step='6: Generate app "%s"' % app,form=form)
+    return dict(step='6: Generate app "%s"' % app, form=form)
+
 
 def generated():
     return dict(app=session.app['name'])
 
+
 def sort_tables(tables):
     import re
     regex = re.compile('(%s)' % '|'.join(tables))
     is_auth_user = 'auth_user' in tables
-    d={}
+    d = {}
     for table in tables:
-        d[table]=[]
+        d[table] = []
         for field in session.app['table_%s' % table]:
-            d[table]+=regex.findall(field)
-    tables=[]
+            d[table] += regex.findall(field)
+    tables = []
     if is_auth_user:
         tables.append('auth_user')
-    def append(table,trail=[]):
+
+    def append(table, trail=[]):
         if table in trail:
             raise RuntimeError
         for t in d[table]:
             # if not t==table: (problem, no dropdown for self references)
-            append(t,trail=trail+[table])
+            append(t, trail=trail + [table])
         if not table in tables:
             tables.append(table)
-    for table in d: append(table)
+    for table in d:
+        append(table)
     return tables
 
-def make_table(table,fields):
-    rawtable=table
-    if table!='auth_user': table='t_'+table
-    s=''
-    s+='\n'+'#'*40+'\n'
-    s+="db.define_table('%s',\n" % table
-    first_field='id'
+
+def make_table(table, fields):
+    rawtable = table
+    if table != 'auth_user':
+        table = 't_' + table
+    s = ''
+    s += '\n' + '#' * 40 + '\n'
+    s += "db.define_table('%s',\n" % table
+    first_field = 'id'
     for field in fields:
-        items=[x.lower() for x in field.split()]
+        items = [x.lower() for x in field.split()]
         has = {}
         keys = []
-        for key in ['notnull','unique','integer','double','boolean','float',
-                    'boolean', 'date','time','datetime','text','wiki',
-                    'html','file','upload','image','true',
-                    'hidden','readonly','writeonly','multiple',
-                    'notempty','required']:
+        for key in ['notnull', 'unique', 'integer', 'double', 'boolean', 'float',
+                    'boolean', 'date', 'time', 'datetime', 'text', 'wiki',
+                    'html', 'file', 'upload', 'image', 'true',
+                    'hidden', 'readonly', 'writeonly', 'multiple',
+                    'notempty', 'required']:
             if key in items[1:]:
                 keys.append(key)
                 has[key] = True
         tables = session.app['tables']
         refs = [t for t in tables if t in items]
-        items = items[:1] + [x for x in items[1:] \
-                                 if not x in keys and not x in tables]
+        items = items[:1] + [x for x in items[1:]
+                             if not x in keys and not x in tables]
         barename = name = '_'.join(items)
-        if table[:2]=='t_': name='f_'+name
-        if first_field=='id': first_field=name
+        if table[:2] == 't_': name = 'f_' + name
+        if first_field == 'id':
+            first_field = name
 
         ### determine field type
-        ftype='string'
-        deftypes={'integer':'integer','double':'double','boolean':'boolean',
-                  'float':'double','bool':'boolean',
-                  'date':'date','time':'time','datetime':'datetime',
-                  'text':'text','file':'upload','image':'upload',
-                  'upload':'upload','wiki':'text', 'html':'text'}
-        for key,t in deftypes.items():
+        ftype = 'string'
+        deftypes = {'integer': 'integer', 'double': 'double', 'boolean': 'boolean',
+                    'float': 'double', 'bool': 'boolean',
+                    'date': 'date', 'time': 'time', 'datetime': 'datetime',
+                    'text': 'text', 'file': 'upload', 'image': 'upload',
+                    'upload': 'upload', 'wiki': 'text', 'html': 'text'}
+        for key, t in deftypes.items():
             if key in has:
                 ftype = t
         if refs:
             key = refs[0]
-            if not key=='auth_user': key='t_'+key
+            if not key == 'auth_user':
+                key = 't_' + key
             if 'multiple' in has:
-                ftype='list:reference %s' % key
+                ftype = 'list:reference %s' % key
             else:
-                ftype='reference %s' % key
-        if ftype=='string' and 'multiple' in has:
-            ftype='list:string'
-        elif ftype=='integer' and 'multiple' in has:
-            ftype='list:integer'
-        elif name=='password':
-            ftype='password'
-        s+="    Field('%s', type='%s'" % (name, ftype)
+                ftype = 'reference %s' % key
+        if ftype == 'string' and 'multiple' in has:
+            ftype = 'list:string'
+        elif ftype == 'integer' and 'multiple' in has:
+            ftype = 'list:integer'
+        elif name == 'password':
+            ftype = 'password'
+        s += "    Field('%s', type='%s'" % (name, ftype)
 
         ### determine field attributes
         if 'notnull' in has or 'notempty' in has or 'required' in has:
-            s+=', notnull=True'
+            s += ', notnull=True'
         if 'unique' in has:
-            s+=', unique=True'
-        if ftype=='boolean' and 'true' in has:
-            s+=",\n          default=True"
+            s += ', unique=True'
+        if ftype == 'boolean' and 'true' in has:
+            s += ",\n          default=True"
 
         ### determine field representation
         elif 'wiki' in has:
-            s+=",\n          represent=lambda x, row: MARKMIN(x)"
-            s+=",\n          comment='WIKI (markmin)'"
+            s += ",\n          represent=lambda x, row: MARKMIN(x)"
+            s += ",\n          comment='WIKI (markmin)'"
         elif 'html' in has:
-            s+=",\n          represent=lambda x, row: XML(x,sanitize=True)"
-            s+=",\n          comment='HTML (sanitized)'"
+            s += ",\n          represent=lambda x, row: XML(x,sanitize=True)"
+            s += ",\n          comment='HTML (sanitized)'"
         ### determine field access
-        if name=='password' or 'writeonly' in has:
-            s+=",\n          readable=False"
+        if name == 'password' or 'writeonly' in has:
+            s += ",\n          readable=False"
         elif 'hidden' in has:
-            s+=",\n          writable=False, readable=False"
+            s += ",\n          writable=False, readable=False"
         elif 'readonly' in has:
-            s+=",\n          writable=False"
+            s += ",\n          writable=False"
 
         ### make up a label
-        s+=",\n          label=T('%s')),\n" % \
+        s += ",\n          label=T('%s')),\n" % \
             ' '.join(x.capitalize() for x in barename.split('_'))
-    if table=='auth_user':
-        s+="    Field('created_on','datetime',default=request.now,\n"
-        s+="          label=T('Created On'),writable=False,readable=False),\n"
-        s+="    Field('modified_on','datetime',default=request.now,\n"
-        s+="          label=T('Modified On'),writable=False,readable=False,\n"
-        s+="          update=request.now),\n"
-        s+="    Field('registration_key',default='',\n"
-        s+="          writable=False,readable=False),\n"
-        s+="    Field('reset_password_key',default='',\n"
-        s+="          writable=False,readable=False),\n"
-        s+="    Field('registration_id',default='',\n"
-        s+="          writable=False,readable=False),\n"
+    if table == 'auth_user':
+        s += "    Field('created_on','datetime',default=request.now,\n"
+        s += "          label=T('Created On'),writable=False,readable=False),\n"
+        s += "    Field('modified_on','datetime',default=request.now,\n"
+        s += "          label=T('Modified On'),writable=False,readable=False,\n"
+        s += "          update=request.now),\n"
+        s += "    Field('registration_key',default='',\n"
+        s += "          writable=False,readable=False),\n"
+        s += "    Field('reset_password_key',default='',\n"
+        s += "          writable=False,readable=False),\n"
+        s += "    Field('registration_id',default='',\n"
+        s += "          writable=False,readable=False),\n"
     elif 'auth_user' in session.app['tables']:
-        s+="    auth.signature,\n"
-    s+="    format='%("+first_field+")s',\n"
-    s+="    migrate=settings.migrate)\n\n"
-    if table=='auth_user':
-        s+="""
-db.auth_user.first_name.requires = IS_NOT_EMPTY(error_message=auth.messages.is_empty)
-db.auth_user.last_name.requires = IS_NOT_EMPTY(error_message=auth.messages.is_empty)
-db.auth_user.password.requires = CRYPT(key=auth.settings.hmac_key, min_length=4)
+        s += "    auth.signature,\n"
+    s += "    format='%(" + first_field + ")s',\n"
+    s += "    migrate=settings.migrate)\n\n"
+    if table == 'auth_user':
+        s += """
+db.auth_user.first_name.requires = IS_NOT_EMPTY(
+    error_message=auth.messages.is_empty)
+db.auth_user.last_name.requires = IS_NOT_EMPTY(
+    error_message=auth.messages.is_empty)
+db.auth_user.password.requires = CRYPT(
+    key=auth.settings.hmac_key, min_length=4)
 db.auth_user.username.requires = IS_NOT_IN_DB(db, db.auth_user.username)
-db.auth_user.email.requires = (IS_EMAIL(error_message=auth.messages.invalid_email),
+db.auth_user.email.requires = (
+    IS_EMAIL(error_message=auth.messages.invalid_email),
                                IS_NOT_IN_DB(db, db.auth_user.email))
 """
     else:
-        s+="db.define_table('%s_archive',db.%s,Field('current_record','reference %s',readable=False,writable=False))\n" % (table,table,table)
+        s += "db.define_table('%s_archive',db.%s,Field('current_record','reference %s',readable=False,writable=False))\n" % (table, table, table)
     return s
 
+
 def fix_db(filename):
     params = dict(session.app['params'])
-    content = read_file(filename,'rb')
+    content = read_file(filename, 'rb')
     if 'auth_user' in session.app['tables']:
-        auth_user = make_table('auth_user',session.app['table_auth_user'])
+        auth_user = make_table('auth_user', session.app['table_auth_user'])
         content = content.replace('sqlite://storage.sqlite',
-                                params['database_uri'])
-        content = content.replace('auth.define_tables()',\
-            auth_user+'auth.define_tables(migrate = settings.migrate)')
+                                  params['database_uri'])
+        content = content.replace('auth.define_tables()',
+                                  auth_user + 'auth.define_tables(migrate = settings.migrate)')
     content += """
 mail.settings.server = settings.email_server
 mail.settings.sender = settings.email_sender
 mail.settings.login = settings.email_login
 """
-    if params['login_method']=='janrain':
-        content+="""
+    if params['login_method'] == 'janrain':
+        content += """
 from gluon.contrib.login_methods.rpx_account import RPXAccount
-auth.settings.actions_disabled=['register','change_password','request_reset_password']
+auth.settings.actions_disabled=['register','change_password',
+    'request_reset_password']
 auth.settings.login_form = RPXAccount(request,
     api_key = settings.login_config.split(':')[-1],
     domain = settings.login_config.split(':')[0],
@@ -388,14 +424,15 @@ auth.settings.login_form = RPXAccount(request,
 """
     write_file(filename, content, 'wb')
 
+
 def make_menu(pages):
-    s=''
-    s+='response.title = settings.title\n'
-    s+='response.subtitle = settings.subtitle\n'
-    s+="response.meta.author = '%(author)s <%(author_email)s>' % settings\n"
-    s+='response.meta.keywords = settings.keywords\n'
-    s+='response.meta.description = settings.description\n'
-    s+='response.menu = [\n'
+    s = ''
+    s += 'response.title = settings.title\n'
+    s += 'response.subtitle = settings.subtitle\n'
+    s += "response.meta.author = '%(author)s <%(author_email)s>' % settings\n"
+    s += 'response.meta.keywords = settings.keywords\n'
+    s += 'response.meta.description = settings.description\n'
+    s += 'response.menu = [\n'
     for page in pages:
         if not page.startswith('error'):
             if page.endswith('_manage'):
@@ -403,65 +440,70 @@ def make_menu(pages):
             else:
                 page_name = page
             page_name = ' '.join(x.capitalize() for x in page_name.split('_'))
-            s+="(T('%s'),URL('default','%s')==URL(),URL('default','%s'),[]),\n" \
-                % (page_name,page,page)
-    s+=']'
+            s += "(T('%s'),URL('default','%s')==URL(),URL('default','%s'),[]),\n" \
+                % (page_name, page, page)
+    s += ']'
     return s
 
-def make_page(page,contents):
-    if 'auth_user' in session.app['tables'] and not page in ('index','error'):
-        s="@auth.requires_login()\ndef %s():\n" % page
+
+def make_page(page, contents):
+    if 'auth_user' in session.app['tables'] and not page in ('index', 'error'):
+        s = "@auth.requires_login()\ndef %s():\n" % page
     else:
-        s="def %s():\n" % page
-    items = page.rsplit('_',1)
-    if items[0] in session.app['tables'] and len(items)==2 and items[1]=='manage':
-        s+="    form = SQLFORM.smartgrid(db.t_%s,onupdate=auth.archive)\n" % items[0]
-        s+="    return locals()\n\n"
+        s = "def %s():\n" % page
+    items = page.rsplit('_', 1)
+    if items[0] in session.app['tables'] and len(items) == 2 and items[1] == 'manage':
+        s += "    form = SQLFORM.smartgrid(db.t_%s,onupdate=auth.archive)\n" % items[0]
+        s += "    return locals()\n\n"
     else:
-        s+="    return dict()\n\n"
+        s += "    return dict()\n\n"
     return s
 
-def make_view(page,contents):
-    s="{{extend 'layout.html'}}\n\n"
-    s+=str(MARKMIN(contents))
+
+def make_view(page, contents):
+    s = "{{extend 'layout.html'}}\n\n"
+    s += str(MARKMIN(contents))
     return s
 
+
 def populate(tables):
     s = 'from gluon.contrib.populate import populate\n'
-    s+= 'if db(db.auth_user).isempty():\n'
+    s += 'if db(db.auth_user).isempty():\n'
     for table in sort_tables(tables):
-        t=table=='auth_user' and 'auth_user' or 't_'+table
-        s+="     populate(db.%s,10)\n" % t
+        t = table == 'auth_user' and 'auth_user' or 't_' + table
+        s += "     populate(db.%s,10)\n" % t
     return s
 
+
 def create(options):
     if DEMO_MODE:
         session.flash = T('disabled in demo mode')
         redirect(URL('step6'))
     params = dict(session.app['params'])
     app = session.app['name']
-    if app_create(app,request,force=True,key=params['security_key']):
+    if app_create(app, request, force=True, key=params['security_key']):
         if MULTI_USER_MODE:
-            db.app.insert(name=app,owner=auth.user.id)
+            db.app.insert(name=app, owner=auth.user.id)
     else:
         session.flash = 'Failure to create application'
         redirect(URL('step6'))
 
     ### save metadata in newapp/wizard.metadata
     try:
-        meta = os.path.join(request.folder,'..',app,'wizard.metadata')
-        file=open(meta,'wb')
-        pickle.dump(session.app,file)
+        meta = os.path.join(request.folder, '..', app, 'wizard.metadata')
+        file = open(meta, 'wb')
+        pickle.dump(session.app, file)
         file.close()
     except IOError:
         session.flash = 'Failure to write wizard metadata'
         redirect(URL('step6'))
 
     ### apply theme
-    if options.apply_layout and params['layout_theme']!='Default':
+    if options.apply_layout and params['layout_theme'] != 'Default':
         try:
             fn = 'web2py.plugin.layout_%s.w2p' % params['layout_theme']
-            theme = urllib.urlopen(LAYOUTS_APP+'/static/plugin_layouts/plugins/'+fn)
+            theme = urllib.urlopen(
+                LAYOUTS_APP + '/static/plugin_layouts/plugins/' + fn)
             plugin_install(app, theme, request, fn)
         except:
             session.flash = T("unable to download layout")
@@ -469,55 +511,58 @@ def create(options):
     ### apply plugins
     for plugin in params['plugins']:
         try:
-            plugin_name = 'web2py.plugin.'+plugin+'.w2p'
-            stream = urllib.urlopen(PLUGINS_APP+'/static/'+plugin_name)
+            plugin_name = 'web2py.plugin.' + plugin + '.w2p'
+            stream = urllib.urlopen(PLUGINS_APP + '/static/' + plugin_name)
             plugin_install(app, stream, request, plugin_name)
         except Exception, e:
             session.flash = T("unable to download plugin: %s" % plugin)
 
     ### write configuration file into newapp/models/0.py
-    model = os.path.join(request.folder,'..',app,'models','0.py')
+    model = os.path.join(request.folder, '..', app, 'models', '0.py')
     file = open(model, 'wb')
     try:
         file.write("from gluon.storage import Storage\n")
         file.write("settings = Storage()\n\n")
         file.write("settings.migrate = True\n")
-        for key,value in session.app['params']:
-            file.write("settings.%s = %s\n" % (key,repr(value)))
+        for key, value in session.app['params']:
+            file.write("settings.%s = %s\n" % (key, repr(value)))
     finally:
         file.close()
 
     ### write configuration file into newapp/models/menu.py
     if options.generate_menu:
-        model = os.path.join(request.folder,'..',app,'models','menu.py')
-        file = open(model,'wb')
+        model = os.path.join(request.folder, '..', app, 'models', 'menu.py')
+        file = open(model, 'wb')
         try:
             file.write(make_menu(session.app['pages']))
         finally:
             file.close()
 
     ### customize the auth_user table
-    model = os.path.join(request.folder,'..',app,'models','db.py')
+    model = os.path.join(request.folder, '..', app, 'models', 'db.py')
     fix_db(model)
 
     ### create newapp/models/db_wizard.py
     if options.generate_model:
-        model = os.path.join(request.folder,'..',app,'models','db_wizard.py')
-        file = open(model,'wb')
+        model = os.path.join(
+            request.folder, '..', app, 'models', 'db_wizard.py')
+        file = open(model, 'wb')
         try:
             file.write('### we prepend t_ to tablenames and f_ to fieldnames for disambiguity\n\n')
             tables = sort_tables(session.app['tables'])
             for table in tables:
-                if table=='auth_user': continue
-                file.write(make_table(table,session.app['table_'+table]))
+                if table == 'auth_user':
+                    continue
+                file.write(make_table(table, session.app['table_' + table]))
         finally:
             file.close()
 
-    model = os.path.join(request.folder,'..',app,
-                         'models','db_wizard_populate.py')
-    if os.path.exists(model): os.unlink(model)
+    model = os.path.join(request.folder, '..', app,
+                         'models', 'db_wizard_populate.py')
+    if os.path.exists(model):
+        os.unlink(model)
     if options.populate_database and session.app['tables']:
-        file = open(model,'wb')
+        file = open(model, 'wb')
         try:
             file.write(populate(session.app['tables']))
         finally:
@@ -525,8 +570,9 @@ def create(options):
 
     ### create newapp/controllers/default.py
     if options.generate_controller:
-        controller = os.path.join(request.folder,'..',app,'controllers','default.py')
-        file = open(controller,'wb')
+        controller = os.path.join(
+            request.folder, '..', app, 'controllers', 'default.py')
+        file = open(controller, 'wb')
         try:
             file.write("""# -*- coding: utf-8 -*-
 ### required - do no delete
@@ -536,21 +582,24 @@ def call(): return service()
 ### end requires
 """)
             for page in session.app['pages']:
-                file.write(make_page(page,session.app.get('page_'+page,'')))
+                file.write(
+                    make_page(page, session.app.get('page_' + page, '')))
         finally:
             file.close()
 
     ### create newapp/views/default/*.html
     if options.generate_views:
         for page in session.app['pages']:
-            view = os.path.join(request.folder,'..',app,'views','default',page+'.html')
-            file = open(view,'wb')
+            view = os.path.join(
+                request.folder, '..', app, 'views', 'default', page + '.html')
+            file = open(view, 'wb')
             try:
-                file.write(make_view(page,session.app.get('page_'+page,'')))
+                file.write(
+                    make_view(page, session.app.get('page_' + page, '')))
             finally:
                 file.close()
 
     if options.erase_database:
-        path = os.path.join(request.folder,'..',app,'databases','*')
+        path = os.path.join(request.folder, '..', app, 'databases', '*')
         for file in glob.glob(path):
             os.unlink(file)
diff --git a/applications/admin/models/0.py b/applications/admin/models/0.py
index ebf9c29b..be8fe37a 100644
--- a/applications/admin/models/0.py
+++ b/applications/admin/models/0.py
@@ -1,7 +1,7 @@
 EXPIRATION = 60 * 60  # logout after 60 minutes of inactivity
 CHECK_VERSION = True
 WEB2PY_URL = 'http://web2py.com'
-WEB2PY_VERSION_URL = WEB2PY_URL+'/examples/default/version'
+WEB2PY_VERSION_URL = WEB2PY_URL + '/examples/default/version'
 
 ###########################################################################
 # Preferences for EditArea
@@ -21,7 +21,7 @@ TEXT_EDITOR_THEME = (
     "tomorrow_night_eighties", "twilight", "vibrant_ink")[0]
 
 ## Editor Keyboard bindings (only for ace and codemirror)
-TEXT_EDITOR_KEYBINDING = '' # 'emacs' or 'vi'
+TEXT_EDITOR_KEYBINDING = ''  # 'emacs' or 'vi'
 
 ### edit_area only
 # The default font size, measured in 'points'. The value must be an integer > 0
@@ -59,9 +59,9 @@ GAE_APPCFG = os.path.abspath(os.path.join('/usr/local/bin/appcfg.py'))
 
 # To use web2py as a teaching tool, set MULTI_USER_MODE to True
 MULTI_USER_MODE = False
-EMAIL_SERVER    = 'localhost'
-EMAIL_SENDER    = 'professor@example.com'
-EMAIL_LOGIN     = None
+EMAIL_SERVER = 'localhost'
+EMAIL_SENDER = 'professor@example.com'
+EMAIL_LOGIN = None
 
 # configurable twitterbox, set to None/False to suppress
 TWITTER_HASH = "web2py"
diff --git a/applications/admin/models/access.py b/applications/admin/models/access.py
index f268366f..d504b035 100644
--- a/applications/admin/models/access.py
+++ b/applications/admin/models/access.py
@@ -1,4 +1,6 @@
-import base64, os, time
+import base64
+import os
+import time
 from gluon import portalocker
 from gluon.admin import apath
 from gluon.fileutils import read_file
@@ -24,7 +26,8 @@ elif not request.is_local and not DEMO_MODE:
 try:
     _config = {}
     port = int(request.env.server_port or 0)
-    restricted(read_file(apath('../parameters_%i.py' % port, request)), _config)
+    restricted(
+        read_file(apath('../parameters_%i.py' % port, request)), _config)
 
     if not 'password' in _config or not _config['password']:
         raise HTTP(200, T('admin disabled because no admin password'))
@@ -38,7 +41,8 @@ except IOError:
             raise HTTP(200,
                        T('admin disabled because not supported on google app engine'))
     else:
-        raise HTTP(200, T('admin disabled because unable to access password file'))
+        raise HTTP(
+            200, T('admin disabled because unable to access password file'))
 
 
 def verify_password(password):
@@ -50,7 +54,7 @@ def verify_password(password):
     elif _config['password'].startswith('pam_user:'):
         session.pam_user = _config['password'][9:].strip()
         import gluon.contrib.pam
-        return gluon.contrib.pam.authenticate(session.pam_user,password)
+        return gluon.contrib.pam.authenticate(session.pam_user, password)
     else:
         return _config['password'] == CRYPT()(password)[0]
 
@@ -63,6 +67,7 @@ deny_file = os.path.join(request.folder, 'private', 'hosts.deny')
 allowed_number_of_attempts = 5
 expiration_failed_logins = 3600
 
+
 def read_hosts_deny():
     import datetime
     hosts = {}
@@ -75,7 +80,7 @@ def read_hosts_deny():
                 continue
             fields = line.strip().split()
             if len(fields) > 2:
-                hosts[fields[0].strip()] = ( # ip
+                hosts[fields[0].strip()] = (  # ip
                     int(fields[1].strip()),  # n attemps
                     int(fields[2].strip())   # last attempts
                     )
@@ -83,28 +88,30 @@ def read_hosts_deny():
         f.close()
     return hosts
 
+
 def write_hosts_deny(denied_hosts):
     f = open(deny_file, 'w')
     portalocker.lock(f, portalocker.LOCK_EX)
     for key, val in denied_hosts.items():
-        if time.time()-val[1] < expiration_failed_logins:
+        if time.time() - val[1] < expiration_failed_logins:
             line = '%s %s %s\n' % (key, val[0], val[1])
             f.write(line)
     portalocker.unlock(f)
     f.close()
 
+
 def login_record(success=True):
     denied_hosts = read_hosts_deny()
-    val = (0,0)
+    val = (0, 0)
     if success and request.client in denied_hosts:
         del denied_hosts[request.client]
     elif not success and not request.is_local:
-        val = denied_hosts.get(request.client,(0,0))
-        if time.time()-val[1]<expiration_failed_logins \
+        val = denied_hosts.get(request.client, (0, 0))
+        if time.time() - val[1] < expiration_failed_logins \
             and val[0] >= allowed_number_of_attempts:
-            return val[0] # locked out
-        time.sleep(2**val[0])
-        val = (val[0]+1,int(time.time()))
+            return val[0]  # locked out
+        time.sleep(2 ** val[0])
+        val = (val[0] + 1, int(time.time()))
         denied_hosts[request.client] = val
     write_hosts_deny(denied_hosts)
     return val[0]
@@ -124,9 +131,9 @@ if session.authorized:
         session.last_time = t0
 
 
-if request.vars.is_mobile in ('true','false','auto'):
+if request.vars.is_mobile in ('true', 'false', 'auto'):
     session.is_mobile = request.vars.is_mobile or 'auto'
-if request.controller=='default' and request.function=='index':
+if request.controller == 'default' and request.function == 'index':
     if not request.vars.is_mobile:
         session.is_mobile = 'auto'
 if not session.is_mobile:
@@ -141,14 +148,14 @@ else:
 if request.controller == "webservices":
     basic = request.env.http_authorization
     if not basic or not basic[:6].lower() == 'basic ':
-        raise HTTP(401,"Wrong credentials")
+        raise HTTP(401, "Wrong credentials")
     (username, password) = base64.b64decode(basic[6:]).split(':')
     if not verify_password(password) or MULTI_USER_MODE:
         time.sleep(10)
-        raise HTTP(403,"Not authorized")
+        raise HTTP(403, "Not authorized")
 elif not session.authorized and not \
-    (request.controller+'/'+request.function in
-     ('default/index','default/user','plugin_jqmobile/index','plugin_jqmobile/about')):
+    (request.controller + '/' + request.function in
+     ('default/index', 'default/user', 'plugin_jqmobile/index', 'plugin_jqmobile/about')):
 
     if request.env.query_string:
         query_string = '?' + request.env.query_string
@@ -165,6 +172,6 @@ elif session.authorized and \
      request.function == 'index':
     redirect(URL(request.application, 'default', 'site'))
 
-if request.controller=='appadmin' and DEMO_MODE:
+if request.controller == 'appadmin' and DEMO_MODE:
     session.flash = 'Appadmin disabled in demo mode'
-    redirect(URL('default','sites'))
+    redirect(URL('default', 'sites'))
diff --git a/applications/admin/models/buttons.py b/applications/admin/models/buttons.py
index ec79c8db..a7bbbedc 100644
--- a/applications/admin/models/buttons.py
+++ b/applications/admin/models/buttons.py
@@ -2,35 +2,41 @@
 
 import os
 
-def A_button(*a,**b):
+
+def A_button(*a, **b):
     b['_data-role'] = 'button'
     b['_data-inline'] = 'true'
-    return A(*a,**b)
+    return A(*a, **b)
+
 
 def button(href, label):
     if is_mobile:
         ret = A_button(SPAN(label), _href=href)
     else:
-        ret = A(SPAN(label),_class='button',_href=href)
+        ret = A(SPAN(label), _class='button', _href=href)
     return ret
 
+
 def button_enable(href, app):
-    if os.path.exists(os.path.join(apath(app,r=request),'DISABLED')):
-        label = SPAN(T('Enable'),_style='color:red')
+    if os.path.exists(os.path.join(apath(app, r=request), 'DISABLED')):
+        label = SPAN(T('Enable'), _style='color:red')
     else:
-        label = SPAN(T('Disable'),_style='color:green')
-    id = 'enable_'+app
-    return A(label,_class='button',_id=id,callback=href,target=id)
+        label = SPAN(T('Disable'), _style='color:green')
+    id = 'enable_' + app
+    return A(label, _class='button', _id=id, callback=href, target=id)
+
 
 def sp_button(href, label):
     if request.user_agent().is_mobile:
         ret = A_button(SPAN(label), _href=href)
     else:
-        ret = A(SPAN(label),_class='button special',_href=href)
+        ret = A(SPAN(label), _class='button special', _href=href)
     return ret
 
+
 def helpicon():
     return IMG(_src=URL('static', 'images/help.png'), _alt='help')
 
+
 def searchbox(elementid):
-    return TAG[''](LABEL(IMG(_id="search_start",_src=URL('static', 'images/search.png'), _alt=T('filter')), _class='icon', _for=elementid), ' ', INPUT(_id=elementid, _type='text', _size=12))
+    return TAG[''](LABEL(IMG(_id="search_start", _src=URL('static', 'images/search.png'), _alt=T('filter')), _class='icon', _for=elementid), ' ', INPUT(_id=elementid, _type='text', _size=12))
diff --git a/applications/admin/models/db.py b/applications/admin/models/db.py
index b5df1aae..d6871cb2 100644
--- a/applications/admin/models/db.py
+++ b/applications/admin/models/db.py
@@ -4,35 +4,39 @@
 if MULTI_USER_MODE:
     db = DAL('sqlite://storage.sqlite')       # if not, use SQLite or other DB
     from gluon.tools import *
-    auth = Auth(globals(),db)                      # authentication/authorization
-    crud = Crud(globals(),db)                      # for CRUD helpers using auth
-    service = Service(globals())                   # for json, xml, jsonrpc, xmlrpc, amfrpc
+    auth = Auth(
+        globals(), db)                      # authentication/authorization
+    crud = Crud(
+        globals(), db)                      # for CRUD helpers using auth
+    service = Service(
+        globals())                   # for json, xml, jsonrpc, xmlrpc, amfrpc
     plugins = PluginManager()
 
     mail = auth.settings.mailer
     mail.settings.server = EMAIL_SERVER
     mail.settings.sender = EMAIL_SENDER
-    mail.settings.login =  EMAIL_LOGIN
+    mail.settings.login = EMAIL_LOGIN
 
     auth.settings.extra_fields['auth_user'] = \
-        [Field('is_manager','boolean',default=False,writable=False)]
+        [Field('is_manager', 'boolean', default=False, writable=False)]
     auth.define_tables()                           # creates all needed tables
     auth.settings.registration_requires_verification = False
     auth.settings.registration_requires_approval = True
     auth.settings.reset_password_requires_verification = True
 
-    db.define_table('app',Field('name'),Field('owner',db.auth_user))
+    db.define_table('app', Field('name'), Field('owner', db.auth_user))
 
 if not session.authorized and MULTI_USER_MODE:
-    if auth.user and not request.function=='user':
+    if auth.user and not request.function == 'user':
         session.authorized = True
-    elif not request.function=='user':
-        redirect(URL('default','user/login'))
+    elif not request.function == 'user':
+        redirect(URL('default', 'user/login'))
+
 
 def is_manager():
     if not MULTI_USER_MODE:
         return True
-    elif auth.user and (auth.user.id==1 or auth.user.is_manager):
+    elif auth.user and (auth.user.id == 1 or auth.user.is_manager):
         return True
     else:
         return False
diff --git a/applications/admin/models/menu.py b/applications/admin/models/menu.py
index fa7d5fa6..7429def1 100644
--- a/applications/admin/models/menu.py
+++ b/applications/admin/models/menu.py
@@ -7,29 +7,30 @@ _c = request.controller
 _f = request.function
 response.title = '%s %s' % (_f, '/'.join(request.args))
 response.subtitle = 'admin'
-response.menu = [(T('Site'), _f == 'site', URL(_a,'default','site'))]
+response.menu = [(T('Site'), _f == 'site', URL(_a, 'default', 'site'))]
 
 if request.vars.app or request.args:
     _t = request.vars.app or request.args[0]
     response.menu.append((T('Edit'), _c == 'default' and _f == 'design',
-                         URL(_a,'default','design',args=_t)))
+                         URL(_a, 'default', 'design', args=_t)))
     response.menu.append((T('About'), _c == 'default' and _f == 'about',
-                         URL(_a,'default','about',args=_t,)))
+                         URL(_a, 'default', 'about', args=_t,)))
     response.menu.append((T('Errors'), _c == 'default' and _f == 'errors',
-                         URL(_a,'default','errors',args=_t)))
+                         URL(_a, 'default', 'errors', args=_t)))
     response.menu.append((T('Versioning'),
                           _c == 'mercurial' and _f == 'commit',
-                          URL(_a,'mercurial','commit',args=_t)))
+                          URL(_a, 'mercurial', 'commit', args=_t)))
 
 if not session.authorized:
     response.menu = [(T('Login'), True, URL('site'))]
 else:
     response.menu.append((T('Logout'), False,
-                          URL(_a,'default',f='logout')))
+                          URL(_a, 'default', f='logout')))
     response.menu.append((T('Debug'), False,
-                          URL(_a, 'debug','interact')))
+                          URL(_a, 'debug', 'interact')))
 
 if os.path.exists('applications/examples'):
-    response.menu.append((T('Help'), False, URL('examples','default','index')))
+    response.menu.append(
+        (T('Help'), False, URL('examples', 'default', 'index')))
 else:
     response.menu.append((T('Help'), False, 'http://web2py.com/examples'))
diff --git a/applications/admin/models/plugin_multiselect.py b/applications/admin/models/plugin_multiselect.py
index ec45feec..39fa2a1e 100644
--- a/applications/admin/models/plugin_multiselect.py
+++ b/applications/admin/models/plugin_multiselect.py
@@ -1,3 +1,4 @@
-response.files.append(URL('static','plugin_multiselect/jquery.multi-select.js'))
-response.files.append(URL('static','plugin_multiselect/multi-select.css'))
-response.files.append(URL('static','plugin_multiselect/start.js'))
+response.files.append(
+    URL('static', 'plugin_multiselect/jquery.multi-select.js'))
+response.files.append(URL('static', 'plugin_multiselect/multi-select.css'))
+response.files.append(URL('static', 'plugin_multiselect/start.js'))
diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py
index 6802c419..f62af94c 100644
--- a/applications/examples/controllers/appadmin.py
+++ b/applications/examples/controllers/appadmin.py
@@ -23,7 +23,7 @@ remote_addr = request.env.remote_addr
 try:
     hosts = (http_host, socket.gethostname(),
              socket.gethostbyname(http_host),
-             '::1','127.0.0.1','::ffff:127.0.0.1')
+             '::1', '127.0.0.1', '::ffff:127.0.0.1')
 except:
     hosts = (http_host, )
 
@@ -32,10 +32,10 @@ if request.env.http_x_forwarded_for or request.is_https:
 elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
     raise HTTP(200, T('appadmin is disabled because insecure channel'))
 
-if (request.application=='admin' and not session.authorized) or \
-        (request.application!='admin' and not gluon.fileutils.check_credentials(request)):
+if (request.application == 'admin' and not session.authorized) or \
+        (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
     redirect(URL('admin', 'default', 'index',
-                 vars=dict(send=URL(args=request.args,vars=request.vars))))
+                 vars=dict(send=URL(args=request.args, vars=request.vars))))
 
 ignore_rw = True
 response.view = 'appadmin.html'
@@ -95,24 +95,23 @@ def get_query(request):
         return None
 
 
-def query_by_table_type(tablename,db,request=request):
-    keyed = hasattr(db[tablename],'_primarykey')
+def query_by_table_type(tablename, db, request=request):
+    keyed = hasattr(db[tablename], '_primarykey')
     if keyed:
         firstkey = db[tablename][db[tablename]._primarykey[0]]
         cond = '>0'
         if firstkey.type in ['string', 'text']:
             cond = '!=""'
-        qry = '%s.%s.%s%s' % (request.args[0], request.args[1], firstkey.name, cond)
+        qry = '%s.%s.%s%s' % (
+            request.args[0], request.args[1], firstkey.name, cond)
     else:
         qry = '%s.%s.id>0' % tuple(request.args[:2])
     return qry
 
 
-
 # ##########################################################
 # ## list all databases and tables
 # ###########################################################
-
 def index():
     return dict(databases=databases)
 
@@ -127,7 +126,7 @@ def insert():
     form = SQLFORM(db[table], ignore_rw=ignore_rw)
     if form.accepts(request.vars, session):
         response.flash = T('new record inserted')
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])
 
 
 # ##########################################################
@@ -138,7 +137,8 @@ def insert():
 def download():
     import os
     db = get_database(request)
-    return response.download(request,db)
+    return response.download(request, db)
+
 
 def csv():
     import gluon.contenttype
@@ -149,26 +149,27 @@ def csv():
     if not query:
         return None
     response.headers['Content-disposition'] = 'attachment; filename=%s_%s.csv'\
-         % tuple(request.vars.query.split('.')[:2])
-    return str(db(query,ignore_common_filters=True).select())
+        % tuple(request.vars.query.split('.')[:2])
+    return str(db(query, ignore_common_filters=True).select())
 
 
 def import_csv(table, file):
     table.import_from_csv_file(file)
 
+
 def select():
     import re
     db = get_database(request)
     dbname = request.args[0]
     regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
-    if len(request.args)>1 and hasattr(db[request.args[1]],'_primarykey'):
+    if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
         regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
     if request.vars.query:
         match = regex.match(request.vars.query)
         if match:
             request.vars.query = '%s.%s.%s==%s' % (request.args[0],
-                    match.group('table'), match.group('field'),
-                    match.group('value'))
+                                                   match.group('table'), match.group('field'),
+                                                   match.group('value'))
     else:
         request.vars.query = session.last_query
     query = get_query(request)
@@ -192,14 +193,15 @@ def select():
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
                 _name='query', _value=request.vars.query or '',
-                requires=IS_NOT_EMPTY(error_message=T("Cannot be empty")))), TR(T('Update:'),
+                requires=IS_NOT_EMPTY(
+                    error_message=T("Cannot be empty")))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
-                 or '')), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
-                _action=URL(r=request,args=request.args))
+                _action=URL(r=request, args=request.args))
 
     tb = None
     if form.accepts(request.vars, formname=None):
@@ -211,28 +213,30 @@ def select():
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
-                                  % form.vars.update_fields))
+                                                      % form.vars.update_fields))
                 response.flash = T('%s %%{row} updated', nrows)
             elif form.vars.delete_check:
                 db(query).delete()
                 response.flash = T('%s %%{row} deleted', nrows)
             nrows = db(query).count()
             if orderby:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby))
+                rows = db(query, ignore_common_filters=True).select(limitby=(
+                    start, stop), orderby=eval_in_global_env(orderby))
             else:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop))
+                rows = db(query, ignore_common_filters=True).select(
+                    limitby=(start, stop))
         except Exception, e:
             import traceback
             tb = traceback.format_exc()
             (rows, nrows) = ([], 0)
-            response.flash = DIV(T('Invalid Query'),PRE(str(e)))
+            response.flash = DIV(T('Invalid Query'), PRE(str(e)))
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file'))+" ",
-                       INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=csv_table,_name='table'),
-                       INPUT(_type='submit',_value=T('import')))
+        formcsv = FORM(str(T('or import from csv file')) + " ",
+                       INPUT(_type='file', _name='csvfile'),
+                       INPUT(_type='hidden', _value=csv_table, _name='table'),
+                       INPUT(_type='submit', _value=T('import')))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -241,7 +245,7 @@ def select():
                        request.vars.csvfile.file)
             response.flash = T('data uploaded')
         except Exception, e:
-            response.flash = DIV(T('unable to parse csv file'),PRE(str(e)))
+            response.flash = DIV(T('unable to parse csv file'), PRE(str(e)))
     # end handle upload csv
 
     return dict(
@@ -252,9 +256,9 @@ def select():
         nrows=nrows,
         rows=rows,
         query=request.vars.query,
-        formcsv = formcsv,
-        tb = tb,
-        )
+        formcsv=formcsv,
+        tb=tb,
+    )
 
 
 # ##########################################################
@@ -264,14 +268,16 @@ def select():
 
 def update():
     (db, table) = get_table(request)
-    keyed = hasattr(db[table],'_primarykey')
+    keyed = hasattr(db[table], '_primarykey')
     record = None
     if keyed:
         key = [f for f in request.vars if f in db[table]._primarykey]
         if key:
-            record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first()
+            record = db(db[table][key[0]] == request.vars[key[
+                        0]], ignore_common_filters=True).select().first()
     else:
-        record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first()
+        record = db(db[table].id == request.args(
+            2), ignore_common_filters=True).select().first()
 
     if not record:
         qry = query_by_table_type(table, db)
@@ -281,20 +287,21 @@ def update():
 
     if keyed:
         for k in db[table]._primarykey:
-            db[table][k].writable=False
+            db[table][k].writable = False
 
-    form = SQLFORM(db[table], record, deletable=True, delete_label=T('Check to delete'),
-                   ignore_rw=ignore_rw and not keyed,
-                   linkto=URL('select',
+    form = SQLFORM(
+        db[table], record, deletable=True, delete_label=T('Check to delete'),
+        ignore_rw=ignore_rw and not keyed,
+        linkto=URL('select',
                    args=request.args[:1]), upload=URL(r=request,
-                   f='download', args=request.args[:1]))
+                                                      f='download', args=request.args[:1]))
 
     if form.accepts(request.vars, session):
         session.flash = T('done!')
         qry = query_by_table_type(table, db)
         redirect(URL('select', args=request.args[:1],
                  vars=dict(query=qry)))
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])
 
 
 # ##########################################################
@@ -305,11 +312,15 @@ def update():
 def state():
     return dict()
 
+
 def ccache():
     form = FORM(
-        P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
-        P(TAG.BUTTON(T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
-        P(TAG.BUTTON(T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+        P(TAG.BUTTON(
+            T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+        P(TAG.BUTTON(
+            T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+        P(TAG.BUTTON(
+            T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
     )
 
     if form.accepts(request.vars, session):
@@ -333,11 +344,16 @@ def ccache():
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy; hp=hpy()
+        from guppy import hpy
+        hp = hpy()
     except ImportError:
         hp = False
 
-    import shelve, os, copy, time, math
+    import shelve
+    import os
+    import copy
+    import time
+    import math
     from gluon import portalocker
 
     ram = {
@@ -382,9 +398,10 @@ def ccache():
             ram['keys'].append((key, GetInHMS(time.time() - value[0])))
 
     locker = open(os.path.join(request.folder,
-                                        'cache/cache.lock'), 'a')
+                               'cache/cache.lock'), 'a')
     portalocker.lock(locker, portalocker.LOCK_EX)
-    disk_storage = shelve.open(os.path.join(request.folder, 'cache/cache.shelve'))
+    disk_storage = shelve.open(
+        os.path.join(request.folder, 'cache/cache.shelve'))
     try:
         for key, value in disk_storage.items():
             if isinstance(value, dict):
@@ -415,7 +432,8 @@ def ccache():
     total['misses'] = ram['misses'] + disk['misses']
     total['keys'] = ram['keys'] + disk['keys']
     try:
-        total['ratio'] = total['hits'] * 100 / (total['hits'] + total['misses'])
+        total['ratio'] = total['hits'] * 100 / (total['hits'] +
+                                                total['misses'])
     except (KeyError, ZeroDivisionError):
         total['ratio'] = 0
 
diff --git a/applications/examples/controllers/cache_examples.py b/applications/examples/controllers/cache_examples.py
index c4a95494..857833d5 100644
--- a/applications/examples/controllers/cache_examples.py
+++ b/applications/examples/controllers/cache_examples.py
@@ -4,21 +4,21 @@ import time
 def cache_in_ram():
     """cache the output of the lambda function in ram"""
 
-    t = cache.ram('time', lambda : time.ctime(), time_expire=5)
+    t = cache.ram('time', lambda: time.ctime(), time_expire=5)
     return dict(time=t, link=A('click to reload', _href=URL(r=request)))
 
 
 def cache_on_disk():
     """cache the output of the lambda function on disk"""
 
-    t = cache.disk('time', lambda : time.ctime(), time_expire=5)
+    t = cache.disk('time', lambda: time.ctime(), time_expire=5)
     return dict(time=t, link=A('click to reload', _href=URL(r=request)))
 
 
 def cache_in_ram_and_disk():
     """cache the output of the lambda function on disk and in ram"""
 
-    t = cache.ram('time', lambda : cache.disk('time', lambda : \
+    t = cache.ram('time', lambda: cache.disk('time', lambda:
                   time.ctime(), time_expire=5), time_expire=5)
     return dict(time=t, link=A('click to reload', _href=URL(r=request)))
 
diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py
index 8e39b694..7063a6fd 100644
--- a/applications/examples/controllers/default.py
+++ b/applications/examples/controllers/default.py
@@ -9,65 +9,81 @@ response.description = T('web2py Web Framework')
 session.forget()
 cache_expire = not request.is_local and 300 or 0
 
+
 @cache('index', time_expire=cache_expire)
 def index():
     return response.render()
 
+
 @cache('what', time_expire=cache_expire)
 def what():
-    import urllib;
+    import urllib
     try:
-        images = XML(urllib.urlopen('http://web2py.com/poweredby/default/images').read())
+        images = XML(urllib.urlopen(
+            'http://web2py.com/poweredby/default/images').read())
     except:
         images = []
     return response.render(images=images)
 
+
 @cache('download', time_expire=cache_expire)
 def download():
     return response.render()
 
+
 @cache('who', time_expire=cache_expire)
 def who():
     return response.render()
 
+
 @cache('support', time_expire=cache_expire)
 def support():
     return response.render()
 
+
 @cache('documentation', time_expire=cache_expire)
 def documentation():
     return response.render()
 
+
 @cache('usergroups', time_expire=cache_expire)
 def usergroups():
     return response.render()
 
+
 def contact():
-    redirect(URL('default','usergroups'))
+    redirect(URL('default', 'usergroups'))
+
 
 @cache('videos', time_expire=cache_expire)
 def videos():
     return response.render()
 
+
 def security():
     redirect('http://www.web2py.com/book/default/chapter/01#security')
 
+
 def api():
     redirect('http://web2py.com/book/default/chapter/04#API')
 
+
 @cache('license', time_expire=cache_expire)
 def license():
     import os
     filename = os.path.join(request.env.gluon_parent, 'LICENSE')
     return response.render(dict(license=MARKMIN(read_file(filename))))
 
+
 def version():
     return 'Version %s.%s.%s (%s) %s' % request.env.web2py_version
 
+
 @cache('examples', time_expire=cache_expire)
 def examples():
     return response.render()
 
+
 @cache('changelog', time_expire=cache_expire)
 def changelog():
     import os
diff --git a/applications/examples/controllers/form_examples.py b/applications/examples/controllers/form_examples.py
index 3847b043..944aa08f 100644
--- a/applications/examples/controllers/form_examples.py
+++ b/applications/examples/controllers/form_examples.py
@@ -12,7 +12,7 @@ def form():
         TR('Profile', TEXTAREA(_name='profile',
            value='write something here')),
         TR('', INPUT(_type='submit', _value='SUBMIT')),
-        ))
+    ))
     if form.process().accepted:
         response.flash = 'form accepted'
     elif form.errors:
diff --git a/applications/examples/controllers/global.py b/applications/examples/controllers/global.py
index bcfab063..a186037c 100644
--- a/applications/examples/controllers/global.py
+++ b/applications/examples/controllers/global.py
@@ -16,14 +16,14 @@ def vars():
             c,
             d,
             value,
-            ) = (
+        ) = (
             'Global variables',
             globals(),
             None,
             None,
             (),
             None,
-            )
+        )
         (title, args) = ('globals()', '')
     elif len(request.args) < 3:
         args = '.'.join(request.args)
@@ -75,4 +75,4 @@ def vars():
         d=d,
         doc=doc,
         attributes=attributes,
-        )
+    )
diff --git a/applications/examples/controllers/layout_examples.py b/applications/examples/controllers/layout_examples.py
index dea28f11..b05ac9d7 100644
--- a/applications/examples/controllers/layout_examples.py
+++ b/applications/examples/controllers/layout_examples.py
@@ -1,6 +1,6 @@
 def civilized():
     response.menu = [['civilized', True, URL('civilized'
-                     )], ['slick', False, URL('slick')],
+                                             )], ['slick', False, URL('slick')],
                      ['basic', False, URL('basic')]]
     response.flash = 'you clicked on civilized'
     return dict(message='you clicked on civilized')
@@ -8,7 +8,7 @@ def civilized():
 
 def slick():
     response.menu = [['civilized', False, URL('civilized'
-                     )], ['slick', True, URL('slick')],
+                                              )], ['slick', True, URL('slick')],
                      ['basic', False, URL('basic')]]
     response.flash = 'you clicked on slick'
     return dict(message='you clicked on slick')
@@ -16,7 +16,7 @@ def slick():
 
 def basic():
     response.menu = [['civilized', False, URL('civilized'
-                     )], ['slick', False, URL('slick')],
+                                              )], ['slick', False, URL('slick')],
                      ['basic', True, URL('basic')]]
     response.flash = 'you clicked on basic'
     return dict(message='you clicked on basic')
diff --git a/applications/examples/controllers/simple_examples.py b/applications/examples/controllers/simple_examples.py
index 3438d3e8..35840bbb 100644
--- a/applications/examples/controllers/simple_examples.py
+++ b/applications/examples/controllers/simple_examples.py
@@ -102,9 +102,8 @@ def rss_aggregator():
     return rss2.dumps(rss)
 
 
-
 def ajaxwiki():
-    default="""
+    default = """
 # section
 
 ## subsection
@@ -129,11 +128,12 @@ Quoted text
 3 | 0 | 0
 ---------
 """
-    form = FORM(TEXTAREA(_id='text',_name='text',value=default),
+    form = FORM(TEXTAREA(_id='text', _name='text', value=default),
                 INPUT(_type='button',
                       _value='markmin',
                       _onclick="ajax('ajaxwiki_onclick',['text'],'html')"))
     return dict(form=form, html=DIV(_id='html'))
 
+
 def ajaxwiki_onclick():
     return MARKMIN(request.vars.text).xml()
diff --git a/applications/examples/controllers/spreadsheet.py b/applications/examples/controllers/spreadsheet.py
index 426b8714..f46df702 100644
--- a/applications/examples/controllers/spreadsheet.py
+++ b/applications/examples/controllers/spreadsheet.py
@@ -1,9 +1,11 @@
 from gluon.contrib.spreadsheet import Sheet
 
+
 def callback():
-    return cache.ram('sheet1',lambda:None,None).process(request)
+    return cache.ram('sheet1', lambda: None, None).process(request)
+
 
 def index():
-    sheet = cache.ram('sheet1',lambda:Sheet(10,10,URL('callback')),0)
+    sheet = cache.ram('sheet1', lambda: Sheet(10, 10, URL('callback')), 0)
     #sheet.cell('r0c3',value='=r0c0+r0c1+r0c2',readonly=True)
     return dict(sheet=sheet)
diff --git a/applications/examples/models/feeds_reader.py b/applications/examples/models/feeds_reader.py
index 658d5381..865fa048 100644
--- a/applications/examples/models/feeds_reader.py
+++ b/applications/examples/models/feeds_reader.py
@@ -1,44 +1,44 @@
-def group_feed_reader(group,mode='div',counter='5'):
+def group_feed_reader(group, mode='div', counter='5'):
     """parse group feeds"""
 
     url = "http://groups.google.com/group/%s/feed/rss_v2_0_topics.xml?num=%s" %\
-          (group,counter)
+          (group, counter)
     from gluon.contrib import feedparser
     g = feedparser.parse(url)
 
     if mode == 'div':
-        html = XML(TAG.BLOCKQUOTE(UL(*[LI(A(entry['title']+' - ' +\
-                                 entry['author'][entry['author'].rfind('('):],\
-                                 _href=entry['link'],_target='_blank'))\
-                            for entry in g['entries'] ]),\
-                       _class="boxInfo",\
-                       _style="padding-bottom:5px;"))
+        html = XML(TAG.BLOCKQUOTE(UL(*[LI(A(entry['title'] + ' - ' +
+                                            entry['author'][
+                                                entry['author'].rfind('('):],
+                                            _href=entry['link'], _target='_blank'))
+                                       for entry in g['entries']]),
+                                  _class="boxInfo",
+                                  _style="padding-bottom:5px;"))
 
     else:
-        html = XML(UL(*[LI(A(entry['title']+' - ' +\
-                             entry['author'][entry['author'].rfind('('):],\
-                             _href=entry['link'],_target='_blank'))\
-                            for entry in g['entries'] ]))
+        html = XML(UL(*[LI(A(entry['title'] + ' - ' +
+                             entry['author'][entry['author'].rfind('('):],
+                             _href=entry['link'], _target='_blank'))
+                        for entry in g['entries']]))
 
     return html
 
 
-def code_feed_reader(project,mode='div'):
+def code_feed_reader(project, mode='div'):
     """parse code feeds"""
 
     url = "http://code.google.com/feeds/p/%s/hgchanges/basic" % project
     from gluon.contrib import feedparser
     g = feedparser.parse(url)
     if mode == 'div':
-        html = XML(DIV(UL(*[LI(A(entry['title'],_href=entry['link'],\
-                                 _target='_blank'))\
-                            for entry in g['entries'][0:5]]),\
-                       _class="boxInfo",\
+        html = XML(DIV(UL(*[LI(A(entry['title'], _href=entry['link'],
+                                 _target='_blank'))
+                            for entry in g['entries'][0:5]]),
+                       _class="boxInfo",
                        _style="padding-bottom:5px;"))
     else:
-        html = XML(UL(*[LI(A(entry['title'],_href=entry['link'],\
-                             _target='_blank'))\
-                            for entry in g['entries'][0:5]]))
-
+        html = XML(UL(*[LI(A(entry['title'], _href=entry['link'],
+                             _target='_blank'))
+                        for entry in g['entries'][0:5]]))
 
     return html
diff --git a/applications/examples/models/markmin.py b/applications/examples/models/markmin.py
index 4815ac79..3376bac6 100644
--- a/applications/examples/models/markmin.py
+++ b/applications/examples/models/markmin.py
@@ -2,18 +2,19 @@ import gluon.template
 
 markmin_dict = dict(
     code_python=lambda code: str(CODE(code)),
-    template=lambda \
-        code:gluon.template.render(code,context=globals()),
-    sup=lambda \
-        code:'<sup style="font-size:0.5em;">%s</sup>'%code,
-    br=lambda n:'<br>'*int(n),
-    groupdates=lambda group:group_feed_reader(group),
-    )
+    template=lambda
+    code: gluon.template.render(code, context=globals()),
+    sup=lambda
+    code: '<sup style="font-size:0.5em;">%s</sup>' % code,
+    br=lambda n: '<br>' * int(n),
+    groupdates=lambda group: group_feed_reader(group),
+)
 
-def get_content(b=None,\
-                c=request.controller,\
-                f=request.function,\
-                l='en',\
+
+def get_content(b=None,
+                c=request.controller,
+                f=request.function,
+                l='en',
                 format='markmin'):
     """Gets and renders the file in
     <app>/private/content/<lang>/<controller>/<function>/<block>.<format>
@@ -21,17 +22,18 @@ def get_content(b=None,\
 
     def openfile():
         import os
-        path = os.path.join(request.folder,'private','content',l,c,f,b+'.'+format)
+        path = os.path.join(
+            request.folder, 'private', 'content', l, c, f, b + '.' + format)
         return open(path)
 
     try:
         openedfile = openfile()
     except Exception, IOError:
-        l='en'
+        l = 'en'
         openedfile = openfile()
 
     if format == 'markmin':
-        html = MARKMIN(str(T(openedfile.read())),markmin_dict)
+        html = MARKMIN(str(T(openedfile.read())), markmin_dict)
     else:
         html = str(T(openedfile.read()))
     openedfile.close()
diff --git a/applications/examples/models/menu.py b/applications/examples/models/menu.py
index 1a696daf..d81bfa36 100644
--- a/applications/examples/models/menu.py
+++ b/applications/examples/models/menu.py
@@ -1,28 +1,29 @@
 # -*- coding: utf-8 -*-
 
 response.menu = [
-    (T('Home'),False,URL('default','index')),
-    (T('About'),False,URL('default','what')),
-    (T('Download'),False,URL('default','download')),
-    (T('Docs & Resources'),False,URL('default','documentation')),
-    (T('Support'),False,URL('default','support')),
-    (T('Contributors'),False,URL('default','who'))]
+    (T('Home'), False, URL('default', 'index')),
+    (T('About'), False, URL('default', 'what')),
+    (T('Download'), False, URL('default', 'download')),
+    (T('Docs & Resources'), False, URL('default', 'documentation')),
+    (T('Support'), False, URL('default', 'support')),
+    (T('Contributors'), False, URL('default', 'who'))]
 
 #########################################################################
 ## Changes the menu active item
 #########################################################################
-def toggle_menuclass(cssclass='pressed',menuid='headermenu'):
+
+
+def toggle_menuclass(cssclass='pressed', menuid='headermenu'):
     """This function changes the menu class to put pressed appearance"""
 
     positions = dict(
-                           index='',
-                           what='-108px -115px',
-                           download='-211px -115px',
-                           who='-315px -115px',
-                           support='-418px -115px',
-                           documentation='-520px -115px'
-                           )
-
+        index='',
+        what='-108px -115px',
+        download='-211px -115px',
+        who='-315px -115px',
+        support='-418px -115px',
+        documentation='-520px -115px'
+    )
 
     if request.function in positions.keys():
             jscript = """
@@ -34,10 +35,10 @@ def toggle_menuclass(cssclass='pressed',menuid='headermenu'):
              });
             </script>
             """ % dict(cssclass=cssclass,
-                            menuid=menuid,
-                            function=request.function,
-                            cssposition=positions[request.function]
-                            )
+                       menuid=menuid,
+                       function=request.function,
+                       cssposition=positions[request.function]
+                       )
 
             return XML(jscript)
     else:
diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py
index 6802c419..f62af94c 100644
--- a/applications/welcome/controllers/appadmin.py
+++ b/applications/welcome/controllers/appadmin.py
@@ -23,7 +23,7 @@ remote_addr = request.env.remote_addr
 try:
     hosts = (http_host, socket.gethostname(),
              socket.gethostbyname(http_host),
-             '::1','127.0.0.1','::ffff:127.0.0.1')
+             '::1', '127.0.0.1', '::ffff:127.0.0.1')
 except:
     hosts = (http_host, )
 
@@ -32,10 +32,10 @@ if request.env.http_x_forwarded_for or request.is_https:
 elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"):
     raise HTTP(200, T('appadmin is disabled because insecure channel'))
 
-if (request.application=='admin' and not session.authorized) or \
-        (request.application!='admin' and not gluon.fileutils.check_credentials(request)):
+if (request.application == 'admin' and not session.authorized) or \
+        (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):
     redirect(URL('admin', 'default', 'index',
-                 vars=dict(send=URL(args=request.args,vars=request.vars))))
+                 vars=dict(send=URL(args=request.args, vars=request.vars))))
 
 ignore_rw = True
 response.view = 'appadmin.html'
@@ -95,24 +95,23 @@ def get_query(request):
         return None
 
 
-def query_by_table_type(tablename,db,request=request):
-    keyed = hasattr(db[tablename],'_primarykey')
+def query_by_table_type(tablename, db, request=request):
+    keyed = hasattr(db[tablename], '_primarykey')
     if keyed:
         firstkey = db[tablename][db[tablename]._primarykey[0]]
         cond = '>0'
         if firstkey.type in ['string', 'text']:
             cond = '!=""'
-        qry = '%s.%s.%s%s' % (request.args[0], request.args[1], firstkey.name, cond)
+        qry = '%s.%s.%s%s' % (
+            request.args[0], request.args[1], firstkey.name, cond)
     else:
         qry = '%s.%s.id>0' % tuple(request.args[:2])
     return qry
 
 
-
 # ##########################################################
 # ## list all databases and tables
 # ###########################################################
-
 def index():
     return dict(databases=databases)
 
@@ -127,7 +126,7 @@ def insert():
     form = SQLFORM(db[table], ignore_rw=ignore_rw)
     if form.accepts(request.vars, session):
         response.flash = T('new record inserted')
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])
 
 
 # ##########################################################
@@ -138,7 +137,8 @@ def insert():
 def download():
     import os
     db = get_database(request)
-    return response.download(request,db)
+    return response.download(request, db)
+
 
 def csv():
     import gluon.contenttype
@@ -149,26 +149,27 @@ def csv():
     if not query:
         return None
     response.headers['Content-disposition'] = 'attachment; filename=%s_%s.csv'\
-         % tuple(request.vars.query.split('.')[:2])
-    return str(db(query,ignore_common_filters=True).select())
+        % tuple(request.vars.query.split('.')[:2])
+    return str(db(query, ignore_common_filters=True).select())
 
 
 def import_csv(table, file):
     table.import_from_csv_file(file)
 
+
 def select():
     import re
     db = get_database(request)
     dbname = request.args[0]
     regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>\d+)')
-    if len(request.args)>1 and hasattr(db[request.args[1]],'_primarykey'):
+    if len(request.args) > 1 and hasattr(db[request.args[1]], '_primarykey'):
         regex = re.compile('(?P<table>\w+)\.(?P<field>\w+)=(?P<value>.+)')
     if request.vars.query:
         match = regex.match(request.vars.query)
         if match:
             request.vars.query = '%s.%s.%s==%s' % (request.args[0],
-                    match.group('table'), match.group('field'),
-                    match.group('value'))
+                                                   match.group('table'), match.group('field'),
+                                                   match.group('value'))
     else:
         request.vars.query = session.last_query
     query = get_query(request)
@@ -192,14 +193,15 @@ def select():
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
                 _name='query', _value=request.vars.query or '',
-                requires=IS_NOT_EMPTY(error_message=T("Cannot be empty")))), TR(T('Update:'),
+                requires=IS_NOT_EMPTY(
+                    error_message=T("Cannot be empty")))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
-                 or '')), TR(T('Delete:'), INPUT(_name='delete_check',
+                                    or '')), TR(T('Delete:'), INPUT(_name='delete_check',
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
-                _action=URL(r=request,args=request.args))
+                _action=URL(r=request, args=request.args))
 
     tb = None
     if form.accepts(request.vars, formname=None):
@@ -211,28 +213,30 @@ def select():
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
-                                  % form.vars.update_fields))
+                                                      % form.vars.update_fields))
                 response.flash = T('%s %%{row} updated', nrows)
             elif form.vars.delete_check:
                 db(query).delete()
                 response.flash = T('%s %%{row} deleted', nrows)
             nrows = db(query).count()
             if orderby:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby))
+                rows = db(query, ignore_common_filters=True).select(limitby=(
+                    start, stop), orderby=eval_in_global_env(orderby))
             else:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop))
+                rows = db(query, ignore_common_filters=True).select(
+                    limitby=(start, stop))
         except Exception, e:
             import traceback
             tb = traceback.format_exc()
             (rows, nrows) = ([], 0)
-            response.flash = DIV(T('Invalid Query'),PRE(str(e)))
+            response.flash = DIV(T('Invalid Query'), PRE(str(e)))
     # begin handle upload csv
     csv_table = table or request.vars.table
     if csv_table:
-        formcsv = FORM(str(T('or import from csv file'))+" ",
-                       INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=csv_table,_name='table'),
-                       INPUT(_type='submit',_value=T('import')))
+        formcsv = FORM(str(T('or import from csv file')) + " ",
+                       INPUT(_type='file', _name='csvfile'),
+                       INPUT(_type='hidden', _value=csv_table, _name='table'),
+                       INPUT(_type='submit', _value=T('import')))
     else:
         formcsv = None
     if formcsv and formcsv.process().accepted:
@@ -241,7 +245,7 @@ def select():
                        request.vars.csvfile.file)
             response.flash = T('data uploaded')
         except Exception, e:
-            response.flash = DIV(T('unable to parse csv file'),PRE(str(e)))
+            response.flash = DIV(T('unable to parse csv file'), PRE(str(e)))
     # end handle upload csv
 
     return dict(
@@ -252,9 +256,9 @@ def select():
         nrows=nrows,
         rows=rows,
         query=request.vars.query,
-        formcsv = formcsv,
-        tb = tb,
-        )
+        formcsv=formcsv,
+        tb=tb,
+    )
 
 
 # ##########################################################
@@ -264,14 +268,16 @@ def select():
 
 def update():
     (db, table) = get_table(request)
-    keyed = hasattr(db[table],'_primarykey')
+    keyed = hasattr(db[table], '_primarykey')
     record = None
     if keyed:
         key = [f for f in request.vars if f in db[table]._primarykey]
         if key:
-            record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first()
+            record = db(db[table][key[0]] == request.vars[key[
+                        0]], ignore_common_filters=True).select().first()
     else:
-        record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first()
+        record = db(db[table].id == request.args(
+            2), ignore_common_filters=True).select().first()
 
     if not record:
         qry = query_by_table_type(table, db)
@@ -281,20 +287,21 @@ def update():
 
     if keyed:
         for k in db[table]._primarykey:
-            db[table][k].writable=False
+            db[table][k].writable = False
 
-    form = SQLFORM(db[table], record, deletable=True, delete_label=T('Check to delete'),
-                   ignore_rw=ignore_rw and not keyed,
-                   linkto=URL('select',
+    form = SQLFORM(
+        db[table], record, deletable=True, delete_label=T('Check to delete'),
+        ignore_rw=ignore_rw and not keyed,
+        linkto=URL('select',
                    args=request.args[:1]), upload=URL(r=request,
-                   f='download', args=request.args[:1]))
+                                                      f='download', args=request.args[:1]))
 
     if form.accepts(request.vars, session):
         session.flash = T('done!')
         qry = query_by_table_type(table, db)
         redirect(URL('select', args=request.args[:1],
                  vars=dict(query=qry)))
-    return dict(form=form,table=db[table])
+    return dict(form=form, table=db[table])
 
 
 # ##########################################################
@@ -305,11 +312,15 @@ def update():
 def state():
     return dict()
 
+
 def ccache():
     form = FORM(
-        P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
-        P(TAG.BUTTON(T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
-        P(TAG.BUTTON(T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+        P(TAG.BUTTON(
+            T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+        P(TAG.BUTTON(
+            T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+        P(TAG.BUTTON(
+            T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
     )
 
     if form.accepts(request.vars, session):
@@ -333,11 +344,16 @@ def ccache():
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy; hp=hpy()
+        from guppy import hpy
+        hp = hpy()
     except ImportError:
         hp = False
 
-    import shelve, os, copy, time, math
+    import shelve
+    import os
+    import copy
+    import time
+    import math
     from gluon import portalocker
 
     ram = {
@@ -382,9 +398,10 @@ def ccache():
             ram['keys'].append((key, GetInHMS(time.time() - value[0])))
 
     locker = open(os.path.join(request.folder,
-                                        'cache/cache.lock'), 'a')
+                               'cache/cache.lock'), 'a')
     portalocker.lock(locker, portalocker.LOCK_EX)
-    disk_storage = shelve.open(os.path.join(request.folder, 'cache/cache.shelve'))
+    disk_storage = shelve.open(
+        os.path.join(request.folder, 'cache/cache.shelve'))
     try:
         for key, value in disk_storage.items():
             if isinstance(value, dict):
@@ -415,7 +432,8 @@ def ccache():
     total['misses'] = ram['misses'] + disk['misses']
     total['keys'] = ram['keys'] + disk['keys']
     try:
-        total['ratio'] = total['hits'] * 100 / (total['hits'] + total['misses'])
+        total['ratio'] = total['hits'] * 100 / (total['hits'] +
+                                                total['misses'])
     except (KeyError, ZeroDivisionError):
         total['ratio'] = 0
 
diff --git a/applications/welcome/controllers/default.py b/applications/welcome/controllers/default.py
index 4c4b563d..9ac34c21 100644
--- a/applications/welcome/controllers/default.py
+++ b/applications/welcome/controllers/default.py
@@ -9,6 +9,7 @@
 ## - call exposes all registered services (none by default)
 #########################################################################
 
+
 def index():
     """
     example action using the internationalization operator T and flash
@@ -20,6 +21,7 @@ def index():
     response.flash = T("Welcome to web2py!")
     return dict(message=T('Hello World'))
 
+
 def user():
     """
     exposes:
@@ -42,7 +44,7 @@ def download():
     allows downloading of uploaded files
     http://..../[app]/default/download/[filename]
     """
-    return response.download(request,db)
+    return response.download(request, db)
 
 
 def call():
diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py
index 26d28122..2cd6638e 100644
--- a/applications/welcome/models/db.py
+++ b/applications/welcome/models/db.py
@@ -16,7 +16,7 @@ else:
     ## connect to Google BigTable (optional 'google:datastore://namespace')
     db = DAL('google:datastore')
     ## store sessions and tickets there
-    session.connect(request, response, db = db)
+    session.connect(request, response, db=db)
     ## or store session in Memcache, Redis, etc.
     ## from gluon.contrib.memdb import MEMDB
     ## from google.appengine.api.memcache import Client
@@ -47,7 +47,7 @@ crud, service, plugins = Crud(db), Service(), PluginManager()
 auth.define_tables(username=False, signature=False)
 
 ## configure email
-mail=auth.settings.mailer
+mail = auth.settings.mailer
 mail.settings.server = 'logging' or 'smtp.gmail.com:587'
 mail.settings.sender = 'you@gmail.com'
 mail.settings.login = 'username:password'
@@ -60,7 +60,7 @@ auth.settings.reset_password_requires_verification = True
 ## if you need to use OpenID, Facebook, MySpace, Twitter, Linkedin, etc.
 ## register with janrain.com, write your domain:api_key in private/janrain.key
 from gluon.contrib.login_methods.rpx_account import use_janrain
-use_janrain(auth,filename='private/janrain.key')
+use_janrain(auth, filename='private/janrain.key')
 
 #########################################################################
 ## Define your tables below (or better in another model file) for example
diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py
index 81010a99..ae2cdbf2 100644
--- a/applications/welcome/models/menu.py
+++ b/applications/welcome/models/menu.py
@@ -5,7 +5,8 @@
 ## Customize your APP title, subtitle and menus here
 #########################################################################
 
-response.title = ' '.join(word.capitalize() for word in request.application.split('_'))
+response.title = ' '.join(
+    word.capitalize() for word in request.application.split('_'))
 response.subtitle = T('customize me!')
 
 ## read more at http://dev.w3.org/html5/markup/meta.name.html
@@ -22,78 +23,113 @@ response.google_analytics_id = None
 #########################################################################
 
 response.menu = [
-    (T('Home'), False, URL('default','index'), [])
-    ]
+    (T('Home'), False, URL('default', 'index'), [])
+]
 
 #########################################################################
 ## provide shortcuts for development. remove in production
 #########################################################################
 
+
 def _():
     # shortcuts
     app = request.application
     ctr = request.controller
     # useful links to internal and external resources
-    response.menu+=[
-        (SPAN('web2py',_class='highlighted'),False, 'http://web2py.com', [
-                (T('My Sites'),False,URL('admin','default','site')),
-                (T('This App'),False,URL('admin','default','design/%s' % app), [
-                        (T('Controller'),False,
-                         URL('admin','default','edit/%s/controllers/%s.py' % (app,ctr))),
-                        (T('View'),False,
-                         URL('admin','default','edit/%s/views/%s' % (app,response.view))),
-                        (T('Layout'),False,
-                         URL('admin','default','edit/%s/views/layout.html' % app)),
-                        (T('Stylesheet'),False,
-                         URL('admin','default','edit/%s/static/css/web2py.css' % app)),
-                        (T('DB Model'),False,
-                         URL('admin','default','edit/%s/models/db.py' % app)),
-                        (T('Menu Model'),False,
-                         URL('admin','default','edit/%s/models/menu.py' % app)),
-                        (T('Database'),False, URL(app,'appadmin','index')),
-                        (T('Errors'),False, URL('admin','default','errors/' + app)),
-                        (T('About'),False, URL('admin','default','about/' + app)),
+    response.menu += [
+        (SPAN('web2py', _class='highlighted'), False, 'http://web2py.com', [
+        (T('My Sites'), False, URL('admin', 'default', 'site')),
+        (T('This App'), False, URL('admin', 'default', 'design/%s' % app), [
+        (T('Controller'), False,
+         URL(
+         'admin', 'default', 'edit/%s/controllers/%s.py' % (app, ctr))),
+        (T('View'), False,
+         URL(
+         'admin', 'default', 'edit/%s/views/%s' % (app, response.view))),
+        (T('Layout'), False,
+         URL(
+         'admin', 'default', 'edit/%s/views/layout.html' % app)),
+        (T('Stylesheet'), False,
+         URL(
+         'admin', 'default', 'edit/%s/static/css/web2py.css' % app)),
+        (T('DB Model'), False,
+         URL(
+         'admin', 'default', 'edit/%s/models/db.py' % app)),
+        (T('Menu Model'), False,
+         URL(
+         'admin', 'default', 'edit/%s/models/menu.py' % app)),
+        (T('Database'), False, URL(app, 'appadmin', 'index')),
+        (T('Errors'), False, URL(
+         'admin', 'default', 'errors/' + app)),
+        (T('About'), False, URL(
+         'admin', 'default', 'about/' + app)),
+        ]),
+            ('web2py.com', False, 'http://www.web2py.com', [
+             (T('Download'), False,
+              'http://www.web2py.com/examples/default/download'),
+             (T('Support'), False,
+              'http://www.web2py.com/examples/default/support'),
+             (T('Demo'), False, 'http://web2py.com/demo_admin'),
+             (T('Quick Examples'), False,
+              'http://web2py.com/examples/default/examples'),
+             (T('FAQ'), False, 'http://web2py.com/AlterEgo'),
+             (T('Videos'), False,
+              'http://www.web2py.com/examples/default/videos/'),
+             (T('Free Applications'),
+              False, 'http://web2py.com/appliances'),
+             (T('Plugins'), False, 'http://web2py.com/plugins'),
+             (T('Layouts'), False, 'http://web2py.com/layouts'),
+             (T('Recipes'), False, 'http://web2pyslices.com/'),
+             (T('Semantic'), False, 'http://web2py.com/semantic'),
+             ]),
+            (T('Documentation'), False, 'http://www.web2py.com/book', [
+             (T('Preface'), False,
+              'http://www.web2py.com/book/default/chapter/00'),
+             (T('Introduction'), False,
+              'http://www.web2py.com/book/default/chapter/01'),
+             (T('Python'), False,
+              'http://www.web2py.com/book/default/chapter/02'),
+             (T('Overview'), False,
+              'http://www.web2py.com/book/default/chapter/03'),
+             (T('The Core'), False,
+              'http://www.web2py.com/book/default/chapter/04'),
+             (T('The Views'), False,
+              'http://www.web2py.com/book/default/chapter/05'),
+             (T('Database'), False,
+              'http://www.web2py.com/book/default/chapter/06'),
+             (T('Forms and Validators'), False,
+              'http://www.web2py.com/book/default/chapter/07'),
+             (T('Email and SMS'), False,
+              'http://www.web2py.com/book/default/chapter/08'),
+             (T('Access Control'), False,
+              'http://www.web2py.com/book/default/chapter/09'),
+             (T('Services'), False,
+              'http://www.web2py.com/book/default/chapter/10'),
+             (T('Ajax Recipes'), False,
+              'http://www.web2py.com/book/default/chapter/11'),
+             (T('Components and Plugins'), False,
+              'http://www.web2py.com/book/default/chapter/12'),
+             (T('Deployment Recipes'), False,
+              'http://www.web2py.com/book/default/chapter/13'),
+             (T('Other Recipes'), False,
+              'http://www.web2py.com/book/default/chapter/14'),
+             (T('Buy this book'), False,
+              'http://stores.lulu.com/web2py'),
+             ]),
+            (T('Community'), False, None, [
+             (T('Groups'), False,
+              'http://www.web2py.com/examples/default/usergroups'),
+                        (T('Twitter'), False, 'http://twitter.com/web2py'),
+                        (T('Live Chat'), False,
+                         'http://webchat.freenode.net/?channels=web2py'),
                         ]),
-                ('web2py.com',False,'http://www.web2py.com', [
-                        (T('Download'),False,'http://www.web2py.com/examples/default/download'),
-                        (T('Support'),False,'http://www.web2py.com/examples/default/support'),
-                        (T('Demo'),False,'http://web2py.com/demo_admin'),
-                        (T('Quick Examples'),False,'http://web2py.com/examples/default/examples'),
-                        (T('FAQ'),False,'http://web2py.com/AlterEgo'),
-                        (T('Videos'),False,'http://www.web2py.com/examples/default/videos/'),
-                        (T('Free Applications'),False,'http://web2py.com/appliances'),
-                        (T('Plugins'),False,'http://web2py.com/plugins'),
-                        (T('Layouts'),False,'http://web2py.com/layouts'),
-                        (T('Recipes'),False,'http://web2pyslices.com/'),
-                        (T('Semantic'),False,'http://web2py.com/semantic'),
-                        ]),
-                (T('Documentation'),False,'http://www.web2py.com/book', [
-                        (T('Preface'),False,'http://www.web2py.com/book/default/chapter/00'),
-                        (T('Introduction'),False,'http://www.web2py.com/book/default/chapter/01'),
-                        (T('Python'),False,'http://www.web2py.com/book/default/chapter/02'),
-                        (T('Overview'),False,'http://www.web2py.com/book/default/chapter/03'),
-                        (T('The Core'),False,'http://www.web2py.com/book/default/chapter/04'),
-                        (T('The Views'),False,'http://www.web2py.com/book/default/chapter/05'),
-                        (T('Database'),False,'http://www.web2py.com/book/default/chapter/06'),
-                        (T('Forms and Validators'),False,'http://www.web2py.com/book/default/chapter/07'),
-                        (T('Email and SMS'),False,'http://www.web2py.com/book/default/chapter/08'),
-                        (T('Access Control'),False,'http://www.web2py.com/book/default/chapter/09'),
-                        (T('Services'),False,'http://www.web2py.com/book/default/chapter/10'),
-                        (T('Ajax Recipes'),False,'http://www.web2py.com/book/default/chapter/11'),
-                        (T('Components and Plugins'),False,'http://www.web2py.com/book/default/chapter/12'),
-                        (T('Deployment Recipes'),False,'http://www.web2py.com/book/default/chapter/13'),
-                        (T('Other Recipes'),False,'http://www.web2py.com/book/default/chapter/14'),
-                        (T('Buy this book'),False,'http://stores.lulu.com/web2py'),
-                        ]),
-                (T('Community'),False, None, [
-                        (T('Groups'),False,'http://www.web2py.com/examples/default/usergroups'),
-                        (T('Twitter'),False,'http://twitter.com/web2py'),
-                        (T('Live Chat'),False,'http://webchat.freenode.net/?channels=web2py'),
-                        ]),
-                (T('Plugins'),False,None, [
-                        ('plugin_wiki',False,'http://web2py.com/examples/default/download'),
-                        (T('Other Plugins'),False,'http://web2py.com/plugins'),
-                        (T('Layout Plugins'),False,'http://web2py.com/layouts'),
+                (T('Plugins'), False, None, [
+                        ('plugin_wiki', False,
+                         'http://web2py.com/examples/default/download'),
+                        (T('Other Plugins'), False,
+                         'http://web2py.com/plugins'),
+                        (T('Layout Plugins'),
+                         False, 'http://web2py.com/layouts'),
                         ])
                 ]
          )]

From 6cda7a29fc59081034d67dc31a5a5648560f8e01 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 14:22:42 -0500
Subject: [PATCH 41/49] pep8 in scripts/*.py

---
 VERSION                            |   2 +-
 scripts/autoroutes.py              |  52 +-
 scripts/bench.py                   |   7 +-
 scripts/cleancss.py                |  25 +-
 scripts/cleanhtml.py               |  79 +--
 scripts/cleanjs.py                 |  18 +-
 scripts/contentparser.py           |  12 +-
 scripts/cpdb.py                    | 804 +++++++++++++++--------------
 scripts/cpplugin.py                |  34 +-
 scripts/dbsessions2trash.py        |   9 +-
 scripts/dict_diff.py               |  27 +-
 scripts/extract_mysql_models.py    |  92 ++--
 scripts/extract_pgsql_models.py    |  56 +-
 scripts/fixws.py                   |  11 +-
 scripts/layout_make.py             |  52 +-
 scripts/make_min_web2py.py         |  59 ++-
 scripts/rmorphans.py               |  12 +-
 scripts/sessions2trash.py          |  34 +-
 scripts/standalone_exe_cxfreeze.py |  60 +--
 scripts/sync_languages.py          |  20 +-
 scripts/tickets2db.py              |   8 +-
 scripts/tickets2email.py           |   4 +-
 scripts/update_web2py.py           |  14 +-
 scripts/zip_static_files.py        |  10 +-
 24 files changed, 781 insertions(+), 720 deletions(-)

diff --git a/VERSION b/VERSION
index 4e40b239..ca1f2b22 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 14:13:30) dev
+Version 2.1.1 (2012-10-19 14:22:39) dev
diff --git a/scripts/autoroutes.py b/scripts/autoroutes.py
index c1119ab0..aaef82dd 100644
--- a/scripts/autoroutes.py
+++ b/scripts/autoroutes.py
@@ -40,48 +40,58 @@ domain3.com /app3/defcon3
 '''
 if not config.strip():
     try:
-        config_file = open('routes.conf','r')
+        config_file = open('routes.conf', 'r')
         try:
             config = config_file.read()
         finally:
             config_file.close()
     except:
-        config=''
+        config = ''
+
 
 def auto_in(apps):
     routes = [
-        ('/robots.txt','/welcome/static/robots.txt'),
-        ('/favicon.ico','/welcome/static/favicon.ico'),
-        ('/admin$anything','/admin$anything'),
-        ]
-    for domain,path in [x.strip().split() for x in apps.split('\n') if x.strip() and not x.strip().startswith('#')]:
-        if not path.startswith('/'): path = '/'+path
-        if path.endswith('/'): path = path[:-1]
+        ('/robots.txt', '/welcome/static/robots.txt'),
+        ('/favicon.ico', '/welcome/static/favicon.ico'),
+        ('/admin$anything', '/admin$anything'),
+    ]
+    for domain, path in [x.strip().split() for x in apps.split('\n') if x.strip() and not x.strip().startswith('#')]:
+        if not path.startswith('/'):
+            path = '/' + path
+        if path.endswith('/'):
+            path = path[:-1]
         app = path.split('/')[1]
         routes += [
-            ('.*:https?://(.*\.)?%s:$method /' % domain,'%s' % path),
-            ('.*:https?://(.*\.)?%s:$method /static/$anything' % domain,'/%s/static/$anything' % app),
-            ('.*:https?://(.*\.)?%s:$method /appadmin/$anything' % domain,'/%s/appadmin/$anything' % app),
-            ('.*:https?://(.*\.)?%s:$method /$anything' % domain,'%s/$anything' % path),
-            ]
+            ('.*:https?://(.*\.)?%s:$method /' % domain, '%s' % path),
+            ('.*:https?://(.*\.)?%s:$method /static/$anything' %
+             domain, '/%s/static/$anything' % app),
+            ('.*:https?://(.*\.)?%s:$method /appadmin/$anything' %
+             domain, '/%s/appadmin/$anything' % app),
+            ('.*:https?://(.*\.)?%s:$method /$anything' %
+             domain, '%s/$anything' % path),
+        ]
     return routes
 
+
 def auto_out(apps):
     routes = []
-    for domain,path in [x.strip().split() for x in apps.split('\n') if x.strip() and not x.strip().startswith('#')]:
-        if not path.startswith('/'): path = '/'+path
-        if path.endswith('/'): path = path[:-1]
+    for domain, path in [x.strip().split() for x in apps.split('\n') if x.strip() and not x.strip().startswith('#')]:
+        if not path.startswith('/'):
+            path = '/' + path
+        if path.endswith('/'):
+            path = path[:-1]
         app = path.split('/')[1]
         routes += [
-            ('/%s/static/$anything' % app,'/static/$anything'),
+            ('/%s/static/$anything' % app, '/static/$anything'),
             ('/%s/appadmin/$anything' % app, '/appadmin/$anything'),
             ('%s/$anything' % path, '/$anything'),
-            ]
+        ]
     return routes
 
 routes_in = auto_in(config)
 routes_out = auto_out(config)
 
+
 def __routes_doctest():
     '''
     Dummy function for doctesting autoroutes.py.
@@ -128,7 +138,8 @@ if __name__ == '__main__':
     try:
         import gluon.main
     except ImportError:
-        import sys, os
+        import sys
+        import os
         os.chdir(os.path.dirname(os.path.dirname(__file__)))
         sys.path.append(os.path.dirname(os.path.dirname(__file__)))
         import gluon.main
@@ -138,4 +149,3 @@ if __name__ == '__main__':
 
     import doctest
     doctest.testmod()
-
diff --git a/scripts/bench.py b/scripts/bench.py
index ffb98452..75e1917b 100644
--- a/scripts/bench.py
+++ b/scripts/bench.py
@@ -5,11 +5,12 @@ import urllib2
 
 n = int(sys.argv[1])
 url = sys.argv[2]
-headers = {"Accept-Language" : "en" }
+headers = {"Accept-Language": "en"}
 req = urllib2.Request(url, None, headers)
 
 t0 = time.time()
 for k in xrange(n):
     data = urllib2.urlopen(req).read()
-print (time.time()-t0)/n
-if n==1: print data
+print (time.time() - t0) / n
+if n == 1:
+    print data
diff --git a/scripts/cleancss.py b/scripts/cleancss.py
index 7380773f..c2d2a113 100755
--- a/scripts/cleancss.py
+++ b/scripts/cleancss.py
@@ -8,26 +8,25 @@ filename = sys.argv[1]
 
 datafile = open(filename, 'r')
 try:
-    data = '\n'+datafile.read()
+    data = '\n' + datafile.read()
 finally:
     datafile.close()
 SPACE = '\n    ' if '-n' in sys.argv[1:] else ' '
 
-data = re.compile('(?<!\:)//(?P<a>.*)').sub('/* \g<a> */',data)
+data = re.compile('(?<!\:)//(?P<a>.*)').sub('/* \g<a> */', data)
 data = re.compile('[ ]+').sub(' ', data)
-data = re.compile('\s*{\s*').sub(' {'+SPACE, data)
-data = re.compile('\s*;\s*').sub(';'+SPACE, data)
+data = re.compile('\s*{\s*').sub(' {' + SPACE, data)
+data = re.compile('\s*;\s*').sub(';' + SPACE, data)
 data = re.compile(',\s*').sub(', ', data)
-data = re.compile('\s*\*/\s*').sub('*/'+SPACE, data)
-data = re.compile('\s*}\s*').sub(SPACE+'}\n', data)
+data = re.compile('\s*\*/\s*').sub('*/' + SPACE, data)
+data = re.compile('\s*}\s*').sub(SPACE + '}\n', data)
 data = re.compile('\n\s*\n').sub('\n', data)
-data = re.compile(';\s+/\*').sub('; /*',data)
-data = re.compile('\*/\s+/\*').sub(' ',data)
+data = re.compile(';\s+/\*').sub('; /*', data)
+data = re.compile('\*/\s+/\*').sub(' ', data)
 data = re.compile('[ ]+\n').sub('\n', data)
-data = re.compile('\n\s*/[\*]+(?P<a>.*?)[\*]+/',re.DOTALL).sub(
-    '\n/*\g<a>*/\n',data)
-data = re.compile('[ \t]+(?P<a>\S.+?){').sub('\g<a>{',data)
-data = data.replace('}','}\n')
+data = re.compile('\n\s*/[\*]+(?P<a>.*?)[\*]+/', re.DOTALL).sub(
+    '\n/*\g<a>*/\n', data)
+data = re.compile('[ \t]+(?P<a>\S.+?){').sub('\g<a>{', data)
+data = data.replace('}', '}\n')
 
 print data
-
diff --git a/scripts/cleanhtml.py b/scripts/cleanhtml.py
index 0bbfe823..e0df55b2 100755
--- a/scripts/cleanhtml.py
+++ b/scripts/cleanhtml.py
@@ -1,51 +1,55 @@
 import sys
 import re
 
+
 def cleancss(text):
-    text=re.compile('\s+').sub(' ', text)
-    text=re.compile('\s*(?P<a>,|:)\s*').sub('\g<a> ', text)
-    text=re.compile('\s*;\s*').sub(';\n    ', text)
-    text=re.compile('\s*\{\s*').sub(' {\n    ', text)
-    text=re.compile('\s*\}\s*').sub('\n}\n\n', text)
+    text = re.compile('\s+').sub(' ', text)
+    text = re.compile('\s*(?P<a>,|:)\s*').sub('\g<a> ', text)
+    text = re.compile('\s*;\s*').sub(';\n    ', text)
+    text = re.compile('\s*\{\s*').sub(' {\n    ', text)
+    text = re.compile('\s*\}\s*').sub('\n}\n\n', text)
     return text
 
+
 def cleanhtml(text):
-    text=text.lower()
-    r=re.compile('\<script.+?/script\>', re.DOTALL)
-    scripts=r.findall(text)
-    text=r.sub('<script />', text)
-    r=re.compile('\<style.+?/style\>', re.DOTALL)
-    styles=r.findall(text)
-    text=r.sub('<style />', text)
-    text=re.compile(
+    text = text.lower()
+    r = re.compile('\<script.+?/script\>', re.DOTALL)
+    scripts = r.findall(text)
+    text = r.sub('<script />', text)
+    r = re.compile('\<style.+?/style\>', re.DOTALL)
+    styles = r.findall(text)
+    text = r.sub('<style />', text)
+    text = re.compile(
         '<(?P<tag>(input|meta|link|hr|br|img|param))(?P<any>[^\>]*)\s*(?<!/)>')\
         .sub('<\g<tag>\g<any> />', text)
-    text=text.replace('\n', ' ')
-    text=text.replace('>', '>\n')
-    text=text.replace('<', '\n<')
-    text=re.compile('\s*\n\s*').sub('\n', text)
-    lines=text.split('\n')
-    (indent, newlines)=(0, [])
+    text = text.replace('\n', ' ')
+    text = text.replace('>', '>\n')
+    text = text.replace('<', '\n<')
+    text = re.compile('\s*\n\s*').sub('\n', text)
+    lines = text.split('\n')
+    (indent, newlines) = (0, [])
     for line in lines:
-        if line[:2]=='</': indent=indent-1
-        newlines.append(indent*'  '+line)
-        if not line[:2]=='</' and line[-1:]=='>' and \
-                not line[-2:] in ['/>', '->']: indent=indent+1
-    text='\n'.join(newlines)
-    text=re.compile('\<div(?P<a>( .+)?)\>\s+\</div\>').sub('<div\g<a>></div>',text)
-    text=re.compile('\<a(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</a\>').sub('<a\g<a>>\g<b></a>',text)
-    text=re.compile('\<b(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</b\>').sub('<b\g<a>>\g<b></b>',text)
-    text=re.compile('\<i(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</i\>').sub('<i\g<a>>\g<b></i>',text)
-    text=re.compile('\<span(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</span\>').sub('<span\g<a>>\g<b></span>',text)
-    text=re.compile('\s+\<br(?P<a>.*?)\/\>').sub('<br\g<a>/>',text)
-    text=re.compile('\>(?P<a>\s+)(?P<b>[\.\,\:\;])').sub('>\g<b>\g<a>',text)
-    text=re.compile('\n\s*\n').sub('\n',text)
+        if line[:2] == '</': indent = indent - 1
+        newlines.append(indent * '  ' + line)
+        if not line[:2] == '</' and line[-1:] == '>' and \
+            not line[-2:] in ['/>', '->']: indent = indent + 1
+    text = '\n'.join(newlines)
+    text = re.compile(
+        '\<div(?P<a>( .+)?)\>\s+\</div\>').sub('<div\g<a>></div>', text)
+    text = re.compile('\<a(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</a\>').sub('<a\g<a>>\g<b></a>', text)
+    text = re.compile('\<b(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</b\>').sub('<b\g<a>>\g<b></b>', text)
+    text = re.compile('\<i(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</i\>').sub('<i\g<a>>\g<b></i>', text)
+    text = re.compile('\<span(?P<a>( .+)?)\>\s+(?P<b>[\w\s\(\)\/]+?)\s+\</span\>').sub('<span\g<a>>\g<b></span>', text)
+    text = re.compile('\s+\<br(?P<a>.*?)\/\>').sub('<br\g<a>/>', text)
+    text = re.compile('\>(?P<a>\s+)(?P<b>[\.\,\:\;])').sub('>\g<b>\g<a>', text)
+    text = re.compile('\n\s*\n').sub('\n', text)
     for script in scripts:
-        text=text.replace('<script />', script, 1)
+        text = text.replace('<script />', script, 1)
     for style in styles:
-        text=text.replace('<style />', cleancss(style), 1)
+        text = text.replace('<style />', cleancss(style), 1)
     return text
 
+
 def read_file(filename):
     f = open(filename, 'r')
     try:
@@ -53,9 +57,8 @@ def read_file(filename):
     finally:
         f.close()
 
-file=sys.argv[1]
-if file[-4:]=='.css':
+file = sys.argv[1]
+if file[-4:] == '.css':
     print cleancss(read_file(file))
-if file[-5:]=='.html':
+if file[-5:] == '.html':
     print cleanhtml(read_file(file))
-
diff --git a/scripts/cleanjs.py b/scripts/cleanjs.py
index 6a09b979..c15d2a67 100644
--- a/scripts/cleanjs.py
+++ b/scripts/cleanjs.py
@@ -1,17 +1,17 @@
 import re
 
+
 def cleanjs(text):
-    text = re.sub('\s*}\s*','\n}\n',text)
-    text = re.sub('\s*{\s*',' {\n',text)
-    text = re.sub('\s*;\s*',';\n',text)
-    text = re.sub('\s*,\s*',', ',text)
-    text = re.sub('\s*(?P<a>[\+\-\*/\=]+)\s*',' \g<a> ',text)
+    text = re.sub('\s*}\s*', '\n}\n', text)
+    text = re.sub('\s*{\s*', ' {\n', text)
+    text = re.sub('\s*;\s*', ';\n', text)
+    text = re.sub('\s*,\s*', ', ', text)
+    text = re.sub('\s*(?P<a>[\+\-\*/\=]+)\s*', ' \g<a> ', text)
     lines = text.split('\n')
-    text=''
-    indent=0
+    text = ''
+    indent = 0
     for line in lines:
-        rline=line.strip()
+        rline = line.strip()
         if rline:
             pass
     return text
-
diff --git a/scripts/contentparser.py b/scripts/contentparser.py
index f679d65d..89385e2d 100755
--- a/scripts/contentparser.py
+++ b/scripts/contentparser.py
@@ -22,7 +22,7 @@ Internet connection is required to perform the update.
 OVERRIDE = [
     ('.pdb', 'chemical/x-pdb'),
     ('.xyz', 'chemical/x-pdb')
-    ]
+]
 
 
 class MIMEParser(dict):
@@ -72,14 +72,15 @@ if __name__ == '__main__':
     sys.stdout.write('Checking freedesktop.org database version:')
     sys.stdout.flush()
     try:
-        search = re.search('(?P<url>http://freedesktop.org/.+?/shared-mime-info-(?P<version>.+?)\.tar\.(?P<type>[gb]z2?))',
+        search = re.search(
+            '(?P<url>http://freedesktop.org/.+?/shared-mime-info-(?P<version>.+?)\.tar\.(?P<type>[gb]z2?))',
             urllib.urlopen('http://www.freedesktop.org/wiki/Software/shared-mime-info').read())
         url = search.group('url')
-        assert url != None
+        assert url is not None
         nversion = search.group('version')
-        assert nversion != None
+        assert nversion is not None
         ftype = search.group('type')
-        assert ftype != None
+        assert ftype is not None
         sys.stdout.write('\t[OK] version %s\n' % nversion)
     except:
         sys.stdout.write('\t[ERROR] unknown version\n')
@@ -129,4 +130,3 @@ if __name__ == '__main__':
         sys.stdout.write('\t\t\t[OK] done\n')
     except Exception, e:
         sys.stdout.write('\t\t\t[ERROR] %s\n' % e)
-
diff --git a/scripts/cpdb.py b/scripts/cpdb.py
index a269bdf1..0a2bb7f8 100644
--- a/scripts/cpdb.py
+++ b/scripts/cpdb.py
@@ -1,269 +1,278 @@
 
-import os,sys
-from collections import deque                                                      
-import string                                                      
+import os
+import sys
+from collections import deque
+import string
 import argparse
-import cStringIO,operator
+import cStringIO
+import operator
 import cPickle as pickle
 from collections import deque
 import math
 import re
 import cmd
 import readline
-try:    
+try:
     from gluon import DAL
 except ImportError as err:
-    print('gluon path not found')    
+    print('gluon path not found')
+
 
 class refTable(object):
     def __init__(self):
         self.columns = None
         self.rows = None
-    
-    def getcolHeader(self,colHeader):
+
+    def getcolHeader(self, colHeader):
         return "{0}".format(' | '.join([string.join(string.strip('**{0}**'.format(item)),
-                                                        '') for item in colHeader]))
-            
-        
-    def wrapTable(self,rows, hasHeader=False, headerChar='-', delim=' | ', justify='left',
-               separateRows=False, prefix='', postfix='', wrapfunc=lambda x:x):
-        
+                                                    '') for item in colHeader]))
+
+    def wrapTable(
+        self, rows, hasHeader=False, headerChar='-', delim=' | ', justify='left',
+            separateRows=False, prefix='', postfix='', wrapfunc=lambda x: x):
+
         def rowWrapper(row):
-            
+
             '''---
-                    newRows is returned like 
+                    newRows is returned like
                             [['w'], ['x'], ['y'], ['z']]
-                                                                    ---'''                    
+                                                                    ---'''
             newRows = [wrapfunc(item).split('\n') for item in row]
             self.rows = newRows
             '''---
-                        rowList gives like newRows but 
+                        rowList gives like newRows but
                             formatted like [[w, x, y, z]]
                                                                 ---'''
-            rowList = [[substr or '' for substr in item] for item in map(None,*newRows)] 
+            rowList = [[substr or '' for substr in item]
+                       for item in map(None, *newRows)]
             return rowList
-        
+
         logicalRows = [rowWrapper(row) for row in rows]
-        
-        columns = map(None,*reduce(operator.add,logicalRows))
-        self.columns = columns 
-        
-        maxWidths = [max(\
-                          [len(str\
-                                  (item)) for \
-                                               item in column]\
-                                  ) for column \
-                                               in columns]
-        
-        rowSeparator = headerChar * (len(prefix) + len(postfix) + sum(maxWidths) + \
-                           len(delim)*(len(maxWidths)-1))
-        
-        justify = {'center'\
-                            :str\
-                                .center, 
-                   'right'\
-                           :str\
-                               .rjust, 
-                   'left'\
-                          :str.\
-                                ljust\
-                                      }[justify\
-                                               .lower(\
-                                                       )]
-                   
-        output=cStringIO.StringIO()
-        
-        if separateRows: 
+
+        columns = map(None, *reduce(operator.add, logicalRows))
+        self.columns = columns
+
+        maxWidths = [max(
+                     [len(str
+                        (item)) for
+                      item in column]
+                     ) for column
+                     in columns]
+
+        rowSeparator = headerChar * (len(prefix) + len(postfix) + sum(maxWidths) +
+                                     len(delim) * (len(maxWidths) - 1))
+
+        justify = {'center': str
+                   .center,
+                   'right': str
+                   .rjust,
+                   'left': str.
+                   ljust
+                   }[justify
+                     .lower(
+                     )]
+
+        output = cStringIO.StringIO()
+
+        if separateRows:
             print >> output, rowSeparator
-        
+
         for physicalRows in logicalRows:
             for row in physicalRows:
                 print >> output,\
-             prefix + delim.join([\
-     justify(str(item),width) for (\
-  item,width) in zip(row,maxWidths)]\
-                            ) + postfix
-                            
-            if separateRows or hasHeader: 
-                print >> output, rowSeparator; hasHeader=False
+                    prefix + delim.join([
+                                        justify(str(item), width) for (
+                                        item, width) in zip(row, maxWidths)]
+                                        ) + postfix
+
+            if separateRows or hasHeader:
+                print >> output, rowSeparator
+                hasHeader = False
         return output.getvalue()
-    
-    def wrap_onspace(self,text,width):
-        return reduce(lambda line, word, width=width: '{0}{1}{2}'\
-                      .format(line\
-                       ,' \n'[(len(\
-                line[line.rfind('\n'\
-                      ) + 1:]) + len(\
-             word.split('\n',1)[0]) >=\
-          width)],word),text.split(' '))
-        
-    def wrap_onspace_strict(self,text,width):
-        wordRegex = re.compile(r'\S{'+str(width)+r',}')
-        return self.wrap_onspace(\
-                                  wordRegex.sub(\
-                                  lambda m: self.\
-                                      wrap_always(\
-                              m.group(),width),text\
-                                             ),width)
-    
-    def wrap_always(self,text,width):
-        return '\n'.join(\
- [ text[width*i:width*(i+1\
-        )] for i in xrange(\
-       int(math.ceil(1.*len(\
-             text)/width))) ])
+
+    def wrap_onspace(self, text, width):
+        return reduce(lambda line, word, width=width: '{0}{1}{2}'
+                      .format(line, ' \n'[(len(
+                                           line[line.rfind('\n'
+                                                           ) + 1:]) + len(
+                                           word.split('\n', 1)[0]) >=
+                                           width)], word), text.split(' '))
+
+    def wrap_onspace_strict(self, text, width):
+        wordRegex = re.compile(r'\S{' + str(width) + r',}')
+        return self.wrap_onspace(
+            wordRegex.sub(
+                lambda m: self.
+                wrap_always(
+                    m.group(), width), text
+            ), width)
+
+    def wrap_always(self, text, width):
+        return '\n'.join(
+            [text[width * i:width * (i + 1
+                                     )] for i in xrange(
+             int(math.ceil(1. * len(
+             text) / width)))])
+
 
 class tableHelper():
-    def __init__(self):  
+    def __init__(self):
         self.oTable = refTable()
-          
-    def getAsRows(self,data):
-        return [row.strip().split(',')  for row in data.splitlines()]
-    
-    def getTable_noWrap(self,data,header=None):
+
+    def getAsRows(self, data):
+        return [row.strip().split(',') for row in data.splitlines()]
+
+    def getTable_noWrap(self, data, header=None):
         rows = self.getAsRows(data)
-        if header is not None:hRows = [header]+rows
-        else:hRows = rows        
+        if header is not None:
+            hRows = [header] + rows
+        else:
+            hRows = rows
         table = self.oTable.wrapTable(hRows, hasHeader=True)
         return table
-    
-    def getTable_Wrap(self,data,wrapStyle,header=None,width=65): 
-        wrapper = None        
-        if len(wrapStyle) > 1:            
+
+    def getTable_Wrap(self, data, wrapStyle, header=None, width=65):
+        wrapper = None
+        if len(wrapStyle) > 1:
             rows = self.getAsRows(data)
-            if header is not None:hRows = [header]+rows
-            else:hRows = rows
-            
+            if header is not None:
+                hRows = [header] + rows
+            else:
+                hRows = rows
+
             for wrapper in (self.oTable.wrap_always,
-                                    self.oTable.wrap_onspace,
-                                            self.oTable.wrap_onspace_strict):
-                return self.oTable.wrapTable(hRows\
-                                    ,hasHeader=True\
-                                  ,separateRows=True\
-                                         ,prefix='| '\
-                                         ,postfix=' |'\
-                                              ,wrapfunc\
-                                              =lambda x:\
-                                         wrapper(x,width))                         
+                            self.oTable.wrap_onspace,
+                            self.oTable.wrap_onspace_strict):
+                return self.oTable.wrapTable(hRows, hasHeader=True, separateRows=True, prefix='| ', postfix=' |', wrapfunc=lambda x:
+                                             wrapper(x, width))
         else:
-            return self.getTable_noWrap(data,header)
-        
-    def getAsErrorTable(self,err):
-        return self.getTable_Wrap(err,None)
+            return self.getTable_noWrap(data, header)
+
+    def getAsErrorTable(self, err):
+        return self.getTable_Wrap(err, None)
 
 
 class console:
-    def __init__(self,prompt,banner=None):
-        self.prompt=prompt
-        self.banner=banner
-        self.commands={}
-        self.commandSort=[]
-        self.db=None
+    def __init__(self, prompt, banner=None):
+        self.prompt = prompt
+        self.banner = banner
+        self.commands = {}
+        self.commandSort = []
+        self.db = None
 
         for i in dir(self):
-            if "cmd_"==i[:4]:
-                cmd=i.split("cmd_")[1].lower()
-                self.commands[cmd]=getattr(self,i)
-                try:self.commandSort.append((int(self\
-                            .commands[cmd].__doc__.split(\
-                                        "|")[0]),cmd))
-                except:pass
-        
+            if "cmd_" == i[:4]:
+                cmd = i.split("cmd_")[1].lower()
+                self.commands[cmd] = getattr(self, i)
+                try:
+                    self.commandSort.append((int(self
+                                                 .commands[cmd].__doc__.split(
+                                                 "|")[0]), cmd))
+                except:
+                    pass
+
         self.commandSort.sort()
-        self.commandSort=[i[1] for i in self.commandSort]
-        
-        self.var_DEBUG=False
-        self.var_tableStyle=''
+        self.commandSort = [i[1] for i in self.commandSort]
 
-        self.configvars={}
+        self.var_DEBUG = False
+        self.var_tableStyle = ''
+
+        self.configvars = {}
         for i in dir(self):
-            if "var_"==i[:4]:
-                var=i.split("var_")[1]
-                self.configvars[var]=i
+            if "var_" == i[:4]:
+                var = i.split("var_")[1]
+                self.configvars[var] = i
 
-    def setBanner(self,banner):
-        self.banner=banner
+    def setBanner(self, banner):
+        self.banner = banner
 
-    def execCmd(self,db):
-        self.db=db
-        print self.banner        
+    def execCmd(self, db):
+        self.db = db
+        print self.banner
         while True:
             try:
-                command=raw_input(self.prompt)
+                command = raw_input(self.prompt)
                 try:
                     self.execCommand(command)
                 except:
                     self.execute(command)
-            except KeyboardInterrupt:break
-            except EOFError:break
-            except Exception,a:self.printError (a)
+            except KeyboardInterrupt:
+                break
+            except EOFError:
+                break
+            except Exception, a:
+                self.printError(a)
         print ("\r\n\r\nBye!...")
         sys.exit(0)
 
-    def printError(self,err):
+    def printError(self, err):
         sys.stderr.write("Error: {0}\r\n".format(str(err),))
-        if self.var_DEBUG:pass
+        if self.var_DEBUG:
+            pass
 
-    def execute(self,cmd):
+    def execute(self, cmd):
         try:
             if not '-table ' in cmd:
                 exec '{0}'.format(cmd)
-            else:                
-                file=None
-                table=None
+            else:
+                file = None
+                table = None
 
-                fields=[]
-                items=string.split(cmd,' ')
-                invalidParams=[]                
-                table=self.getTable(items[1])
-                allowedParams=['fields','file']
+                fields = []
+                items = string.split(cmd, ' ')
+                invalidParams = []
+                table = self.getTable(items[1])
+                allowedParams = ['fields', 'file']
                 for i in items:
-                    if '=' in i and not string.split(i,'=')[0] in allowedParams:
+                    if '=' in i and not string.split(i, '=')[0] in allowedParams:
                         try:
                             invalidParams.append(i)
                         except Exception, err:
-                            raise Exception, 'invalid parameter\n{0}'.format(i)
+                            raise Exception('invalid parameter\n{0}'.format(i))
                     else:
                         if 'file=' in i:
-                            file=os.path.abspath(string.strip(string.split(i,'=')[1]))                            
+                            file = os.path.abspath(string.strip(string.split(
+                                i, '=')[1]))
                         if 'fields=' in i:
-                            for field in string.split(string.split(i,'=')[1],','):
+                            for field in string.split(string.split(i, '=')[1], ','):
                                 if field in self.db[table].fields:
                                     fields.append(string.strip(field))
-                                        
-                if len(invalidParams)>0:
-                    print('the following parameter(s) is not valid\n{0}'.format(\
-                                                    string.join(invalidParams,',')))
+
+                if len(invalidParams) > 0:
+                    print('the following parameter(s) is not valid\n{0}'.format(
+                        string.join(invalidParams, ',')))
                 else:
                     try:
-                        self.cmd_table(table,file,fields)
+                        self.cmd_table(table, file, fields)
                     except Exception, err:
-                        print('could not generate table for table {0}\n{1}'\
-                                                        .format(table,err))                                            
+                        print('could not generate table for table {0}\n{1}'
+                              .format(table, err))
         except Exception, err:
             print('sorry, can not do that!\n{0}'.format(err))
-        
-    def getTable(self,tbl):
+
+    def getTable(self, tbl):
         for mTbl in db.tables:
             if tbl in mTbl:
                 if mTbl.startswith(tbl):
-                    return mTbl                            
-        
-    def execCommand(self,cmd):
-        words=cmd.split(" ")
-        words=[i for i in words if i]
-        if not words:return
-        cmd,parameters=words[0].lower(),words[1:]
+                    return mTbl
+
+    def execCommand(self, cmd):
+        words = cmd.split(" ")
+        words = [i for i in words if i]
+        if not words:
+            return
+        cmd, parameters = words[0].lower(), words[1:]
 
         if not cmd in self.commands:
-            raise Exception("Command {0} not found. Try 'help'\r\n".format(cmd))
+            raise Exception(
+                "Command {0} not found. Try 'help'\r\n".format(cmd))
 
         self.commands[cmd](*parameters)
-      
+
     '''---
              DEFAULT COMMANDS (begins with cmd_)
                                                      ---'''
-    def cmd_clear(self,numlines=100):
+    def cmd_clear(self, numlines=100):
         """-5|clear|clear the screen"""
         if os.name == "posix":
             '''---
@@ -279,124 +288,132 @@ class console:
             '''---
                      Fallback for other operating systems.
                                                              ---'''
-            print '\n'*numlines                                                     
+            print '\n' * numlines
 
-    def cmd_table(self,tbl,file=None,fields=[]):
+    def cmd_table(self, tbl, file=None, fields=[]):
         """-4|-table [TABLENAME] optional[file=None] [fields=None]|\
 the default tableStyle is no_wrap - use the 'set x y' command to change the style\n\
 style choices:
-\twrap_always 
+\twrap_always
 \twrap_onspace
 \twrap_onspace_strict
 \tno_wrap (value '')\n
 \t the 2nd optional param is a path to a file where the table will be written
 \t the 3rd optional param is a list of fields you want displayed\n"""
-        table=None
+        table = None
         for mTbl in db.tables:
             if tbl in mTbl:
                 if mTbl.startswith(tbl):
-                    table=mTbl
-                    break                
-        oTable=tableHelper()
-        '''--- 
+                    table = mTbl
+                    break
+        oTable = tableHelper()
+        '''---
                 tablestyle:
-                        wrap_always 
-                            wrap_onspace 
-                                wrap_onspace_strict 
-                    or set set to "" for no wrapping                                        
+                        wrap_always
+                            wrap_onspace
+                                wrap_onspace_strict
+                    or set set to "" for no wrapping
                                                                                     ---'''
-        tableStyle=self.var_tableStyle
-        filedNotFound=[]
-        table_fields=None
-        if len(fields)==0:
-            table_fields=self.db[table].fields
+        tableStyle = self.var_tableStyle
+        filedNotFound = []
+        table_fields = None
+        if len(fields) == 0:
+            table_fields = self.db[table].fields
         else:
-            table_fields=fields
-        
+            table_fields = fields
+
         for field in fields:
             if not field in self.db[table].fields:
                 filedNotFound.append(field)
-        if len(filedNotFound)==0:
-            rows=self.db(self.db[table].id>0).select()
-            rows_data=[]
+        if len(filedNotFound) == 0:
+            rows = self.db(self.db[table].id > 0).select()
+            rows_data = []
             for row in rows:
-                rowdata=[]
+                rowdata = []
                 for f in table_fields:
                     rowdata.append('{0}'.format(row[f]))
-                rows_data.append(string.join(rowdata,','))
-            data=string.join(rows_data,'\n')
-            dataTable=oTable.getTable_Wrap(data,tableStyle,table_fields)        
-            print('TABLE {0}\n{1}'.format(table,dataTable))
-            if file!=None:
+                rows_data.append(string.join(rowdata, ','))
+            data = string.join(rows_data, '\n')
+            dataTable = oTable.getTable_Wrap(data, tableStyle, table_fields)
+            print('TABLE {0}\n{1}'.format(table, dataTable))
+            if file is not None:
                 try:
-                    tail,head=os.path.split(file)
+                    tail, head = os.path.split(file)
                     try:
                         os.makedirs(tail)
-                    except:'do nothing, folders exist'
-                    oFile=open(file,'w')
-                    oFile.write('TABLE: {0}\n{1}'.format(table,dataTable))
+                    except:
+                        'do nothing, folders exist'
+                    oFile = open(file, 'w')
+                    oFile.write('TABLE: {0}\n{1}'.format(table, dataTable))
                     oFile.close()
-                    print('{0} has been created and populated with all available data from table {1}\n'.format(file,table))
+                    print('{0} has been created and populated with all available data from table {1}\n'.format(file, table))
                 except Exception, err:
-                    print("EXCEPTION: could not create table {0}\n{1}".format(table,err))
+                    print("EXCEPTION: could not create table {0}\n{1}".format(
+                        table, err))
         else:
-            print('the following fields are not valid [{0}]'.format(string.join(filedNotFound,',')))
-                                                            
-    def cmd_help(self,*args):
-        '''-3|help|Show's help'''
-        alldata=[]
-        lengths=[]
+            print('the following fields are not valid [{0}]'.format(
+                string.join(filedNotFound, ',')))
 
-        for i in self.commandSort:alldata.append(\
-                                self.commands[i].__doc__.split("|")[1:])
+    def cmd_help(self, *args):
+        '''-3|help|Show's help'''
+        alldata = []
+        lengths = []
+
+        for i in self.commandSort:
+            alldata.append(
+                self.commands[i].__doc__.split("|")[1:])
 
         for i in alldata:
             if len(i) > len(lengths):
-                for j in range(len(i)\
-                               -len(lengths)):
+                for j in range(len(i)
+                               - len(lengths)):
                     lengths.append(0)
 
-            j=0
-            while j<len(i):
-                if len(i[j])>lengths[j]:
-                    lengths[j]=len(i[j])
-                j+=1
-                                
-        print ("-"*(lengths[0]+lengths[1]+4))         
-        for i in alldata:            
-            print (("%-"+str(lengths[0])+"s  - %-"+str(lengths[1])+"s") % (i[0],i[1]))
-            if len(i)>2:
-                for j in i[2:]:print (("%"+str(lengths[0]+9)+"s* %s") % (" ",j))
+            j = 0
+            while j < len(i):
+                if len(i[j]) > lengths[j]:
+                    lengths[j] = len(i[j])
+                j += 1
+
+        print ("-" * (lengths[0] + lengths[1] + 4))
+        for i in alldata:
+            print (("%-" + str(lengths[0]) + "s  - %-" + str(
+                lengths[1]) + "s") % (i[0], i[1]))
+            if len(i) > 2:
+                for j in i[2:]: print (("%" + str(lengths[
+                                       0] + 9) + "s* %s") % (" ", j))
         print
 
-    def cmd_vars(self,*args):
+    def cmd_vars(self, *args):
         '''-2|vars|Show variables'''
-        print ("variables\r\n"+"-"*79)
-        for i,j in self.configvars.items():
-            value=self.parfmt(repr(getattr(self,j)),52)
-            print ("| %20s | %52s |" % (i,value[0]))
-            for k in value[1:]:print ("| %20s | %52s |" % ("",k))
-            if len(value)>1:print("| %20s | %52s |" % ("",""))
-        print ("-"*79)
-        
-    def parfmt(self,txt,width):
-        res=[]
-        pos=0
+        print ("variables\r\n" + "-" * 79)
+        for i, j in self.configvars.items():
+            value = self.parfmt(repr(getattr(self, j)), 52)
+            print ("| %20s | %52s |" % (i, value[0]))
+            for k in value[1:]: print ("| %20s | %52s |" % ("", k))
+            if len(value) > 1:
+                print("| %20s | %52s |" % ("", ""))
+        print ("-" * 79)
+
+    def parfmt(self, txt, width):
+        res = []
+        pos = 0
         while True:
-            a=txt[pos:pos+width]
-            if not a:break
+            a = txt[pos:pos + width]
+            if not a:
+                break
             res.append(a)
-            pos+=width
+            pos += width
         return res
-    
-    def cmd_set(self,*args):
+
+    def cmd_set(self, *args):
         '''-1|set [variable_name] [value]|Set configuration variable value|Values are an expressions (100 | string.lower('ABC') | etc.'''
-        value=" ".join(args[1:])
+        value = " ".join(args[1:])
         if args[0] not in self.configvars:
-            setattr(self,"var_{0}".format(args[0]),eval(value))
-        setattr(self,"var_{0}".format(args[0]),eval(value))
-        
-    def cmd_clearscreen(self,numlines=50):
+            setattr(self, "var_{0}".format(args[0]), eval(value))
+        setattr(self, "var_{0}".format(args[0]), eval(value))
+
+    def cmd_clearscreen(self, numlines=50):
         '''---Clear the console.
                                     ---'''
         if os.name == "posix":
@@ -413,75 +430,81 @@ style choices:
             '''---
                      Fallback for other operating systems.
                                                              ---'''
-            print '\n'*numlines
+            print '\n' * numlines
+
 
 class dalShell(console):
     def __init__(self):
         pass
-    
-    def shell(self,db):        
-        console.__init__(self,prompt=">>> ",banner='dal interactive shell')                
+
+    def shell(self, db):
+        console.__init__(self, prompt=">>> ", banner='dal interactive shell')
         self.execCmd(db)
 
+
 class setCopyDB():
     def __init__(self):
         '''---
                 non source or target specific vars
-                                                        ---'''          
-        self.strModel=None
-        self.dalPath=None
-        self.db=None        
+                                                        ---'''
+        self.strModel = None
+        self.dalPath = None
+        self.db = None
         '''---
                     source vars
-                                    ---'''        
-        self.sourceModel=None
-        self.sourceFolder=None
-        self.sourceConnectionString=None
-        self.sourcedbType=None
-        self.sourcedbName=None     
+                                    ---'''
+        self.sourceModel = None
+        self.sourceFolder = None
+        self.sourceConnectionString = None
+        self.sourcedbType = None
+        self.sourcedbName = None
         '''---
                     target vars
                                     ---'''
-        self.targetdbType=None
-        self.targetdbName=None 
-        self.targetModel=None
-        self.targetFolder=None
-        self.targetConnectionString=None       
-        self.truncate=False                    
+        self.targetdbType = None
+        self.targetdbName = None
+        self.targetModel = None
+        self.targetFolder = None
+        self.targetConnectionString = None
+        self.truncate = False
 
     def _getDal(self):
-        mDal=None
+        mDal = None
         if self.dalPath is not None:
             global DAL
-            sys.path.append(self.dalPath)            
-            mDal=__import__('dal',globals={},locals={},fromlist=['DAL'],level=0)
-            DAL=mDal.DAL
-            return mDal            
-        
-    def instDB(self,storageFolder,storageConnectionString,autoImport):                
-        self.db=DAL(storageConnectionString,folder=os.path.abspath(storageFolder),auto_import=autoImport)
+            sys.path.append(self.dalPath)
+            mDal = __import__(
+                'dal', globals={}, locals={}, fromlist=['DAL'], level=0)
+            DAL = mDal.DAL
+            return mDal
+
+    def instDB(self, storageFolder, storageConnectionString, autoImport):
+        self.db = DAL(storageConnectionString, folder=os.path.abspath(
+            storageFolder), auto_import=autoImport)
         return self.db
-            
-    def delete_DB_tables(self,storageFolder,storageType):  
-        print 'delete_DB_tablesn\n\t{0}\n\t{1}'.format(storageFolder,storageType)              
-        dataFiles=[storageType,"sql.log"]    
+
+    def delete_DB_tables(self, storageFolder, storageType):
+        print 'delete_DB_tablesn\n\t{0}\n\t{1}'.format(
+            storageFolder, storageType)
+        dataFiles = [storageType, "sql.log"]
         try:
             for f in os.listdir(storageFolder):
-                if ".table" in f:                    
-                    fTable="{0}/{1}".format(storageFolder,f)
-                    os.remove(fTable)                       
-                    print('deleted {0}'.format(fTable))        
-            for dFile in dataFiles:                
-                os.remove("{0}/{1}".format(storageFolder,dFile))
-                print('deleted {0}'.format("{0}/{1}".format(storageFolder,dFile)))  
+                if ".table" in f:
+                    fTable = "{0}/{1}".format(storageFolder, f)
+                    os.remove(fTable)
+                    print('deleted {0}'.format(fTable))
+            for dFile in dataFiles:
+                os.remove("{0}/{1}".format(storageFolder, dFile))
+                print('deleted {0}'.format(
+                    "{0}/{1}".format(storageFolder, dFile)))
         except Exception, errObj:
-            print(str(errObj))                   
-            
-    def truncatetables(self,tables=[]):
-        if len(tables)!=0:
+            print(str(errObj))
+
+    def truncatetables(self, tables=[]):
+        if len(tables) != 0:
             try:
-                print 'table value: {0}'.format(tables)                
-                for tbl in self.db.tables:            
+                print 'table value: {0}'.format(tables)
+                for tbl in self.db.tables:
                     for mTbl in tables:
                         if mTbl.startswith(tbl):
                             self.db[mTbl].truncate()
@@ -490,64 +513,61 @@ class setCopyDB():
         else:
             try:
                 for tbl in self.db.tables:
-                    self.db[tbl].truncate()        
+                    self.db[tbl].truncate()
             except Exception, err:
-                print('EXCEPTION: {0}'.format(err))                                                  
-    
+                print('EXCEPTION: {0}'.format(err))
+
     def copyDB(self):
-        other_db=DAL("{0}://{1}".format(self.targetdbType,self.targetdbName),folder=self.targetFolder)
-        
+        other_db = DAL("{0}://{1}".format(
+            self.targetdbType, self.targetdbName), folder=self.targetFolder)
+
         print 'creating tables...'
-        
+
         for table in self.db:
-            other_db.define_table(table._tablename,*[field for field in table])
+            other_db.define_table(
+                table._tablename, *[field for field in table])
             '''
             should there be an option to truncAte target DB?
             if yes, then change args to allow for choice
             and set self.trancate to the art value
-            
+
             if self.truncate==True:
                 other_db[table._tablename].truncate()
             '''
-                
+
         print 'exporting data...'
-        self.db.export_to_csv_file(open('tmp.sql','wb'))
-        
+        self.db.export_to_csv_file(open('tmp.sql', 'wb'))
+
         print 'importing data...'
-        other_db.import_from_csv_file(open('tmp.sql','rb'))
+        other_db.import_from_csv_file(open('tmp.sql', 'rb'))
         other_db.commit()
         print 'done!'
         print 'Attention: do not run this program again or you end up with duplicate records'
 
-    def createfolderPath(self,folder):
+    def createfolderPath(self, folder):
         try:
-            if folder!=None:os.makedirs(folder)
+            if folder is not None:
+                os.makedirs(folder)
         except Exception, err:
-            pass                        
+            pass
 
 if __name__ == '__main__':
-    oCopy=setCopyDB()
-    db=None
-    targetDB=None
-    dbfolder=None
-    clean=False
-    model=None
-    truncate=False
+    oCopy = setCopyDB()
+    db = None
+    targetDB = None
+    dbfolder = None
+    clean = False
+    model = None
+    truncate = False
 
-    parser=argparse.ArgumentParser(description='\
+    parser = argparse.ArgumentParser(description='\
 samplecmd line:\n\
 -f ./blueLite/db_storage -i -y sqlite://storage.sqlite -Y sqlite://storage2.sqlite -d ./blueLite/pyUtils/sql/blueSQL -t True',
-                                   epilog = '')
-    reqGroup=parser.add_argument_group('Required arguments')
-    reqGroup.add_argument('-f','--sourceFolder'\
-                         ,required=True\
-                         ,help="path to the 'source' folder of the 'source' DB")  
-    reqGroup.add_argument('-F','--targetFolder'\
-                         ,required=False\
-                         ,help="path to the 'target' folder of the 'target' DB")             
-    reqGroup.add_argument('-y','--sourceConnectionString'\
-                         ,required=True\
-                         ,help="source db connection string ()\n\
+                                     epilog='')
+    reqGroup = parser.add_argument_group('Required arguments')
+    reqGroup.add_argument('-f', '--sourceFolder', required=True, help="path to the 'source' folder of the 'source' DB")
+    reqGroup.add_argument('-F', '--targetFolder', required=False, help="path to the 'target' folder of the 'target' DB")
+    reqGroup.add_argument('-y', '--sourceConnectionString', required=True, help="source db connection string ()\n\
 ------------------------------------------------\n\
 \
 sqlite://storage.db\n\
@@ -561,19 +581,16 @@ ingres://username:password@localhost/test\n\
 informix://username:password@test\n\
 \
 ------------------------------------------------")
-    reqGroup.add_argument('-Y','--targetConnectionString'\
-                         ,required=True\
-                         ,help="target db type (sqlite,mySql,etc.)")             
-    autoImpGroup=parser.add_argument_group('optional args (auto_import)')
-    autoImpGroup.add_argument('-a','--autoimport'\
-                        ,required=False\
-                        ,help='set to True to bypass loading of the model')   
-    
+    reqGroup.add_argument('-Y', '--targetConnectionString', required=True,
+                          help="target db type (sqlite,mySql,etc.)")
+    autoImpGroup = parser.add_argument_group('optional args (auto_import)')
+    autoImpGroup.add_argument('-a', '--autoimport', required=False, help='set to True to bypass loading of the model')
+
     """
-    
-    *** removing -m/-M options for now --> i need a 
+
+    *** removing -m/-M options for now --> i need a
             better regex to match db.define('bla')...with optional db.commit()
-    
+
     modelGroup=parser.add_argument_group('optional args (create model)')
     modelGroup.add_argument('-m','--sourcemodel'\
                          ,required=False\
@@ -581,72 +598,64 @@ informix://username:password@test\n\
     modelGroup.add_argument('-M','--targetmodel'\
                          ,required=False\
                          ,help='to create a model from an existing model, point to the target model')
-                         
+
     """
 
-        
-    miscGroup=parser.add_argument_group('optional args/tasks')    
-    miscGroup.add_argument('-i','--interactive'\
-                            ,required=False\
-                            ,action='store_true'\
-                            ,help='run in interactive mode')    
-    miscGroup.add_argument('-d','--dal'\
-                         ,required=False\
-                         ,help='path to dal.py')
-    miscGroup.add_argument('-t','--truncate'\
-                         ,choices=['True','False']\
-                         ,help='delete the records but *not* the table of the SOURCE DB')
-    miscGroup.add_argument('-b','--tables'\
-                         ,required=False\
-                         ,type=list\
-                         ,help='optional list (comma delimited) of SOURCE tables to truncate, defaults to all')
-    miscGroup.add_argument('-c','--clean'\
-                         ,required=False\
-                         ,help='delete the DB,tables and the log file, WARNING: this is unrecoverable')
-                
-    args=parser.parse_args()  
-    db=None
-    mDal=None
+    miscGroup = parser.add_argument_group('optional args/tasks')
+    miscGroup.add_argument('-i', '--interactive', required=False, action='store_true', help='run in interactive mode')
+    miscGroup.add_argument(
+        '-d', '--dal', required=False, help='path to dal.py')
+    miscGroup.add_argument('-t', '--truncate', choices=['True', 'False'], help='delete the records but *not* the table of the SOURCE DB')
+    miscGroup.add_argument('-b', '--tables', required=False, type=list, help='optional list (comma delimited) of SOURCE tables to truncate, defaults to all')
+    miscGroup.add_argument('-c', '--clean', required=False, help='delete the DB,tables and the log file, WARNING: this is unrecoverable')
+
+    args = parser.parse_args()
+    db = None
+    mDal = None
 
     try:
-        oCopy.sourceFolder=args.sourceFolder 
-        oCopy.targetFolder=args.sourceFolder        
-        sourceItems=string.split(args.sourceConnectionString,'://')    
-        oCopy.sourcedbType=sourceItems[0]
-        oCopy.sourcedbName=sourceItems[1]
-        targetItems=string.split(args.targetConnectionString,'://')    
-        oCopy.targetdbType=targetItems[0]
-        oCopy.targetdbName=targetItems[1]
+        oCopy.sourceFolder = args.sourceFolder
+        oCopy.targetFolder = args.sourceFolder
+        sourceItems = string.split(args.sourceConnectionString, '://')
+        oCopy.sourcedbType = sourceItems[0]
+        oCopy.sourcedbName = sourceItems[1]
+        targetItems = string.split(args.targetConnectionString, '://')
+        oCopy.targetdbType = targetItems[0]
+        oCopy.targetdbName = targetItems[1]
     except Exception, err:
         print('EXCEPTION: {0}'.format(err))
 
     if args.dal:
-        try:            
-            autoImport=True
-            if args.autoimport:autoImport=args.autoimport
+        try:
+            autoImport = True
+            if args.autoimport:
+                autoImport = args.autoimport
             #sif not DAL in globals:
             #if not sys.path.__contains__():
-            oCopy.dalPath=args.dal
-            mDal=oCopy._getDal()
-            db=oCopy.instDB(args.sourceFolder,args.sourceConnectionString,autoImport)         
+            oCopy.dalPath = args.dal
+            mDal = oCopy._getDal()
+            db = oCopy.instDB(args.sourceFolder, args.sourceConnectionString,
+                              autoImport)
         except Exception, err:
-            print('EXCEPTION: could not set DAL\n{0}'.format(err))    
+            print('EXCEPTION: could not set DAL\n{0}'.format(err))
     if args.truncate:
         try:
             if args.truncate:
-                if args.tables:tables=string.split(string.strip(args.tables),',') 
-                else:oCopy.truncatetables([])
+                if args.tables:
+                    tables = string.split(string.strip(args.tables), ',')
+                else:
+                    oCopy.truncatetables([])
         except Exception, err:
             print('EXCEPTION: could not truncate tables\n{0}'.format(err))
     try:
-        if args.clean:oCopy.delete_DB_tables(oCopy.targetFolder,oCopy.targetType)
+        if args.clean:
+            oCopy.delete_DB_tables(oCopy.targetFolder, oCopy.targetType)
     except Exception, err:
         print('EXCEPTION: could not clean db\n{0}'.format(err))
 
-
     """
     *** goes with -m/-M options... removed for now
-    
+
     if args.sourcemodel:
         try:
             oCopy.sourceModel=args.sourcemodel
@@ -658,25 +667,26 @@ source model: {0}\n\
 target model: {1}\n\
 {2}'.format(args.sourcemodel,args.targetmodel,err))
     """
-    
+
     if args.sourceFolder:
         try:
-            oCopy.sourceFolder=os.path.abspath(args.sourceFolder)
+            oCopy.sourceFolder = os.path.abspath(args.sourceFolder)
             oCopy.createfolderPath(oCopy.sourceFolder)
         except Exception, err:
-            print('EXCEPTION: could not create folder path\n{0}'.format(err))        
-    else:oCopy.dbStorageFolder=os.path.abspath(os.getcwd())
+            print('EXCEPTION: could not create folder path\n{0}'.format(err))
+    else:
+        oCopy.dbStorageFolder = os.path.abspath(os.getcwd())
     if args.targetFolder:
         try:
-            oCopy.targetFolder=os.path.abspath(args.targetFolder)
+            oCopy.targetFolder = os.path.abspath(args.targetFolder)
             oCopy.createfolderPath(oCopy.targetFolder)
         except Exception, err:
-            print('EXCEPTION: could not create folder path\n{0}'.format(err))  
+            print('EXCEPTION: could not create folder path\n{0}'.format(err))
     if not args.interactive:
-        try:    
+        try:
             oCopy.copyDB()
         except Exception, err:
-            print('EXCEPTION: could not make a copy of the database\n{0}'.format(err)) 
+            print('EXCEPTION: could not make a copy of the database\n{0}'.format(err))
     else:
-        s=dalShell()
+        s = dalShell()
         s.shell(db)
diff --git a/scripts/cpplugin.py b/scripts/cpplugin.py
index fbb311c4..652b8747 100644
--- a/scripts/cpplugin.py
+++ b/scripts/cpplugin.py
@@ -1,26 +1,32 @@
-import sys, glob, os, shutil
-name=sys.argv[1]
-app=sys.argv[2]
-dest=sys.argv[3]
-a=glob.glob('applications/%(app)s/*/plugin_%(name)s.*' % dict(app=app,name=name))
-b=glob.glob('applications/%(app)s/*/plugin_%(name)s/*' % dict(app=app,name=name))
+import sys
+import glob
+import os
+import shutil
+name = sys.argv[1]
+app = sys.argv[2]
+dest = sys.argv[3]
+a = glob.glob(
+    'applications/%(app)s/*/plugin_%(name)s.*' % dict(app=app, name=name))
+b = glob.glob(
+    'applications/%(app)s/*/plugin_%(name)s/*' % dict(app=app, name=name))
 
 for f in a:
     print 'cp %s ...' % f,
-    shutil.copyfile(f,os.path.join('applications',dest,*f.split('/')[2:]))
+    shutil.copyfile(f, os.path.join('applications', dest, *f.split('/')[2:]))
     print 'done'
 
 for f in b:
     print 'cp %s ...' % f,
     path = f.split('/')
-    for i in range(3,len(path)):
-        try: os.mkdir(os.path.join('applications',dest,*path[2:i]))
-        except: pass
-    path = os.path.join('applications',dest,*f.split('/')[2:])
+    for i in range(3, len(path)):
+        try:
+            os.mkdir(os.path.join('applications', dest, *path[2:i]))
+        except:
+            pass
+    path = os.path.join('applications', dest, *f.split('/')[2:])
     if os.path.isdir(f):
         if not os.path.exists(path):
-            shutil.copytree(f,path)
+            shutil.copytree(f, path)
     else:
-        shutil.copyfile(f,path)
+        shutil.copyfile(f, path)
     print 'done'
-
diff --git a/scripts/dbsessions2trash.py b/scripts/dbsessions2trash.py
index 7226166c..a8ccd69d 100644
--- a/scripts/dbsessions2trash.py
+++ b/scripts/dbsessions2trash.py
@@ -10,17 +10,16 @@ DB_URI = 'sqlite://sessions.sqlite'
 EXPIRATION_MINUTES = 60
 SLEEP_MINUTES = 5
 
-while 1: # Infinite loop
-    now = time() # get current Unix timestamp
+while 1:  # Infinite loop
+    now = time()  # get current Unix timestamp
 
     for row in db().select(db.web2py_session_welcome.ALL):
         t = row.modified_datetime
         # Convert to a Unix timestamp
-        t = mktime(t.timetuple())+1e-6*t.microsecond
+        t = mktime(t.timetuple()) + 1e-6 * t.microsecond
         if now - t > EXPIRATION_MINUTES * 60:
             del db.web2py_session_welcome[row.id]
 
-    db.commit() # Write changes to database
+    db.commit()  # Write changes to database
 
     sleep(SLEEP_MINUTES * 60)
-
diff --git a/scripts/dict_diff.py b/scripts/dict_diff.py
index b3af81e1..f11b41ce 100644
--- a/scripts/dict_diff.py
+++ b/scripts/dict_diff.py
@@ -6,11 +6,11 @@
 @license: MIT
 @since: 2011-06-17
 
-Usage: dict_diff [OPTION]... dict1 dict2         
+Usage: dict_diff [OPTION]... dict1 dict2
 Show the differences for two dictionaries.
 
   -h,  --help          Display this help message.
-  
+
 dict1 and dict2 are two web2py dictionary files to compare. These are the files
 located in the "languages" directory of a web2py app. The tools show the
 differences between the two files.
@@ -22,34 +22,38 @@ import getopt
 import os.path
 import sys
 
+
 def main(argv):
     """Parse the arguments and start the main process."""
-    try:                                
+    try:
         opts, args = getopt.getopt(argv, "h", ["help"])
     except getopt.GetoptError:
         exit_with_parsing_error()
     for opt, arg in opts:
         arg = arg  # To avoid a warning from Pydev
         if opt in ("-h", "--help"):
-            usage()                     
+            usage()
             sys.exit()
     if len(args) == 2:
         params = list(get_dicts(*args))
         params.extend(get_dict_names(*args))
         compare_dicts(*params)
     else:
-        exit_with_parsing_error()       
+        exit_with_parsing_error()
 
-def exit_with_parsing_error():              
+
+def exit_with_parsing_error():
     """Report invalid arguments and usage."""
     print("Invalid argument(s).")
     usage()
     sys.exit(2)
 
+
 def usage():
     """Display the documentation"""
     print(__doc__)
 
+
 def get_dicts(dict_path1, dict_path2):
     """
     Parse the dictionaries.
@@ -58,7 +62,8 @@ def get_dicts(dict_path1, dict_path2):
     @return: The two dictionaries as a sequence.
     """
 
-    return eval(open(dict_path1).read()), eval(open(dict_path2).read()) 
+    return eval(open(dict_path1).read()), eval(open(dict_path2).read())
+
 
 def get_dict_names(dict1_path, dict2_path):
     """
@@ -75,7 +80,8 @@ def get_dict_names(dict1_path, dict2_path):
         dict1_name = "dict1"
         dict2_name = "dict2"
     return dict1_name, dict2_name
-    
+
+
 def compare_dicts(dict1, dict2, dict1_name, dict2_name):
     """
     Compare the two dictionaries. Print out the result.
@@ -100,7 +106,8 @@ def compare_dicts(dict1, dict2, dict1_name, dict2_name):
             has_value_differences = True
     if not has_value_differences:
         print "  None"
-        
+
+
 def print_key_diff(key_diff, dict1_name, dict2_name):
     """
     Prints the keys in the first dictionary and are in the second dictionary.
@@ -116,6 +123,6 @@ def print_key_diff(key_diff, dict1_name, dict2_name):
     else:
         print "  None"
     print
-            
+
 if __name__ == "__main__":
     main(sys.argv[1:])  # Start the process (without the application name)
diff --git a/scripts/extract_mysql_models.py b/scripts/extract_mysql_models.py
index b39c27c6..82efb9a5 100644
--- a/scripts/extract_mysql_models.py
+++ b/scripts/extract_mysql_models.py
@@ -24,45 +24,48 @@ import subprocess
 import re
 import sys
 data_type_map = dict(
-        varchar = 'string',
-        int = 'integer',
-        integer = 'integer',
-        tinyint = 'integer',
-        smallint = 'integer',
-        mediumint = 'integer',
-        bigint = 'integer',
-        float = 'double',
-        double = 'double',
-        char = 'string',
-        decimal = 'integer',
-        date = 'date',
+    varchar='string',
+    int='integer',
+        integer='integer',
+        tinyint='integer',
+        smallint='integer',
+        mediumint='integer',
+        bigint='integer',
+        float='double',
+        double='double',
+        char='string',
+        decimal='integer',
+        date='date',
         #year = 'date',
-        time = 'time',
-        timestamp = 'datetime',
-        datetime = 'datetime',
-        binary = 'blob',
-        blob = 'blob',
-        tinyblob = 'blob',
-        mediumblob = 'blob',
-        longblob = 'blob',
-        text = 'text',
-        tinytext = 'text',
-        mediumtext = 'text',
-        longtext = 'text',
-        )
+        time='time',
+        timestamp='datetime',
+        datetime='datetime',
+        binary='blob',
+        blob='blob',
+        tinyblob='blob',
+        mediumblob='blob',
+        longblob='blob',
+        text='text',
+        tinytext='text',
+        mediumtext='text',
+        longtext='text',
+)
+
 
 def mysql(database_name, username, password):
     p = subprocess.Popen(['mysql',
                           '--user=%s' % username,
-                          '--password=%s'% password,
+                          '--password=%s' % password,
                           '--execute=show tables;',
                           database_name],
                          stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
     sql_showtables, stderr = p.communicate()
-    tables = [re.sub('\|\s+([^\|*])\s+.*', '\1', x) for x in sql_showtables.split()[1:]]
-    connection_string = "legacy_db = DAL('mysql://%s:%s@localhost/%s')"%(username, password, database_name)
+    tables = [re.sub(
+        '\|\s+([^\|*])\s+.*', '\1', x) for x in sql_showtables.split()[1:]]
+    connection_string = "legacy_db = DAL('mysql://%s:%s@localhost/%s')" % (
+        username, password, database_name)
     legacy_db_table_web2py_code = []
     for table_name in tables:
         #get the sql create statement
@@ -71,37 +74,40 @@ def mysql(database_name, username, password):
                               '--password=%s' % password,
                               '--skip-add-drop-table',
                               '--no-data', database_name,
-                              table_name], stdin=subprocess.PIPE, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        sql_create_stmnt,stderr = p.communicate()
-        if 'CREATE' in sql_create_stmnt:#check if the table exists
+                              table_name], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        sql_create_stmnt, stderr = p.communicate()
+        if 'CREATE' in sql_create_stmnt:  # check if the table exists
             #remove garbage lines from sql statement
             sql_lines = sql_create_stmnt.split('\n')
-            sql_lines = [x for x in sql_lines if not(x.startswith('--') or x.startswith('/*') or x =='')]
+            sql_lines = [x for x in sql_lines if not(
+                x.startswith('--') or x.startswith('/*') or x == '')]
             #generate the web2py code from the create statement
             web2py_table_code = ''
-            table_name = re.search('CREATE TABLE .(\S+). \(', sql_lines[0]).group(1)
+            table_name = re.search(
+                'CREATE TABLE .(\S+). \(', sql_lines[0]).group(1)
             fields = []
             for line in sql_lines[1:-1]:
                 if re.search('KEY', line) or re.search('PRIMARY', line) or re.search(' ID', line) or line.startswith(')'):
                     continue
                 hit = re.search('(\S+)\s+(\S+)(,| )( .*)?', line)
-                if hit!=None:
+                if hit is not None:
                     name, d_type = hit.group(1), hit.group(2)
-                    d_type = re.sub(r'(\w+)\(.*',r'\1',d_type)
-                    name = re.sub('`','',name)
-                    web2py_table_code += "\n    Field('%s','%s'),"%(name,data_type_map[d_type])
-            web2py_table_code = "legacy_db.define_table('%s',%s\n    migrate=False)"%(table_name,web2py_table_code)
+                    d_type = re.sub(r'(\w+)\(.*', r'\1', d_type)
+                    name = re.sub('`', '', name)
+                    web2py_table_code += "\n    Field('%s','%s')," % (
+                        name, data_type_map[d_type])
+            web2py_table_code = "legacy_db.define_table('%s',%s\n    migrate=False)" % (table_name, web2py_table_code)
             legacy_db_table_web2py_code.append(web2py_table_code)
     #----------------------------------------
     #write the legacy db to file
-    legacy_db_web2py_code = connection_string+"\n\n"
-    legacy_db_web2py_code += "\n\n#--------\n".join(legacy_db_table_web2py_code)
+    legacy_db_web2py_code = connection_string + "\n\n"
+    legacy_db_web2py_code += "\n\n#--------\n".join(
+        legacy_db_table_web2py_code)
     return legacy_db_web2py_code
 
 regex = re.compile('(.*?):(.*?)@(.*)')
-if len(sys.argv)<2 or not regex.match(sys.argv[1]):
+if len(sys.argv) < 2 or not regex.match(sys.argv[1]):
     print 'USAGE:\n\n    extract_mysql_models.py username:password@data_basename\n\n'
 else:
     m = regex.match(sys.argv[1])
-    print mysql(m.group(3),m.group(1),m.group(2))
-
+    print mysql(m.group(3), m.group(1), m.group(2))
diff --git a/scripts/extract_pgsql_models.py b/scripts/extract_pgsql_models.py
index a6b80016..79a1699f 100644
--- a/scripts/extract_pgsql_models.py
+++ b/scripts/extract_pgsql_models.py
@@ -46,19 +46,21 @@ KWARGS = ('type', 'length', 'default', 'required', 'ondelete',
 import sys
 
 
-def query(conn, sql,*args):
+def query(conn, sql, *args):
     "Execute a SQL query and return rows as a list of dicts"
     cur = conn.cursor()
     ret = []
     try:
-        if DEBUG: print >> sys.stderr, "QUERY: ", sql % args
+        if DEBUG:
+            print >> sys.stderr, "QUERY: ", sql % args
         cur.execute(sql, args)
         for row in cur:
             dic = {}
             for i, value in enumerate(row):
                 field = cur.description[i][0]
                 dic[field] = value
-            if DEBUG: print >> sys.stderr, "RET: ", dic
+            if DEBUG:
+                print >> sys.stderr, "RET: ", dic
             ret.append(dic)
         return ret
     finally:
@@ -75,7 +77,8 @@ def get_tables(conn, schema=SCHEMA):
 
 def get_fields(conn, table):
     "Retrieve field list for a given table"
-    if DEBUG: print >> sys.stderr, "Processing TABLE", table
+    if DEBUG:
+        print >> sys.stderr, "Processing TABLE", table
     rows = query(conn, """
         SELECT column_name, data_type,
             is_nullable,
@@ -90,13 +93,13 @@ def get_fields(conn, table):
 
 def define_field(conn, table, field, pks):
     "Determine field type, default value, references, etc."
-    f={}
+    f = {}
     ref = references(conn, table, field['column_name'])
     if ref:
         f.update(ref)
     elif field['column_default'] and \
-         field['column_default'].startswith("nextval") and \
-         field['column_name'] in pks:
+        field['column_default'].startswith("nextval") and \
+            field['column_name'] in pks:
         # postgresql sequence (SERIAL) and primary key!
         f['type'] = "'id'"
     elif field['data_type'].startswith('character'):
@@ -109,7 +112,7 @@ def define_field(conn, table, field, pks):
         f['type'] = "'boolean'"
     elif field['data_type'] in ('integer', 'smallint', 'bigint'):
         f['type'] = "'integer'"
-    elif field['data_type'] in ('double precision', 'real' ):
+    elif field['data_type'] in ('double precision', 'real'):
         f['type'] = "'double'"
     elif field['data_type'] in ('timestamp', 'timestamp without time zone'):
         f['type'] = "'datetime'"
@@ -124,17 +127,17 @@ def define_field(conn, table, field, pks):
     elif field['data_type'] in ('bytea', ):
         f['type'] = "'blob'"
     elif field['data_type'] in ('point', 'lseg', 'polygon', 'unknown', 'USER-DEFINED'):
-        f['type'] = "" # unsupported?
+        f['type'] = ""  # unsupported?
     else:
         raise RuntimeError("Data Type not supported: %s " % str(field))
 
     try:
         if field['column_default']:
-            if field['column_default']=="now()":
+            if field['column_default'] == "now()":
                 d = "request.now"
-            elif field['column_default']=="true":
+            elif field['column_default'] == "true":
                 d = "True"
-            elif field['column_default']=="false":
+            elif field['column_default'] == "false":
                 d = "False"
             else:
                 d = repr(eval(field['column_default']))
@@ -142,7 +145,8 @@ def define_field(conn, table, field, pks):
     except (ValueError, SyntaxError):
         pass
     except Exception, e:
-        raise RuntimeError("Default unsupported '%s'" % field['column_default'])
+        raise RuntimeError(
+            "Default unsupported '%s'" % field['column_default'])
 
     if not field['is_nullable']:
         f['notnull'] = "True"
@@ -203,40 +207,40 @@ def references(conn, table, field):
           AND information_schema.key_column_usage.column_name=%s
           AND information_schema.table_constraints.constraint_type='FOREIGN KEY'
           ;""", table, field)
-    if len(rows1)==1:
+    if len(rows1) == 1:
         rows2 = query(conn, """
             SELECT table_name, column_name, *
             FROM information_schema.constraint_column_usage
             WHERE constraint_name=%s
             """, rows1[0]['constraint_name'])
         row = None
-        if len(rows2)>1:
-            row = rows2[int(rows1[0]['ordinal_position'])-1]
+        if len(rows2) > 1:
+            row = rows2[int(rows1[0]['ordinal_position']) - 1]
             keyed = True
-        if len(rows2)==1:
+        if len(rows2) == 1:
             row = rows2[0]
             keyed = False
         if row:
-            if keyed: # THIS IS BAD, DON'T MIX "id" and primarykey!!!
+            if keyed:  # THIS IS BAD, DON'T MIX "id" and primarykey!!!
                 ref = {'type': "'reference %s.%s'" % (row['table_name'],
                                                       row['column_name'])}
             else:
                 ref = {'type': "'reference %s'" % (row['table_name'],)}
-            if rows1[0]['delete_rule']!="NO ACTION":
+            if rows1[0]['delete_rule'] != "NO ACTION":
                 ref['ondelete'] = repr(rows1[0]['delete_rule'])
             return ref
         elif rows2:
             raise RuntimeError("Unsupported foreign key reference: %s" %
-                                str(rows2))
+                               str(rows2))
 
     elif rows1:
         raise RuntimeError("Unsupported referential constraint: %s" %
-                             str(rows1))
+                           str(rows1))
 
 
 def define_table(conn, table):
     "Output single table definition"
-    fields =  get_fields(conn, table)
+    fields = get_fields(conn, table)
     pks = primarykeys(conn, table)
     print "db.define_table('%s'," % (table, )
     for field in fields:
@@ -244,11 +248,11 @@ def define_table(conn, table):
         fdef = define_field(conn, table, field, pks)
         if fname not in pks and is_unique(conn, table, field):
             fdef['unique'] = "True"
-        if fdef['type']=="'id'" and fname in pks:
+        if fdef['type'] == "'id'" and fname in pks:
             pks.pop(pks.index(fname))
         print "    Field('%s', %s)," % (fname,
-                    ', '.join(["%s=%s" % (k, fdef[k]) for k in KWARGS
-                                            if k in fdef and fdef[k]]))
+                                        ', '.join(["%s=%s" % (k, fdef[k]) for k in KWARGS
+                                                   if k in fdef and fdef[k]]))
     if pks:
         print "    primarykey=[%s]," % ", ".join(["'%s'" % pk for pk in pks])
     print     "    migrate=migrate)"
@@ -280,5 +284,3 @@ if __name__ == "__main__":
                                )
         # Start model code generation:
         define_db(cnn, db, host, port, user, passwd)
-
-
diff --git a/scripts/fixws.py b/scripts/fixws.py
index 8a1e7433..706a413d 100755
--- a/scripts/fixws.py
+++ b/scripts/fixws.py
@@ -1,4 +1,6 @@
-import sys, glob
+import sys
+import glob
+
 
 def read_fileb(filename, mode='rb'):
     f = open(filename, mode)
@@ -7,6 +9,7 @@ def read_fileb(filename, mode='rb'):
     finally:
         f.close()
 
+
 def write_fileb(filename, value, mode='wb'):
     f = open(filename, mode)
     try:
@@ -18,7 +21,7 @@ for filename in glob.glob(sys.argv[1]):
     data1 = read_fileb(filename)
     write_fileb(filename + '.bak2', data1)
     data2lines = read_fileb(filename).strip().split('\n')
-    data2 = '\n'.join([line.rstrip().replace('\t','    '*2) for line in data2lines])+'\n'
+    data2 = '\n'.join([line.rstrip(
+    ).replace('\t', '    ' * 2) for line in data2lines]) + '\n'
     write_fileb(filename, data2)
-    print filename, len(data1)-len(data2)
-
+    print filename, len(data1) - len(data2)
diff --git a/scripts/layout_make.py b/scripts/layout_make.py
index 84c86910..fe8baf34 100755
--- a/scripts/layout_make.py
+++ b/scripts/layout_make.py
@@ -5,10 +5,11 @@ import sys
 import re
 from BeautifulSoup import BeautifulSoup as BS
 
+
 def head(styles):
     title = '<title>{{=response.title or request.application}}</title>'
     items = '\n'.join(["{{response.files.append(URL(request.application,'static','%s'))}}" % (style) for style in styles])
-    loc="""<style>
+    loc = """<style>
 div.flash {
     position: absolute;
     float: right;
@@ -39,50 +40,54 @@ div.error {
     border: 1px solid #666;
 }
 </style>"""
-    return "\n%s\n%s\n{{include 'web2py_ajax.html'}}\n%s" % (title,items,loc)
+    return "\n%s\n%s\n{{include 'web2py_ajax.html'}}\n%s" % (title, items, loc)
+
 
 def content():
     return """<div class="flash">{{=response.flash or ''}}</div>{{include}}"""
 
+
 def process(folder):
-    indexfile = open(os.path.join(folder,'index.html'),'rb')
+    indexfile = open(os.path.join(folder, 'index.html'), 'rb')
     try:
         soup = BS(indexfile.read())
     finally:
         indexfile.close()
     styles = [x['href'] for x in soup.findAll('link')]
-    soup.find('head').contents=BS(head(styles))
+    soup.find('head').contents = BS(head(styles))
     try:
-        soup.find('h1').contents=BS('{{=response.title or request.application}}')
-        soup.find('h2').contents=BS("{{=response.subtitle or '=response.subtitle'}}")
+        soup.find(
+            'h1').contents = BS('{{=response.title or request.application}}')
+        soup.find('h2').contents = BS(
+            "{{=response.subtitle or '=response.subtitle'}}")
     except:
         pass
-    for match in (soup.find('div',id='menu'),
-              soup.find('div',{'class':'menu'}),
-              soup.find('div',id='nav'),
-              soup.find('div',{'class':'nav'})):
+    for match in (soup.find('div', id='menu'),
+                  soup.find('div', {'class': 'menu'}),
+                  soup.find('div', id='nav'),
+                  soup.find('div', {'class': 'nav'})):
         if match:
-            match.contents=BS('{{=MENU(response.menu)}}')
+            match.contents = BS('{{=MENU(response.menu)}}')
             break
-    done=False
-    for match in (soup.find('div',id='content'),
-              soup.find('div',{'class':'content'}),
-              soup.find('div',id='main'),
-              soup.find('div',{'class':'main'})):
+    done = False
+    for match in (soup.find('div', id='content'),
+                  soup.find('div', {'class': 'content'}),
+                  soup.find('div', id='main'),
+                  soup.find('div', {'class': 'main'})):
         if match:
-            match.contents=BS(content())
-            done=True
+            match.contents = BS(content())
+            done = True
             break
     if done:
         page = soup.prettify()
-        page = re.compile("\s*\{\{=response\.flash or ''\}\}\s*",re.MULTILINE)\
-            .sub("{{=response.flash or ''}}",page)
+        page = re.compile("\s*\{\{=response\.flash or ''\}\}\s*", re.MULTILINE)\
+            .sub("{{=response.flash or ''}}", page)
         print page
     else:
-        raise Exception, "Unable to convert"
+        raise Exception("Unable to convert")
 
-if __name__=='__main__':
-    if len(sys.argv)<2:
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
         print """USAGE:
 1) start a new web2py application
 2) Download a sample free layout from the web into the static/ folder of
@@ -96,4 +101,3 @@ if __name__=='__main__':
         print 'Folder %s does not exist' % sys.argv[1]
     else:
         process(sys.argv[1])
-
diff --git a/scripts/make_min_web2py.py b/scripts/make_min_web2py.py
index 4c3fec52..9fd0c19c 100644
--- a/scripts/make_min_web2py.py
+++ b/scripts/make_min_web2py.py
@@ -38,51 +38,60 @@ gluon/contrib/pyrtf/
 gluon/contrib/pysimplesoap/
 """
 
-import sys, os, shutil, glob
+import sys
+import os
+import shutil
+import glob
+
 
 def main():
     global REQUIRED, IGNORED
-    
-    if len(sys.argv)<2:
+
+    if len(sys.argv) < 2:
         print USAGE
-    
+
     # make target folder
     target = sys.argv[1]
     os.mkdir(target)
-    
+
     # change to os specificsep
-    REQUIRED = REQUIRED.replace('/',os.sep)
-    IGNORED = IGNORED.replace('/',os.sep)
-    
+    REQUIRED = REQUIRED.replace('/', os.sep)
+    IGNORED = IGNORED.replace('/', os.sep)
 
     # make a list of all files to include
-    files = [x.strip() for x in REQUIRED.split('\n') \
-                 if x and not x[0]=='#']
-    ignore = [x.strip() for x in IGNORED.split('\n') \
-                   if x and not x[0]=='#']
-                   
+    files = [x.strip() for x in REQUIRED.split('\n')
+             if x and not x[0] == '#']
+    ignore = [x.strip() for x in IGNORED.split('\n')
+              if x and not x[0] == '#']
+
     def accept(filename):
         for p in ignore:
             if filename.startswith(p):
                 return False
         return True
-    pattern = os.path.join('gluon','*.py')
+    pattern = os.path.join('gluon', '*.py')
     while True:
         newfiles = [x for x in glob.glob(pattern) if accept(x)]
-        if not newfiles: break
+        if not newfiles:
+            break
         files += newfiles
-        pattern = os.path.join(pattern[:-3],'*.py')
+        pattern = os.path.join(pattern[:-3], '*.py')
     # copy all files, make missing folder, build default.py
     files.sort()
-    defaultpy = os.path.join('applications','welcome','controllers','default.py')
+    defaultpy = os.path.join(
+        'applications', 'welcome', 'controllers', 'default.py')
     for f in files:
         dirs = f.split(os.path.sep)
-        for i in range(1,len(dirs)):
-            try: os.mkdir(target+os.sep+os.path.join(*dirs[:i]))
-            except OSError: pass
-        if f==defaultpy:
-            open(os.path.join(target,f),'w').write('def index(): return "hello"\n')
+        for i in range(1, len(dirs)):
+            try:
+                os.mkdir(target + os.sep + os.path.join(*dirs[:i]))
+            except OSError:
+                pass
+        if f == defaultpy:
+            open(os.path.join(
+                target, f), 'w').write('def index(): return "hello"\n')
         else:
-            shutil.copyfile(f,os.path.join(target,f))
-        
-if __name__=='__main__': main()
+            shutil.copyfile(f, os.path.join(target, f))
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/rmorphans.py b/scripts/rmorphans.py
index d297939b..8b50ef61 100644
--- a/scripts/rmorphans.py
+++ b/scripts/rmorphans.py
@@ -6,18 +6,18 @@ paths2 = []
 while paths:
     path = paths.pop()
     for filename in os.listdir(path):
-        fullname = os.path.join(path,filename)    
+        fullname = os.path.join(path, filename)
         if os.path.isdir(fullname):
             paths.append(fullname)
         else:
             extension = filename.split('.')[-1]
-            if extension.lower() in ('png','gif','jpg','jpeg','js','css'):
-                paths1.append((filename,fullname))
-            if extension.lower() in ('css','js','py','html'):
+            if extension.lower() in ('png', 'gif', 'jpg', 'jpeg', 'js', 'css'):
+                paths1.append((filename, fullname))
+            if extension.lower() in ('css', 'js', 'py', 'html'):
                 paths2.append(fullname)
-for filename,fullname in paths1:
+for filename, fullname in paths1:
     for otherfullname in paths2:
-        if open(otherfullname).read().find(filename)>=0:
+        if open(otherfullname).read().find(filename) >= 0:
             break
     else:
         print fullname
diff --git a/scripts/sessions2trash.py b/scripts/sessions2trash.py
index 5357659f..11e685fc 100755
--- a/scripts/sessions2trash.py
+++ b/scripts/sessions2trash.py
@@ -162,7 +162,7 @@ class SessionFile(object):
 
     def last_visit_default(self):
         return datetime.datetime.fromtimestamp(
-                os.stat(self.filename)[stat.ST_MTIME])
+            os.stat(self.filename)[stat.ST_MTIME])
 
     def __str__(self):
         return self.filename
@@ -175,7 +175,7 @@ def total_seconds(delta):
     Args:
         delta: datetime.timedelta instance.
     """
-    return (delta.microseconds + (delta.seconds + (delta.days * 24 * 3600)) * \
+    return (delta.microseconds + (delta.seconds + (delta.days * 24 * 3600)) *
             10 ** 6) / 10 ** 6
 
 
@@ -186,25 +186,25 @@ def main():
     parser = OptionParser(usage=usage)
 
     parser.add_option('-f', '--force',
-        action='store_true', dest='force', default=False,
-        help=('Ignore session expiration. '
-            'Force expiry based on -x option or auth.settings.expiration.')
-        )
+                      action='store_true', dest='force', default=False,
+                      help=('Ignore session expiration. '
+                            'Force expiry based on -x option or auth.settings.expiration.')
+                      )
     parser.add_option('-o', '--once',
-        action='store_true', dest='once', default=False,
-        help='Delete sessions, then exit.',
-        )
+                      action='store_true', dest='once', default=False,
+                      help='Delete sessions, then exit.',
+                      )
     parser.add_option('-s', '--sleep',
-        dest='sleep', default=SLEEP_MINUTES * 60, type="int",
-        help='Number of seconds to sleep between executions. Default 300.',
-        )
+                      dest='sleep', default=SLEEP_MINUTES * 60, type="int",
+                      help='Number of seconds to sleep between executions. Default 300.',
+                      )
     parser.add_option('-v', '--verbose',
-        default=0, action='count',
-        help="print verbose output, a second -v increases verbosity")
+                      default=0, action='count',
+                      help="print verbose output, a second -v increases verbosity")
     parser.add_option('-x', '--expiration',
-        dest='expiration', default=None, type="int",
-        help='Expiration value for sessions without expiration (in seconds)',
-        )
+                      dest='expiration', default=None, type="int",
+                      help='Expiration value for sessions without expiration (in seconds)',
+                      )
 
     (options, unused_args) = parser.parse_args()
 
diff --git a/scripts/standalone_exe_cxfreeze.py b/scripts/standalone_exe_cxfreeze.py
index 9eb90d14..a21451ff 100644
--- a/scripts/standalone_exe_cxfreeze.py
+++ b/scripts/standalone_exe_cxfreeze.py
@@ -30,35 +30,35 @@ if sys.platform == 'win32':
 
 base_modules.remove('macpath')
 buildOptions = dict(
-        compressed = True,
-        excludes = ["macpath","PyQt4"],
-    	includes = base_modules,
-  	    include_files=[
-            'applications',
-            'ABOUT',
-            'LICENSE',
-            'VERSION',
-            'logging.example.conf',
-            'options_std.py',
-            'app.example.yaml',
-            'queue.example.yaml',
-            ],
-        # append any extra module by extending the list below -
-        # "contributed_modules+["lxml"]"
-        packages = contributed_modules,
-        )
+    compressed=True,
+    excludes=["macpath", "PyQt4"],
+    includes=base_modules,
+    include_files=[
+        'applications',
+        'ABOUT',
+        'LICENSE',
+        'VERSION',
+        'logging.example.conf',
+        'options_std.py',
+        'app.example.yaml',
+        'queue.example.yaml',
+    ],
+    # append any extra module by extending the list below -
+    # "contributed_modules+["lxml"]"
+    packages=contributed_modules,
+)
 
 setup(
-        name = "Web2py",
-        version=web2py_version,
-        author="Massimo DiPierro",
-        description="web2py web framework",
-        license = "LGPL v3",
-        options = dict(build_exe = buildOptions),
-        executables = [Executable("web2py.py",
-                                    base=base,
-                                    compress = True,
-                                    icon = "web2py.ico",
-                                    targetName="web2py.exe",
-                                    copyDependentFiles = True)],
-        )
+    name="Web2py",
+    version=web2py_version,
+    author="Massimo DiPierro",
+    description="web2py web framework",
+    license="LGPL v3",
+    options=dict(build_exe=buildOptions),
+    executables=[Executable("web2py.py",
+                            base=base,
+                            compress=True,
+                            icon="web2py.ico",
+                            targetName="web2py.exe",
+                            copyDependentFiles=True)],
+)
diff --git a/scripts/sync_languages.py b/scripts/sync_languages.py
index 8f1f8d6d..ff36c779 100755
--- a/scripts/sync_languages.py
+++ b/scripts/sync_languages.py
@@ -14,26 +14,27 @@ sys.path.insert(0, '.')
 file = sys.argv[1]
 apps = sys.argv[2:]
 
+
 def sync_language(d, data):
-    ''' this function makes sure a translated string will be prefered over an untranslated 
-    string when syncing languages between apps. when both are translated, it prefers the 
+    ''' this function makes sure a translated string will be prefered over an untranslated
+    string when syncing languages between apps. when both are translated, it prefers the
     latter app, as did the original script
     '''
-    
+
     for key in data:
         # if this string is not in the allready translated data, add it
         if key not in d:
             d[key] = data[key]
         # see if there is a translated string in the original list, but not in the new list
-        elif ( 
-              ((d[key] != '') or (d[key] != key)) and 
-              ((data[key] == '') or (data[key] == key))
-             ):
+        elif (
+            ((d[key] != '') or (d[key] != key)) and
+            ((data[key] == '') or (data[key] == key))
+        ):
             d[key] = d[key]
         # any other case (wether there is or there isn't a translated string)
         else:
             d[key] = data[key]
-        
+
     return d
 
 d = {}
@@ -45,7 +46,7 @@ for app in apps:
         data = eval(langfile.read())
     finally:
         langfile.close()
-    
+
     d = sync_language(d, data)
 
 path = 'applications/%s/' % apps[-1]
@@ -68,4 +69,3 @@ for app in oapps:
     path2 = 'applications/%s/' % app
     file2 = os.path.join(path2, 'languages', '%s.py' % file)
     shutil.copyfile(file1, file2)
-
diff --git a/scripts/tickets2db.py b/scripts/tickets2db.py
index cfcb15b3..ecb1b4cd 100755
--- a/scripts/tickets2db.py
+++ b/scripts/tickets2db.py
@@ -15,7 +15,7 @@ SLEEP_MINUTES = 5
 
 errors_path = os.path.join(request.folder, 'errors')
 try:
-    db_string = open(os.path.join(request.folder, 'private', 'ticket_storage.txt')).read().replace('\r','').replace('\n','').strip()
+    db_string = open(os.path.join(request.folder, 'private', 'ticket_storage.txt')).read().replace('\r', '').replace('\n', '').strip()
 except:
     db_string = 'sqlite://storage.db'
 
@@ -23,7 +23,8 @@ db_path = os.path.join(request.folder, 'databases')
 
 tk_db = DAL(db_string, folder=db_path, auto_import=True)
 ts = TicketStorage(db=tk_db)
-tk_table = ts._get_table(db=tk_db, tablename=ts.tablename, app=request.application)
+tk_table = ts._get_table(
+    db=tk_db, tablename=ts.tablename, app=request.application)
 
 
 hashes = {}
@@ -46,6 +47,5 @@ while 1:
                         )
         tk_db.commit()
         os.unlink(filename)
-        
-    time.sleep(SLEEP_MINUTES * 60)
 
+    time.sleep(SLEEP_MINUTES * 60)
diff --git a/scripts/tickets2email.py b/scripts/tickets2email.py
index 2a557282..8fe4e896 100755
--- a/scripts/tickets2email.py
+++ b/scripts/tickets2email.py
@@ -42,8 +42,8 @@ while 1:
         error = RestrictedError()
         error.load(request, request.application, file)
 
-        mail.send(to=administrator_email, subject='new web2py ticket', message=error.traceback)
+        mail.send(to=administrator_email,
+                  subject='new web2py ticket', message=error.traceback)
 
         os.unlink(os.path.join(path, file))
     time.sleep(SLEEP_MINUTES * 60)
-
diff --git a/scripts/update_web2py.py b/scripts/update_web2py.py
index c5606966..a570ced6 100644
--- a/scripts/update_web2py.py
+++ b/scripts/update_web2py.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python                                                        
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """
 crontab -e
-* 3 * * * root path/to/this/file 
+* 3 * * * root path/to/this/file
 """
 
 USER = 'www-data'
@@ -14,7 +14,7 @@ import os
 import urllib
 import zipfile
 
-if len(sys.argv)>1 and sys.argv[1] == 'nightly':
+if len(sys.argv) > 1 and sys.argv[1] == 'nightly':
     version = 'http://web2py.com/examples/static/nightly/web2py_src.zip'
 else:
     version = 'http://web2py.com/examples/static/web2py_src.zip'
@@ -23,11 +23,11 @@ realpath = os.path.realpath(__file__)
 path = os.path.dirname(os.path.dirname(os.path.dirname(realpath)))
 os.chdir(path)
 try:
-    old_version = open('web2py/VERSION','r').read().strip()
+    old_version = open('web2py/VERSION', 'r').read().strip()
 except IOError:
     old_version = ''
-open(TMPFILENAME,'wb').write(urllib.urlopen(version).read())
+open(TMPFILENAME, 'wb').write(urllib.urlopen(version).read())
 new_version = zipfile.ZipFile(TMPFILENAME).read('web2py/VERSION').strip()
-if new_version>old_version:
-    os.system('sudo -u %s unzip -o %s' % (USER,TMPFILENAME))
+if new_version > old_version:
+    os.system('sudo -u %s unzip -o %s' % (USER, TMPFILENAME))
     os.system('apachectl restart | apache2ctl restart')
diff --git a/scripts/zip_static_files.py b/scripts/zip_static_files.py
index 67d342f0..57054e5b 100644
--- a/scripts/zip_static_files.py
+++ b/scripts/zip_static_files.py
@@ -7,6 +7,7 @@
 import os
 import gzip
 
+
 def zip_static(filelist=[]):
     tsave = 0
     for fi in filelist:
@@ -24,17 +25,18 @@ def zip_static(filelist=[]):
             if zatime == atime and zmtime == mtime:
                 print 'skipping %s, already gzipped to the latest version' % os.path.basename(fi)
                 continue
-        print 'gzipping %s to %s' % (os.path.basename(fi), os.path.basename(gfi))
+        print 'gzipping %s to %s' % (
+            os.path.basename(fi), os.path.basename(gfi))
         f_in = open(fi, 'rb')
         f_out = gzip.open(gfi, 'wb')
         f_out.writelines(f_in)
         f_out.close()
         f_in.close()
-        os.utime(gfi, (atime,mtime))
+        os.utime(gfi, (atime, mtime))
         saved = fstats.st_size - os.stat(gfi).st_size
-        tsave+= saved
+        tsave += saved
 
-    print 'saved %s KB' % (int(tsave)/1000.0)
+    print 'saved %s KB' % (int(tsave) / 1000.0)
 
 if __name__ == '__main__':
     ALLOWED_EXTS = ['.css', '.js']

From 1a83487221fbaef0dab259f94918ff4ae3b542d9 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 14:59:30 -0500
Subject: [PATCH 42/49] populate fix and pep8

---
 VERSION                   |   2 +-
 gluon/contrib/populate.py | 239 ++++++++++++++++++++++----------------
 2 files changed, 140 insertions(+), 101 deletions(-)

diff --git a/VERSION b/VERSION
index ca1f2b22..98865e61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 14:22:39) dev
+Version 2.1.1 (2012-10-19 14:59:27) dev
diff --git a/gluon/contrib/populate.py b/gluon/contrib/populate.py
index b82173d0..c02b6ca1 100644
--- a/gluon/contrib/populate.py
+++ b/gluon/contrib/populate.py
@@ -1,167 +1,206 @@
-import re, cPickle, random, datetime
+import re
+import cPickle
+import random
+import datetime
 
 IUP = {'shoebill':{'a':1,'187':1},'trout-like':{'parr':1},'fig.':{'19':1},'mcintosh.':{'the':1,'illustration':1},'chiasmodon':{'niger':2},'yellow':{'and':4,'giant':1,'green':2,'red':1,'spots':1},'four':{'brightly':1,'hundred':1,'haunts':1,'feet':1,'solutions':2,'hours.':1,'things':1,'long':1,'.':2,'legs':1,'inches':4,'thousand':1,'million':1,'pairs':2,'hours':1,'satellites':1,'tufts':1,'great':1,'main':1,'of':1,'months':1,'days':1,'times':4,'volumes':1,'inches.':1,'frilled':2,'or':3},'snapping-blades':{'the':1},'aegir':{'on':4},'hanging':{'down':1,'on':2},'bird--evidences':{'of':1},'canes':{'venatici':1},'inheritance.':{'looking':1},'electricity':{'and':5,'belong':1,'is':4,'rotating':2,'held':1,'as':1,'sec':1,'in':1,'yet':1,'predominates':1,'from':1,'there':1,'.':9,'to':1,'which':4,';':4,'has':1,'we':1,'that':1,'here':1,'i.e':1,'like':1,'repel':1,'the':2,'or':1,'attracting':1},'similarity':{'of':3,'between':1},'sunlit':{'side':1},'superficially':{'indistinguishable':1,'like':1},'out-breeding':{'among':1,'when':1,'exogamy':1},'lord':{'popular':1,'kelvin':5,'avebury':1},'non-intelligent':{'experiments':1},'flicking':{'out':1},'meadows':{'and':2,'an':1},'sinking':{'down':2,'according':1,'in':1},'digit':{'of':1,'well':1},'co-operation':{'of':2},'oceans':{'lie':1,'of':1,'there':1,'are':1,'goes':1,'must':1},'pigment':{'and':1,'is':2,'.':1,'as':1,'which':1,';':1},'figs':{'.':1},'fingers.':{'but':1},'experimentally':{'on':1},'bringing':{'of':1,'about':1,'the':2},'elevations':{'and':1,'of':1},'meadow.':{'in':1},'internally':{'hot':1},'whitman':{'says':1,'took':1},'colour--the':{'result':2},'stars.':{'yet':1},'persisted':{'as':1,'until':1},'chameleons':{'the':1,'.':1},'intensification':{'of':1},'succession':{'giving':1,'of':5,'the':1,'has':1,'.':1},'tube--the':{'walls':1},'ultra-violet':{'and':1,'light':1,'waves--which':1,'or':1,'waves':1},'straight':{'ahead':1,'drop':1,'lines':1,'down':1,'through':1,'in':1,'path':2,'line':1,'legs':1,'along':1},'spiders':{'about':1,'were':1,'it':1,'.':1,'scorpions':1,'are':1,'have':1,'in':1},'specially':{'protected':1,'adapted':1},'symmetry.':{'illustration':1},'stiffens':{'.':1},'270':{'a':1,'silk':1,'reproduced':1},'271':{'electrical':1,'from':1},'second':{'and':5,'layer':1,'when':1,'year':1,'extinction':1,'yet':1,'any':1,'group':1,'would':3,'there':1,'question':2,'.':10,'to':1,'millennium':1,'which':1,';':1,'then':1,'we':1,'advantage':1,'that':1,'class':1,'screen.':1,'interglacial':1,'every':1,'longest':1,'not':1,'cousin':1,'copy':1,'opportunity':1,'by':1,'a':1,'great':1,'these':1,'of':1,'or':1,'preparation':1,'printing':1,'error':1,'position':1,'the':2,'chapter':1,'photograph':2},'attended':{'the':1,'by':2},'274':{'photo':1},'275':{'from':1},'278':{'hours':1,'photo':1},'279':{'rotating':1,'the':2},'inanimate':{'world':1},'dormancy':{'.':1},'errors':{'a':1,'in':1},'semicircular':{'canals':1},'phalangers':{'and':1,'flying':1},'thunder':{'and':1,'means':1},'nature.':{'the':1,'typical':1,'what':1,'illustration':1,'one':1},'contributed':{'every':1},'fingers':{'and':6,'to':1,';':1,'2':1,'knocking':1},'lowliness':{'.':1},'fossil':{'horses':1,'remains':2,'series':1,'forms':2,'scorpions':1,'of':2,'species':1},'increasing':{'control--a':1,'temperature':1,'facility':1,'intelligence':1,'complexity':2,'fullness':1,'the':1,'with':1,'day':1},'inducement':{'many':1},'surface--the':{'photosphere--is':1},'chins':{'and':1},'error':{'a':1,'we':1,'is':1,'here':1,'method':2,'to':1,';':1,'or':1,'must':1},'here':{'and':5,'says':1,'is':5,'within':1,'some':1,'it':1,'anticipating':1,'go':1,'seen':1,'again':4,'for':1,'also':1,'rather':1,'concerned':1,'since':1,'.':1,'to':3,'only':2,'cockchafers':1,'you':1,'was':2,'refer':1,'we':2,'let':1,'with':1,'nor':1,'a':1,'of':1,'spontaneously':1,'the':2,'stimulating':1,'are':1},'atoms':{'and':10,'being':1,'is':1,'an':1,'270':1,'whilst':1,'exist':1,'are':4,'have':1,'in':3,'seem':1,'seek':1,'containing':1,'indivisible':1,'from':1,'appear':1,'would':1,'with':1,'had':1,'.':5,'which':2,'got':1,';':2,'has':1,'was':1,'into':1,'do':2,'form':1,'were':4,'but':1,'atoms':2,'break':1,'most':1,'they':1,'put':1,'come':1,'themselves':1,'he':1,'for':1,'of':33,'enter':1,'the':2,'first':1,'at':1},'reported':{'to':1,'in':1,'that':1},'china':{'and':1},'evolutionist':{'s':1,'ideas':1,'suggestion':1},'fire.':{'chief':1,'saturn':1},'substance':{'in':1,'both':1,'from':2,'would':1,'is':1,'after':1,'glowing':1,'reaches':1,'.':3,'will':1,'to':1,'as':2,'but':1,'which':2,'were':1,'known':1,'has':1,'by':1},'contribute.':{'another':1},'k':{'.':1},'second--more':{'than':1},'reports':{'performances':1},'controversy':{'as':1},'forbes':{'observed':1,'tells':1,'history':1},'symmetrical':{'fishes.':1},'heidelbergensis':{'discovered':1},'appropriately':{'giants':1},'divide':{'a':1,'in':1},'owed':{'to':1},'explained':{'on':1,'because':1,'presently':1,'that':1,'later':1,'in':4,'by':1},'lengthen':{'the':1},'replace':{'the':4,'it':1},'brought':{'about':3,'to':3,'into':2,'up':1,'us':1,'their':1,'outside':1,'near':2,'through':1,'together':1,'in':1,'the':1,'its':1},'larger.':{'6':1},'female.':{'the':1},'obligation':{'works':1},'unit':{'body':1,'of':1,'for':1,'areas':1},'disproved--e.g':{'.':1},'spoke':{'of':3},'temperature.':{'if':1},'1892':{'.':1},'occupying':{'a':1},'vol':{'.':4},'untie':{'knots':1},'therefore':{'there':1,'is':2,'it':1,'one':2,'as':1,'are':2,'have':1,'even':1,'little':1,'since':1,'to':1,'survey':1,'means':1,'more':1,'form':1,'that':7,'imagine':1,'not':1,'conspicuous':1,'must':1,'a':2,'always':1,'so':1,'contain':1,'the':1,'called':1},'strike':{'a':1,'to':1,'the':2},'fossiliferous':{'beds':1},'until':{'comparatively':1,'some':1,'it':7,'one':1,'discovered':1,'at':3,'in':1,'its':2,'there':1,'when':1,'finally':1,'we':1,'recently':1,'that':1,'they':5,'such':1,'inconceivable':1,'a':3,'both':1,'i':1,'near':1,'the':3,'once':1},'skill.':{'illustration':1},'females':{'go':1,'the':1,'who':1,'use':1},'9.':{'instinctive':1},'successful':{'hunting':1,'accomplishment':2,'.':1,'notably':1,'race':1,'animal':1,'in':1,'performance':1,';':2,'class':1},'brings':{'about':1,'his':1,'this':1,'them':1,'us':1,'obvious':1,'the':1},'whirling':{'nebulae.':1,'gaseous':1,'streams':1,'motions':1,'electrons':1,'ring':1,'round':1},'glass':{'and':1,'on':1,'by':1,'blown':1,'wall':1,'of':1,'tube':1,'jar':1,'prism':3,'vulcanite':1,'.':2,'walls':1,'vibrate':1,'prism--a':1,'the':2,'tubes':1,'model':2},'inwards':{'each':1},'91':{'photo':1,'after':1,'pictorial':1},'90':{'photo':1,'from':1,'days':2,'per':1},'midst':{'of':1},'92':{'830':2,'as':1,'fossil':1},'95':{'photo':1,'from':1},'immature':{'sperm':1,'egg':1,'larval':1},'circumstances':{'and':1,'of':1,'it':1,'however':1,'indicate':1,'as':1},'locked':{'up':3},'mimickers':{'do':1,'live':1,'though':1,'survive--although':1},'pursue':{'further':1,'the':1},'accomplishment':{'of':2,'would':1},'plunged':{'in':1},'tell-tale':{'evidence':2},'temperatures':{'and':2,'as':1,'enormously':1,'but':1,';':1},'concepts':{'differ':1,'or':1},'plunges':{'into':1},'example':{'a':2,'passes':1,'of':5,'is':1,'three':1,'.':1,'the':1,'out':1},'type.':{'there':1,'steps':1,'it':1,'illustration':1},'encouragement.':{'evidences':1},'nitrates':{'which':1},'organized':{'under':1},'shore.':{'the':1},'dragons':{'and':1,'a':1,'for':1,'stalking':1,'which':1,'the':1,'or':1},'glued':{'to':1,'together':2},'caution':{'is':2,':':1,'in':2},'kingdoms':{'to':1},'want':{'to':1,'that':1},'oil-sheet':{'by':1},'absolute':{'cold':1,'calm':1,'zero':2},'disappearing.':{'thus':1},'travel':{'from':2,'for':1,'that':2,'fifteen':1,'is':1,'it':1,'.':2,'through':1,'at':3,'in':3,'rapidly':1,'with':1,'by':1,'round':1},'drying':{'up':1},'feature':{'of':2,'is':1,'in':2,'that':1},'machine':{'and':1,'readable':1,'which':1,'in':1},'how':{'beautiful':1,'this':2,'all':2,'useful':1,'striking':1,'vertebrates':1,'abundantly':1,'it':6,'long':4,'in':1,'curious':1,'your':1,'their':2,'thoroughly':1,'sunlight':1,'.':1,'to':9,'much':1,'--all':1,'he':1,'admirable':1,'is':1,'whipped':1,'noble':1,'we':4,'express':1,'do':4,'men':1,'but':1,'soon':1,'magnetism':1,'important':1,'infinite':1,'man':1,'a':1,'like':2,'these':2,'many':4,'could':2,'well':1,'swiftly':1,'did':1,'electrons':1,'can':1,'the':14,'professor':1,'are':2},'krait':{':':2,'should':1},'hop':{'.':1},'significance':{'of':3,'is':1,'.':1,'was':1,'that':1},'mueller':{'where':1},'uselessness':{'of':1},'utilise':{'their':1,'the':7,'atomic':1,'directly':1},'ptarmigan':{'very':1,'moults':1},'diagram':{'a':1,'and':1,'illustrating':3,'illustrates':2,'of':10,'showing':3,'.':4,'fig':2,'shows':2,'is':3,'constructed':1},'dinosaurs':{'and':1,'it':1,'which':1,'in':1},'wrong':{'and':1,'side':1,'though':1},'lattice-work':{'than':1,'but':1},'destined':{'to':3,'within':1},'twined':{'round':1},'pearl-bearing':{'river-mussels':1},'factor.':{'we':1},'types':{'and':2,'we':1,'like':2,'especially':1,'that':2,'of':10,'it':1,'.':2,'are':3,'which':3,'suited':1,'the':1,'has':1,'nearly':1},'calves':{'young':1},'effective':{'and':1,'substitutes':1,'ways':1,'camouflaging':1,'flying':1,'.':1,'action':1,';':1,'response':1},'endeavoured':{'instead':1},'attracts':{'every':1},'headquarters':{'of':1},'specks':{'faintly':1},'keeps':{'the':1,'as':1,'an':1},'back--till':{'we':1},'wing':{'and':1,'remains':1,'of':4,'is':3,'.':3,'while':1,'action':1,'has':1,'was':2},'wind':{'and':3,'tugs':1,'from':1,'around':1,'that':1,'pay':1,'.':1,'falls':1},'wine':{'decanter':1},'ovule':{'so':1},'restriction':{'attendant':1},'school.':{'as':1},'effect.':{'the':1,'illustration':1},'vary':{'a':1,'enormously':1,'.':1},'halfpennies':{'.':1},'microbe':{'or':1},'fore-limbs':{'and':3,'a':1,'emerging':1,'of':1},'elevated':{'into':1},'rewarded':{'the':2},'throne.':{'illustration':1},'wrought':{'on':1,'out':2,'in':1},'admirably':{'suited':1},'matures':{'or':1},'fit':{'and':2,'effected':1,'variations':1,'will':1,'to':2,'beautiful':1,'lasts':1,'the':1},'bodies--evolution':{'of':2},'heretofore':{'unimagined':1},'fix':{'dates':1,'after':1,'the':1},'occupations':{'and':1,'whether':1},'survivors':{'in':1},'woolly-haired':{'africans':1,'african':1},'anticipations':{'at':1},'fig':{'4':1,'.':36},'nobler':{'more':1},'hidden':{'disc':1,'from':1,'secrets.':1,'or':1},'alpine':{'heights':1},'admirable':{'indeed':1,'is':1,'adjustment':1,'in':1},'easier':{'to':4,'for':1},'bristle':{'.':1},'bolton.':{'the':3,'orang-utan':1,'chimpanzee':1,'cassowary':1},'f.r.s':{'.':1},'effects':{'and':1,'on':1,'from':1,'of':2,'due':1,'.':1,'are':1},'stars;':{'their':1},'coal-fields':{'is':1,'can':1},'devices.':{'vii':1,'illustration':1},'prize':{'is':1},'represents':{'a':2,'the':4,'an':1},'educable.':{'illustration':1},'humming-birds':{'we':1},'arrow':{'round':1,'shows':1},'obdurate':{'solid':1},'burial':{'customs':1},'financial':{'support':1},'telescope':{'and':1,'because':1,'show':1,'developed':1,'is':4,'it':1,'depends':1,'at':1,'in':1,'takes':1,'49':1,'remains':1,'.':3,':':1,'was':1,'brings':1,'construction':2,'with':1,'of':1,'mount':2,'weigh':1,'the':2},'garment':{'of':5,'by':1,'.':1},'spider':{'called':1,'203':1,'has':1,'that':1,'may':2,'dr':1,'ascends':1,'after':1,'reaches':1,'sunning':2,'jerks':1,'to':4,'s':1,'which':1,'--brushes':1,'with':1,'is':1,'ornithoscatoides':1},'parasites':{'a':1,'have':1,'may':1,'casual':1,'as':1,'are':2,'which':1,'or':1,'often':1},'armour--the':{'sea-urchin':1},'contracting':{'striped':1,'muscles':1,'mass':1,'the':1,'its':1},'depositing':{'eggs':1},'laboratory':{'cambridge':1,'would':1,'had':1,'but':1,'.':1,'at':1,'in':1,';':1,'or':1},'nerve-cell':{'s.c.':1,'m.c.':1,'a.c.':1},'message':{'travels':3,'is':2,'reaches':1},'borne':{'on':1,'just':1,'away':1,'in':1,'usually':1,'by':2,'out':1},'speed.':{'in':1},'excepting':{'the':1},'ice-sheets':{'retreated':1},'unrelated':{'types':1},'adapt':{'itself':1},'centauri':{'4.29':1,'estimated':1},'foundation':{'and':3,'web':1,'makes':1,'is':2,'as':1,'.':3,'project':1,'how':1,'s':3,'at':1,'in':1,'the':5,'was':1,'or':1,'are':1,'anyone':1},'stamping':{'a':1},'assured':{'that':1},'waddle':{'130':1},'strata':{'of':3,'is':1,'when':1,'contained':1,'have':1,';':1,'with':1},'solution':{'containing':1,'that':1,'may':1,'of':4,'within':1,'when':1,'has':1,'was':1},'sensory':{'nerve-fibre':2,'nerve-cell':1,'equipment':1,'nerve-cells':1,'stimulus':1,'fibres':1,'alertness':1},'born.':{'but':1},'crowned':{'with':1},'estimate':{'and':1,'obtained':1,'being':1,'how':1,'this':1,'of':2,'its':1,'these':1,'by':1},'universally':{'true':1},'enormous':{'distances':2,'energy':1,'number':1,'disc-like':1,'pressure--2-1':1,'size':1,'infantile':2,'vibration':1,'speed':1,'depths.':1,'amount':2,'increase':1,'pressures':1,'role':1,'store':1,'dilatable':1,'pressure':1,'jets':1,'velocities':1,'length':1,'activity':1,'velocity':1,'the':1},'bates':{'tells':1,'but':1},'exposing':{'it':1},'merychippus':{';':1,'miocene':1},'shelves':{'of':1},'hind-limbs':{'of':2},'perhaps.':{'moreover':1},'elements--we':{'have':1},'disturbed':{'development':1,'and':1,'.':2},'tempting':{'but':1,'one':1},'ineffectively':{'or':1},'speeds':{'to':1},'appreciable':{'atmosphere':1},'gas-bubbles':{'and':1,'in':1},'wasp':{'or':1,'beetle':2},'subtlety':{'in':1,'that':1},'maladies':{'to':1},'channels':{'or':1},'spinning':{'slowly':1,'threads':1,'round':1},'179':{'a':1,'photograph':1,'reproduced':1},'178':{'photo':1,'after':1},'likes.':{'illustration':1},'175':{'after':1},'174':{'after':1},'flagella':{'.':1},'172':{'000':1,'piltdown':1},'171':{'reproduced':1},'170':{'after':1,'from':1},'bitten':{'by':1},'service':{'to':1,'in':2,'abroad':1,'.':1},'similarly':{'for':1,'suggest':1,'when':1,'our':1,'the':3,'adapted':1,'out':1},'cooling':{'and':1,'white-hot':1,'of':3,'metal':1,'but':1,'down':3,'earth':1,'the':1},'needed':{'.':1,'for':1,'in':1},'master':{'of':1,'the':2,'different':1},'blossoms':{'.':1},'gilbert':{'white':1},'legs':{'and':4,'on':1,'free':1,'.':3,'to':1,'indents':1,'so':1,'are':1,'out':1},'genesis':{'of':1,'.':1},'treasure-house':{'of':1},'listen':{'it':1},'rewards':{'to':1},'fibrous':{'husk':1},'wisdom':{'of':1,'in':1},'egg-producer':{'.':1},'motionless':{'on':1,'at':1,'that':1},'predictable':{'and':1},'collaterals':{'hundreds':1,'.':1},'scarborough':{'and':2},'positively':{'say':2,'that':1,'into':1,'charged':1},'insect-visitors':{';':1},'surer':{'by':1},'showed':{'a':1,'on':1,'great':1,'for':1,'that':9,'is':1,'how':2,'simian':1,'the':1},'miniatures':{'of':1},'tree':{'and':2,'217':1,'notice':1,'of':5,'into':1,'struggles':1,'but':1,'.':2,'to':3,'near':1,'i.e':1,'with':1,'is':2,'before':1},'likely':{'to':5,'that':1,'unless':1,'it':1,'however':1},'idly':{'on':1,'why':1},'project':{'gutenberg-tm':56,'gutenberg':29,'gutenberg:':1,'gutenberg-tm.':1,'from':1},'fly-trap':{'77':1,'when':1,'one':1},'feeling':{'and':2,'of':1,'is':1,'.':1,'their':2,'things':1,'or':1},'acquisition':{'almost':1,'of':1,'made':1,'associated':1,'by':1},'life--the':{'first':2},'groaning':{'and':3},'objects':{'and':1,'do':1,'for':1,'very':1,'but':1,'.':2,'271':1,'take':1,'in':2},'similitude':{'of':2},'oxygen-capture':{';':1},'spectrum':{'and':2,'rays':1,'provides':1,'of':4,'is':2,'emitted':1,'analysis':2,'.':3,'will':1,'as':1,'are':1,'have':1,'the':2},'controversy.':{'in':1},'antagonistic':{'substances':1},'well.':{'illustration':1},'constricted':{'off':1},'oxygen-combustion':{'the':1},'dozen':{'eggs':1,'classes':1,'by':1,'years':1},'affairs':{'on':1,';':1,'would':1},'wholesome':{'superstitions':1},'yolk-forming':{'and':1},'person':{'often':1,'you':1,'or':3,'can':1},'eagerly':{'following':1},'metallic':{'vapours':1},'toothed':{'whales':1,'bird':2,'birds':1},'australia--all':{'sometimes':1},'absorbed':{'but':1,'so':1,'in':1,';':1,'with':1,'by':2},'doors':{'and':1,'of':1,'.':1,'depositing':1,'which':1,'were':1},'season':{'209':1,'it':1,'illustration':1},'concedes':{'the':1},'rhodesia':{'very':1,'178':1},'shall':{'be':2,'we':1,'deal':1,'give':1,'predict':1,'explain':2,'never':1,'content':1,'see':11,'have':1,'not':1,'see.':2,'find':2,'refer':1},'screwing':{'the':1,'it':1},'object':{'and':1,'we':1,'of':2,'.':1,'to':1,'too':1,'in':2,'drawn':1},'diminishing':{'in':1},'victoria':{'b':1,'british':2},'gill-cavity':{'and':1},'mouth':{'and':5,'of':1,'is':1,'there':2,'.':6,'allied':1,'are':1,'in':1,'the':1,'where':1,'into':1,'came':1},'long.':{'in':1},'letter':{'is':1,'there':1,'o':2},'drought':{'and':2,'is':1,'frost':1,'by':1,'extremes':1},'hide-and-seek':{'game':1},'difficulties.':{'illustration':1},'expound':{'their':1},'redistribution':{'is':1},'episode':{'in':1},'available.':{'many':1},'professor':{'holmes':2,'and':1,'thomas':2,'j':3,'tacchini':1,'rayleigh':1,'michael':1,'frederick':1,'chamberlin':1,'yerkes':3,'hickson':1,'starling':1,'lull':3,'church':2,'soddy':3,'eddington':4,'sir':8,'le':1,'royal':1,'young':1,'pickering':1,'soddy.':1,'john':1,'gamble':2,'soddy--as':1,'oscar':1,'perrin':1,'william':1,'flinders':1,'buller':1,'wood':1,'thorndike':3,'e':2,'whitman':1,'h':2,'later':1,'poulton':1,'l':2,'curie':1,'s':1,'r':6,'bayliss':1,'w':3,'of':3,'schuchert':2,'percival':2,'left':1,'schwalbe':1,'lloyd':2},'nineteenth':{'century.':2,'century':6},'mating':{'.':1},'incomplete':{'inaccurate':1,'.':1},'marvel':{'that':1},'hobhouse':{'has':1,'had':1},'insects':{'and':5,'belonging':1,'related':1,'extinct':1,'spring-tails':1,'pterodactyls':1,'whose':1,'by':2,'appear':1,'perhaps':1,'divided':1,'.':3,'to':1,'only':1,'which':1,'birds':1,'we':1,'that':2,'rest':1,'such':1,'with':1,'than':1,'on':1,'made':1,'like':1,'could':1,'carries':1,'can':1,'the':2,'where':1,'spend':1},'sea-snakes':{'such':1},'feather-stars':{'on':1},'apace':{'there':1},'touches':{'the':1,'some':1,'one':1},'flagellates--the':{'originators':1},'methods--one':{'using':1},'shuffling':{'a':1,'the':1},'quaint':{'insects':1,'lop-eared':1,'ways':1,'explorer':1,'creatures':2},'unrest.':{'many':1},'character':{'of':1,'set':1,'except':1},'bush':{'in':1},'touched':{'it.':1,'on':1,'by':1},'rich':{'repertory':1,'inheritance':1,'area':1,'seaweed':1,'in':4},'rice':{';':1},'plate':{'and':2,'reveals':1,'may':1,'of':3,'is':1,'there':1,'however':1,'.':4,'underneath':1,'to':1,'goes':1,';':1,'has':1,'holder':1},'well-advanced':{'stage':1},'wide':{'of':1,'range':2,'spread':1,'departures':1,'apart':1},'foremost':{'living':1},'pocket':{'and':1,'of':1,'is':1},'insect.':{'masking':1},'altogether':{'and':1,'we':1,'from':1,'obscure.':1,'there':1,'.':1,'lies':1,'inattentive.':1,'extinct':1,'the':1,'apart':1},'tips':{'of':1,'form':1},'transmissible.':{'given':1},'societies':{'.':1},'greens':{'and':1},'dipnoi':{'which':1},'patch':{'of':2,'which':1},'men.':{'we':1,'the':1},'fitly':{'use':1},'release':{'date':1,'harness':1},'them.':{'1':1,'we':1,'clodd':1},'hasten':{'matters':1,'however':1},'lesson.':{'we':1},'circling':{'eddies':1,'round':1},'protists':{'the':1,'which':1},'evolutionism':{'with':1},'traverse':{'matter':1,'we':1},'fair':{'to':1},'radium':{'and':6,'discharges':1,'270':1,'as':1,'sec':1,'in':1,'salts':1,'passes':2,'rays':8,'began':1,'that':1,'when':1,'.':2,'to':1,'rays.':1,'john':2,'was':2,'generates':1,'captivated':1,'may':1,'now':1,'a':1,'implied':1,'the':2,'or':2},'niche':{'of':2,'among':1},'radius':{'and':1},'result':{'we':1,'of':10,'is':1,'when':1,'.':1,'will':4,'as':1,'strange':1,'which':1,'in':1,'not':1,'was':2},'fail':{'to':4},'nocturnal':{'birds':1,'animal':1},'skulls':{'high':1,'of':1,'.':1},'best':{'methods':1,'for':1,'of':2,'explanation':1,'.':1,'to':1,'while':1,'suited':1,'thermometer':1,'illustrations':1,'i.e':1,'has':1,'dress':1,'conductors.':1},'oceanic':{'islands':1},'rings':{'and':1,'from':1,'of':1,'mighty':1,'are':1,'in':1,'the':1,'round':1},'frond-like':{'tassels':1,'tags':1},'stealthy':{';':1,'stalking':1},'pressures':{'the':1,'that':1},'score':{'of':1,'but':1,'which':1},'conceptual':{'as':1,'inference':1,'inference--or':1},'propagated':{';':1},'circulating':{'at':1,'the':1,'round':1,'as':1,'in':1},'glasgow':{'and':1},'magnesium':{';':1},'preserve':{'free':1},'claws':{'on':3,'especially':1,'.':1},'men':{'and':2,'indicated':1,'it':1,'as':1,'at':1,'have':1,'oftener':1,'still':1,'ancient':1,'.':5,'to':1,'that--':1,'who':4,'proving':1,'but':2,'arose':1,'with':1,'like':2,'of':19,'s':1,'so':1,'were':1,'the':1,'powers':1,'or':1},'extend':{'far':1,'our':1,'the':1,'towards':1,'outwards':1},'nature':{'and':3,'because':1,'less':1,'is':1,'some':1,'depends':1,'acts':1,'draws':1,'would':1,'there':1,'had':1,'.':5,'which':1,'messrs':2,'drawn':1,';':1,'has':2,'was':3,'more':1,'never':1,'but':1,'includes':1,'november':1,'the':1,'a':1,'about':1,'of':28,'s':8,'ninety-two':1,'messrs.':2,'or':1,'involves':2},'blood-containing':{'tufts':1},'twinkling':{'of':1},'cards':{'and':1,'with':1,'but':1,'.':1,'are':1,'come':1},'extent':{'and':1,'on':2,'what':1,'gauged':1,'of':1,'able':1,'intelligently':1,'by':1,'to':1,';':1,'permitted':1},'carbon':{'immersed':1,'compounds':4,'hydrogen':1,'until':1,'dioxide':1},'debt':{'repaid':1},'well-lighted':{'surface':1},'tyranny':{'of':3},'outcome':{'of':12,'is':2},'sacrificing':{'accuracy':1},'refinement':{'and':1},'country':{'then':1,'of':1,'to':1,'outside':1,'in':2,'nothing':1,'the':1},'conclusions':{'are':1,'which':1},'heating':{'process':1},'tree-toads':{'tree-snakes':1},'dents':{'or':1},'argue':{'fire':1},'adapted':{'for':14,'many':1,'.':1,'to':12,'itself':1,'so':1,'in':1},'asked':{'perhaps':1,'to':1,'what':1,'for':3},'exogamy':{'tending':1},'vain':{'and':1},'canyon':{'60':1,'many':1},'259':{'professor':1},'irresponsibly':{'they':1},'252':{'reproduced':1},'250':{'what':1,'000':2,'miles':1,'fathoms':2,'the':1,'inconceivable':1},'251':{'a':1},'grazing':{'mammals':1,'the':1,'herds':1,'bison':2,'in':1},'254':{'photo':1,'from':1,'reproduced':1},'255':{'reproduced':1},'101':{'after':1},'berenices':{'is':1,'.':1},'union':{'of':3,'with':1},'fro':{'about':1,'more':1},'.':{'secondly':1,'all':12,'three-toed':2,'sci':2,'skeleton':1,'chain':1,'holman':1,'mcintosh.':2,'four':1,'zinc':1,'foundations':1,'contributions':1,'magnifying':1,'certainly':1,'fahr.':1,'father':1,'young':2,'miall':1,'to':27,'finally':2,'romanes':1,'lord':1,'non-intelligent':1,'protective':1,'7':4,'very':5,'every':12,'dando':1,'radio-active':1,'well-finished':1,'f.r.s':1,'louis':1,'laying':1,'t.':1,'p':9,'hickson':1,'small':2,'indemnity':1,'round':1,'upper':1,'feathers':1,'yerkes':1,'electricians':1,'further':1,'langmuir':1,'blue':1,'what':24,'17.--a':1,'pariasaurus':1,'paintings':1,'section':1,'above':3,'dr.':1,'new':3,'movement':1,'cheetahs':1,'sci.':1,'men':1,'here':10,'hundreds':1,'anthropology':2,'let':7,'others':3,'along':3,'f.r.s.':1,'neville':1,'daughter':1,'dividing':1,'chalmers':1,'k':1,'compliance':1,'forbes':3,'usually':1,'adopting':1,'holmes':1,'saunders':3,'24.--the':1,'berridge':8,'newby':1,'cuttlefishes':1,'everybody':1,'from':21,'russell':3,'would':1,'remains':1,'positive':1,'two':5,'anatomical':1,'examination':1,'therefore':2,'6':6,'taken':2,'until':2,'on':19,'flying':3,'inclined':1,'berridge.':10,'chimpanzee':1,'lodge':1,'everywhere':1,'hilger':2,'baby':2,'bates':2,'ward':21,'huxley':3,'dando.':3,'none':2,'animals':2,'f':5,'this':102,'science':5,'when':39,'piltdown':1,'3--the':1,'making':1,'male':1,'history':3,'frogs':1,'high':1,'something':1,'story':1,'presently':1,'sir':2,'end':1,'starch':1,'astronomers':3,'how':7,'orang-utan':1,'occasionally':1,'s.':1,'intelligent':1,'side-view':2,'millikan':2,'information':3,'slipher':1,'perrin':1,'after':15,'deep-sea':1,'waves':1,'such':10,'man':4,'a':95,'forestier':3,'light':6,'clavius':1,'osborn':3,'so':24,'kippax':1,'iii.':1,'sc':1,'evolutionary':1,'barnard':2,'pelican':1,'indeed':4,'21.--typical':1,'murray':2,'thomson':7,'helena':1,'experiments':2,'still':2,'its':14,'soddy':1,'before':1,'25':1,'27':1,'21':1,'22':1,'28':1,'wilkinson.':2,'lowell':5,'23.--star':1,'fabre.':2,'26.--a':1,'estuaries':1,'they':99,'compound':1,'not':6,'olcott':1,'now':23,'nor':2,'nos':1,'6.--solar':1,'f.e.s.':1,'james':1,'radiant':1,'reid.':2,'scharff':1,'associative':1,'weighs':1,'everyone':2,'directly':1,'needless':2,'series':2,'fish':1,'journ':2,'macmillan':3,'12.--jupiter':1,'owing':1,'our':5,'hart':1,'special':2,'out':2,'living':4,'9.--the':1,'furthermore':1,'since':2,'may':1,'america.':3,'safety':1,'rational':1,'10.--solar':1,'sluggish':1,'red':1,'7.--the':1,'quite':1,'fourteen':1,'extraordinary':1,'experimenting':1,'besides':6,'put':3,'detecting':2,'keith':1,'ll.d':2,'organic':1,'g':1,'where':2,'hence':5,'first':3,'18.--a':1,'copper':1,'already':1,'plainly':1,'thereafter':1,'one':16,'another':9,'mercury':1,'given':2,'ancient':2,'limited':2,'similarly':4,'anyone':2,'their':13,'2':23,'caterpillars':1,'white':1,'speaking':2,'x-rays':2,'that':23,'19.--comet':1,'part':2,'somewhat':1,'gilbert':1,'11':1,'10':2,'13':2,'b':7,'15':1,'14':2,'17':1,'16':2,'second':2,'project':3,'matter':2,'r':3,'algol':1,'other':4,'are':1,'and':41,'clerk-maxwell':3,'ltd.':2,'pliocene':1,'ages':4,'lull':4,'sentences':1,'1':26,'apparently':1,'any':1,'viewed':1,'eels':1,'u.s':1,'mic':1,'gravity':1,'note':5,'also':1,'without':4,'take':1,'sirius':1,'even':16,'play':2,'unless':4,'wilson.':2,'though':1,'price':1,'who':2,'hincks':1,'most':6,'combustion':1,'nothing':1,'america':1,'nutritive':1,'constitution':1,'firelight':1,'22.--a':1,'dragon-flies':1,'professor':12,'later':2,'heat':2,'looked':1,'25--giant':1,'electrons':7,'prout':1,'normally':1,'laws':1,'stones':1,'hobhouse':1,'aquatic':1,'charles':2,'14.--the':1,'lloyd':1,'uranus':1,'earth':1,'hinkins':2,'copyright':1,'duncan':1,'only':4,'going':2,'molecules':2,'humdrum':1,'thompson':1,'8':5,'4.--the':1,'darwin':4,'thousands':1,'combe':1,'do':3,'his':1,'fossil':1,'meanwhile':2,'15.--mars':1,'there':106,'watch':1,'watson':1,'12':2,'nearly':2,'distinctly':1,'during':3,'silk':2,'dr':1,'crabs':1,'evolution':3,'h':27,'girdled':1,'twice':2,'discs':1,'20.--comet':1,'she':8,'gibson':1,'1922':1,'intelligence':1,'radium':2,'notice':3,'j.':2,'sec':1,'mud-nests':1,'mcgregor.':12,'5.--diagram':1,'tropisms':1,'federal':1,'artificial':1,'birds':1,'3':19,'between':5,'probably':2,'email':1,'crookes':2,'we':115,'tylor':1,'fox-bat':1,'however':5,'8.--the':1,'atoms':2,'both':7,'c':18,'wallace':1,'many':17,'taking':1,'according':6,'s':21,'1.--diagrams':1,'johnstone':1,'otherwise':1,'among':4,'goodrich':1,'simple':4,'had':1,'jeans':1,'whatever':3,'pycraft':1,'church':1,'moreover':9,'newbigin':1,'broadening':1,'marett':1,'geddes':1,'much':5,'sponges':1,'bragg':2,'life':3,'modern':1,'partly':1,'c.':1,'four-toed':1,'luther':1,'13.--saturn':1,'shepstone.':6,'races':1,'despite':1,'an':14,'161':1,'those':4,'sound':1,'adaptations':1,'unlike':1,'these':36,'lightner':1,'16.--the':1,'n':2,'while':2,'suppose':1,'viii':1,'2.--the':1,'fore-limb':2,'then':4,'vol':1,'vi':1,'is':4,'thus':48,'it':317,'iv':2,'ii':2,'middle':2,'in':152,'mcgregor':2,'if':76,'jenner':1,'headley':1,'perhaps':13,'things':1,'make':1,'sollas':1,'babies':1,'9':2,'several':1,'yucca':1,'higher':1,'ball':1,'see':4,'kelvin':1,'v.':1,'kinnaman':1,'moving':2,'lower':2,'i':3,'no':11,'mccabe':1,'contact':1,'furneaux':1,'comparisons':1,'the':569,'redistribution':1,'just':2,'being':1,'generally':1,'rest':1,'ideas':1,'disguise':1,'ritchie':2,'years':1,'paul':1,'yet':11,'like':1,'smith':1,'except':2,'potential':1,'4':15,'5':8,'putnam':2,'possibly':1,'boxes':1,'royalty':2,'five':1,'6.':1,'apart':4,'tail':1,'d':1,'lightning':1,'enregistered':1,'arthur':7,'donations':1,'t':1,'interbreeding':1,'webb':1,'old':1,'flattely':1,'triceratops':1,'some':37,'jupiter':2,'easygoing':1,'gradually':1,'for':44,'shall':1,'skeletons':1,'everything':2,'does':1,'subtlest':1,'newcomb':2,'11.--mars':1,'each':13,'illustration':2,'subconscious':1,'great':1,'although':4,'affording':1,'by':18,'macpherson.':1,'actual':1,'extending':1,'of':25,'o':1,'sea-horse':1,'whence':3,'larmor':1,'gregory':1,'consequently':1,'or':6,'naturalists':1,'serviss':1,'kapp':1,'reactions':1,'within':3,'chemists':1,'mic.':1,'mills.':2,'haddon':2,'protozoa':1,'swimmers':1,'nowadays':1,'theoretically':1,'technically':1,'doubtless':1,'linnaeus':1,'additional':1,'her':1,'placing':1,'brute':1,'long':1,'why':2,'moseley':3,'daniell':1,'stars':1,'duffus.':2,'energy':3,'naturally':1,'lowest':1,'gluten':1,'mammals':1,'but':138,'cloth':1,'curiously':1,'white.':1,'with':8,'he':39,'october':1,'whether':5,'j':40,'up':1,'idiosyncrasies':1,'stages':1,'similar':2,'sometimes':6,'taste':1,'certain':1,'metals':1,'general':2,'as':35,'ether':1,'at':22,'adams':2,'again':1,'compared':2,'curie':1,'9.':1,'c.:':1,'pickering':1,'electrical':1,'you':12,'picture':1,'energetic':1,'carpenter':1,'marshes':1,'fishes':2,'ramsay':1,'building':1,'e':5,'glass':1,'persistent':1,'together':1,'brocklehurst.':4,'mckready':1,'functionless':1,'keane':1,'once':1},'much':{'indebted':1,'harm':1,'smaller':2,'less':4,'wall':1,'intelligence':1,'subtlety':1,'alive':1,'parasites':1,'as':5,'disarranged':1,'right':1,'in':5,'sought':1,'beyond':1,'exhausted':1,'if':1,'nearer':2,'use':1,'cut':1,'from':1,'for':4,'.':2,'better':1,'to':10,'changed':1,'change':1,'progress':1,';':1,'has':1,'dreaded':1,'energy':2,'more':24,'scepticism':1,'used':2,'paperwork':1,'greater':5,'trace':1,'that':1,'importance':2,'gliding':1,'is':1,'controversy':1,'damaged':1,'denser':1,'speculation':1,'bigger':1,'simpler':1,'a':1,'on':1,'surer':1,'faster':1,'of':5,'larger':2,'stronger':1,'greater--a':1,'easier':1,'so':1,'truth':1,'light':1,'the':3,'movement':1},'pedigree--man':{'s':1},'104':{'after':1},'sponges':{'stinging':1,'zoophytes':1,'jellyfishes':1,'spongillidae':1,'are':1,'corals':1,'jellyfish':1},'smolts':{'and':1,'which':1},'fry':{'become':1,'about':2,'rises':1,'ltd.':2},'105':{'an':1},'exactness':{'with':1},'life':{'and':15,'among':1,'because':1,'although':1,'exists':1,'is':6,'it':1,'lies':1,'namely':1,'through':4,'are':3,'in':13,'palaeozoic':1,'best':1,'if':1,'depend':1,'for':1,'to':4,'remains':1,'began':1,'there':2,'had':1,'1914':1,'1':1,'.':17,'of':19,'whole':1,'which':3,';':4,'before':1,'was':2,'as':4,'than':1,'that':1,'after':1,'possible':1,'illustration':1,'but':4,'utterly':1,'during':1,'166':1,'continued':1,'by':1,'a':1,'on':18,'depends.':1,'has':4,'animals':1,'1921':2,'many':1,'depends':2,'will':1,'s':1,'can':1,'though':1,'each':1,'at':1,'taxed':1,'the':3,'history':1,'where':1,'or':1,'72':1},'latro':{'that':2},'retrospect':{'looking':1},'in-breeding':{'endogamy':1,'tended':1},'conifers':{'and':1,'ginkgos':1,'shall':1},'luther':{'the':1,'burbank':1},'shepstone.':{'light':1,'the':2,'modern':1,'100-inch':1,'lightning':1},'connaissance':{'du':1},'tree-mice':{'tree-porcupines':1},'child':{'of':4,'s':4,'does':1,'.':1,'that':1},'chili':{'where':1},'spin':{'round':1},'breast-pocket':{';':1},'control--a':{'promise':1},'adaptations':{'and':1,'of':1,'or':1,'to':5,'which':1,'such':1,'by':1},'heidelberg':{'man':5,':':2,'was':1,'sand-pit':1,'in':2},'contemp':{'.':1},'viii':{'foundations':1,'.':2},'flooding':{'space':1},'elaborate':{'burial':1},'picturing':{'a':1},'remembering':{'the':1,'that':1},'played':{'an':1},'equator':{'and':1,'of':1,'.':1,'seems':1,'i.e':1},'photographer.':{'as':1},'obeying':{'the':2},'player':{'is':1},'australia':{'perhaps':2,'is':1,'190':1,'it':1,'to':1,'neoceratodus':1,'which':1,'the':1,'95':1},'anticipating':{'the':1,'we':1},'south.':{'illustration':1},'plants.':{'sec':1,'illustration':1},'said.':{'illustration':1},'open-water':{'period':1,'turtles':1},'damaged':{'disk':1,'by':1},'feebler':{'and':1,'until':1},'things':{'and':6,'endowed':1,'is':1,'effectively':1,'as':1,'are':1,'in':2,'dr':1,'.':6,'to':1,'which':2,'wildly':1,';':1,'was':1,'horses':1,'do':1,'we':3,'that':5,'with':1,'you':1,'he':1,'on':1,'like':1,'e.g':1,'without':1,'mixed':1,'or':1},'format':{'other':1,'with':1,'used':1,'must':1},'killdeer':{'plover':1},'dissimilars':{'tends':1},'clucking':{'of':1},'gateways':{'to':1,'of':3},'double-breathers':{'dipnoi':1},'elliott':{'fry.':2,'fry':1},'emphatic':{'notice':1,'rejection':1},'european':{'fauna':1,'lynx':1},'increased.':{'electrons':1,'illustration':1},'fairly':{'what':1,'complicated':1,'mastered':1},'typhoid':{'fever':1},'georgics':{'to':1},'middle-aged':{'and':1},'effectively':{'to':1,'e.g':1,'conquered.':1,'.':1},'pioneers':{'men':1},'race-history':{'.':1},'tune':{'to':1},'registering':{'steps':1},'stupendous':{'energy':1,'collection':1,'.':1},'matters':{'little':1,'greatly':1},'erectus':{'found':1},'-mammal':{'and':1},'raindrops':{'and':1},'opinions':{'with':1},'boyhood':{'the':1},'sea-skimmers':{'halobatidae':1},'sleeps':{'upright':1},'golden':{'draperies':1,'plover':1,'age':5,'eagles.':1,';':1},'expensively':{'for':1},'distribute':{'a':1,'this':1,'copies':1,'it':1,'the':1,'or':2},'rotated':{'that':1},'beset':{'with':1},'disguise':{'and':1,'besides':1,'is':1,'.':3,'sec':1,'which':1,'differs':1,'the':1,'with':1,'or':1},'neanderthalers':{'and':1},'falcon':{'s':2},'glue-like':{'threads':1},'hen-pigeon':{'may':1},'rushing':{'torrent':1},'succeeding':{'ages':2},'lasso':{'minute':1},'99712':{'.':1},'spectacles':{'in':1},'seal':{'right':1},'old-fashioned':{'type':1,'way':1},'had':{'gone':2,'remained':1,'appeared':2,'dived':1,'some':1,'few':1,'increased':1,'brought':1,'wit':1,'at':1,'human':1,'seen':1,'swallowed':1,'enjoyed':1,'to':8,'really':1,'established':1,'given':1,'surmised':1,'proceeded':1,'rushed':1,'there':2,'been':18,'anatomical':1,'their':5,'only':1,'definitely':1,'emerged':1,'probably':1,'learned':2,'mainly':1,'claws':2,'his':1,'tried':1,'feathers':1,'gathered':1,'never':1,'extended':1,'anticipated':1,'its':4,'haunted':1,'no':4,'survived':1,'become':2,'not':6,'suspected':1,'disappeared':1,'undoubtedly':1,'a':10,'discovered':1,'great':2,'these':1,'many':1,'actually':1,'fish-like':1,'large':1,'passed':2,'teeth':2,'found':1,'the':1,'pulled':1,'waited':1,'something':1},'salmon--forming':{'new':1},'thickening':{'or':1},'saturn--the':{'moon--the':1},'collections':{'of':1},'easy':{'business':1,'for':1,'haunt':1,'.':4,'to':6,'times--glacial':1},'irresponsive':{'.':1},'botanists':{'that':1},'east':{'has':1,'when':1,'are':1,'which':1},'eocene':{'and':1,'n':1,'era':1,'n.':1,'period':1},'good-humoured':{'talkativeness':1},'up--a':{'clever':1},'elevation':{'and':1,'of':2},'survival':{'of':1,'with':1,'.':2},'semi-fluid':{'carbon':1},'possible':{'origin':1,'and':1,'instruments':1,'it':1,'according':1,'are':1,'in':1,'moreover':1,'yet':1,'enemies':1,'again':1,'evolution.':1,'for':4,'basis':1,'favouring':1,'.':1,'colours':1,'to':13,'that':6,'however':1,'but':1,'a':1,'kind':1,'outline':1,'when':1,'haunts':1,'seeds':1,'steps':1,'victory':1,'error':1,'or':1},'knife-blade-like':{'to':2,'larva':2},'firmer':{'though':1},'possibly':{'run':1,'show':1,'there':1,'outside':1,'attain':1,'have':1,'in':1},'indicative':{'not':1,'of':1},'birth':{'and':2,'of':2,'gestation':1,'.':3,'to':1,'the':1,'with':1},'shadow':{'and':1,'cast':2,'across':1,'on':1},'unique':{'and':1,'solution':1,'in':1,'property':1,'ensemble':1,'discovery':1},'12:30':{'p.m':1},'occurring':{'in':2},'desire':{'to':3,'that':1},'skull-walls':{'sir':1},'collection.':{'a':1,'lord':2,'charles':1,'sir':1,'j':1},'process--a':{'process':1,'building':1},'enregistered':{'reactions':1,'rhythms':1,'hereditarily':1,'it':1,'instinctive':2,'reactions.':1},'steps':{'followed':1,'of':1,'per':1,'which':1,'in':9,'by':1},'beneficial':{'partnerships':1,'partnership':1,'external':1,'.':1},'right':{'and':1,'into':1,'we':1,'as':1,'at':1,'in':1,'out':1,'indicate':1,'away':1,'to':2,'answer':1,'has':1,'146':1,'resting':1,'direction':1,'hand':1,'angles':4,'path':1,'with':1,'this':1,'of':4,'or':2},'old':{'quarters':1,'philosophical':1,'before':1,'terrestrial':1,'lady':1,'young':2,'.':1,'to':1,'going':1,'which':1,'entomologist':1,'editions':1,';':1,'red':2,'showing':1,'middle-aged':1,'they':1,'world':2,'with':2,'stone':4,'land':1,'word':1,'could':1,'haunts':1,'race':1,'so':1,'margin':1,'view':1},'creek':{'.':1},'crowd':{'of':1},'people':{'then':1,'would':1,'213':1,'just':1,'their':1,'arguing':1,'who':1,'.':1,'start':1,'s':1,'know':1,'have':3,'in':1,'fail':1,'wrongly':1},'predominance':{'of':1},'crown':{'of':3,'corona':1,'but':1},'deflection':{'of':3},'crows':{'but':1},'dragons--the':{'first':1},'animate':{'nature':5},'creep':{'slowly':1,'up':2},'enemies':{'a':1,'and':1,'for':1,'who':1,'except':1,'but':1,'.':5,'as':1,'which':1},'for':{'all':6,'aquatic':2,'untold':1,'unseen':1,'accurate':1,'seizing':4,'years':3,'egg-laying':1,'not':1,'existence.':2,'converting':1,'its':11,'negligence':1,'current':1,'rapid':1,'knowledge':1,'instance':25,'body-making.':1,'reasons':1,'believing':1,'capturing':1,'pursuing':1,'grasping':1,'weeks':1,'thousands':3,'over':3,'them':1,'good':1,'worse':1,'food':7,'gauging':1,'balancing':2,'existence--which':1,'every':3,'nearly':2,'they':8,'half':2,'mixing':4,'highly':1,'several':2,'identifying':3,'humming-birds':1,'this':8,'miles':1,'common':1,'activity':2,'speculation':1,'bone':2,'dexterity':1,'another':2,'intelligence':1,'radium':1,'some':4,'catching':4,'jupiter':1,'vocal':1,'existence':13,'our':4,'sport':2,'special':1,'blood-vessel':1,'crunching':1,'what':2,'three':1,'giving':1,'drifting':1,'brief':1,'increase':1,'new':3,'allowing':1,'receiving':1,'ever':4,'safety.':1,'measuring':1,'we':4,'reproduction':1,'parental':1,'example.':1,'terse':1,'of':1,'here':2,'water':2,'feeding':1,'nowhere':1,'although':3,'sedentary':1,'science':2,'dry':1,'comparison':1,'enormous':1,'actual':1,'respiration':1,'branch-gripping':1,'many':12,'violence':1,'adventures':1,'generations':1,'swimming':2,'nerve':1,'striking':1,'keenness':1,'obtaining':1,'seven':1,'one':1,'learning':1,'accepting':1,'.':1,'millions':14,'life--the':2,'man--the':1,'additional':1,'her':2,'their':2,'race-history':1,'there':8,'copies':2,'long':2,'by':1,'whom':1,'much':1,'motility':1,'themselves':1,'analysing':3,'fourteen':1,'hearing.':1,'more':6,'free':1,'exploring':1,'excavating':2,'himself':1,'north':1,'that':4,'ages':3,'releasing':1,'instance.':1,'about':1,'it':29,'carrying':1,'observations':1,'chasing':1,'coal--dissipation':1,'considerable':1,'it--radium.':1,'plants':1,'keeping':1,'animals':1,'thirty':1,'these':4,'us.':1,'access':1,'generating':1,'sifting':2,'life--water':1,'project':1,'while':1,'future':1,'midday':1,'thirty-five':1,'aesthetic':1,'life.':1,'example':6,'are':1,'and':1,'bearing':1,'amenity':1,'almost':1,'alongside':1,'mind':1,'life':6,'avoiding':1,'an':6,'as':2,'his':1,'evening':1,'something':2,'in':5,'counting':2,'any':5,'if':2,'utility':2,'us':3,'climate':1,'granted':1,'when':1,'offspring':1,'how':1,'damages':1,'holding':2,'so':1,'profiting':1,'higher':2,'supersaturated':1,'unpalatability':1,'centuries':1,'food.':1,'most':1,'moving':1,'two':1,'supposing':3,'such':1,'foothold':1,'sally':1,'man':8,'a':49,'muscle':1,'natural':1,'observation':1,'professor':2,'itself':2,'coal':2,'shore':1,'engulfing':1,'five':1,'fresh':1,'the':104,'crayfish':1,'playing':1},'bottom':{'may':1,'of':1,'and':1,'than':1,'.':2},'fox':{'all':2,'plays':1,'the':1,'or':1},'individuals':{'die':1,'who':1,'are':1,'each':1},'exposition':{'to':1},'landscape':{'effects':1},'invasions':{'of':1,'there':1},'surging':{'fire.':1},'man--body':{'and':1},'monkey-ape-man':{'.':1},'palatable':{'and':3,'butterflies':1,'flesh':1},'substitutes':{'for':2},'energy':{'and':7,'all':1,'force':1,'is':16,'it':2,'an':1,'produced':2,'as':4,'are':3,'in':6,'go':1,'if':1,'by':2,'or':1,'from':2,'would':2,'come':1,'since':1,'had':3,'expressed':1,'.':18,'to':3,'is.':1,'which':10,'tends':1,'streams':1,';':2,'has':1,'energy':1,'287':1,'greater.':1,'we':2,'that':4,'may':4,'sufficient':1,'derived':1,'but':1,'cannot':2,'let':1,'such':1,'originated':1,'than':1,'nor':1,'must':1,'a':1,'brought':1,':':1,'locked':2,'like':2,'this':1,'of':40,'into':1,'later':1,'equal':1,'across':1,'will':1,'so':1,'can':1,'ineffectively':1,'the':1,'disappears':1,'could':1,'came':1,'for':1},'dental':{'troubles.':1},'unfrozen':{'at':1},'life-or-death':{'quality':1},'substituted':{'for':1},'shifting':{'of':1},'losing':{'a':1,'the':1,'its':1},'memorable':{'because':1},'joule':{'who':1},'tide-producing':{'power':1},'emits':{'when':1,'rays--the':1},'shaken':{'.':1},'restlessness':{';':1,'an':1},'predisposition':{'to':1},'opossums':{'feigning':2,'are':2},'o':{'.':3,'as':1,'there':1,'in':1},'oneness':{'of':1},'wave-length':{'of':2,'is':1,'corresponds':1},'herring-gull':{'is':1},'slightly':{'from':1,'changed':1,'developed.':1,'simplified.':1},'lamprey':{'.':1},'raised':{'to':1,'higher':1,'from':1,'in':2,'many':1},'cloud-screen.':{'illustration':1},'statements':{'concerning':1,'that':1,'might':1,'.':1},'facility':{'of':2,'in':1},'non-protrusive':{'face':1},'son':{'of':1},'beings':{'on':1,'whose':1,'in':1},'raises':{'the':1},'sow':{'broadcast':1,'and':1,'again.':1},'spores':{'and':1,'of':1},'pairs':{'of':3},'shoots':{'and':1,'from':1},'polaris':{'76':1},'fields.':{'virgil':1},'fabric':{'of':1},'wonder-horse':{'with':1},'support':{'and':3,'a':1,'life':1,'of':1,'its':1,'to':1,'the':1,'has':1,';':1},'constantly':{'driven':1,'pouring':2,'rising':1,'splitting':1,'for':1},'width':{'.':1},'grasping':{'of':1,'the':1,'lifting':1},'physicists':{'and':3,'did':1,'of':4,'who':1,'but':1,'to':1},'greatness':{'and':1},'resulted':{'from':1,'in':2},'music':{'of':1,'had':1},'telegraph':{'and':1,'cables':1},'offer':{'serious':1,'rewards':1,'was':1,'no':1},'fascination':{'about':1},'forming':{'associations':2,'what':1,'good':1,'useful':1,'these':1,'of':1,'an':1,'part':1,'in':1,'vegetable':1,'new':1,'the':2,'ordinary':1},'shoot':{'out':3},'hemisphere':{'learned':1,'throughout':1},'thickness.':{'a':1},'survive':{'douching':1,'for':1,'being':1,'when':1,'prolonged':2,'but':1,'.':1,'high':1,'without':1,'the':2},'beech':{'a':1},'statement.':{'illustration':1},'otter':{'a':1,'is':1,'one':1,'239':1,'which':1,'or':1},'week':{'four':1,'or':2,'in':1},'death--procession':{'of':1},'inside':{'and':2,'a':2,'is':1,'are':1,'have':1,'the':3},'arrow-worms':{'in':1},'devices':{'it':1,'adaptations':1,'which':1,'.':1},'lays':{'stress':1,'her':2,'many':1,'an':1,'the':2,'its':1},'masterfulness':{'of':1},'soldering':{'of':1},'palm':{'and':2,'of':1},'procyon':{'10.5':1},'cormorants':{'and':1},'150':{'to':1,'000':5},'153':{'anatomical':1},'later':{'chapter':1,'on':2,'differ':1,'on.':1,'sir':1,'section':1,'there':1,'ages':1,'.':3,'discovered':1,'to':1,'stage':3,'which':1,'in':3,'the':2,'still':1,'than':1,'christened':1,'section.':1},'proved':{'what':1,'that':2,'very':1,'of':1,'equal':1,'but':1,'.':1,'to':2,'as':1,'too':1},'157':{'side-view':1,'photo':1,'the':1,'after':1},'156':{'photo':2},'158':{'darwin':1},'as-is':{'with':1},'palm;':{'and':1},'proves':{'fatal.':1},'exist':{'on':2,'all':1,'there':1,'would':1,'since':1,'.':2,'in':4,'between':1,'apart':1},'melan':{'dr':1},'sprouts':{'kale':1},'redolent':{'of':1},'stolidity':{'gives':1},'floor':{'of':7,'.':2},'glacier':{'that':1},'negatively-electrified':{'body':1,'ones':1},'uttered':{'until':1},'flood':{'of':4,'in':1},'nestling':{'bittern':1},'beginning--whatever':{'we':1},'deep-seated':{'connection':1,'difference':1},'entomologist':{'mr':1},'irresistible':{'.':1},'superfluous':{'length':1,'twig':1},'roll':{'themselves':1,'over':1},'friar-birds':{'of':1},'thoroughgoing':{'internal':1},'palms':{'and':1},'non-moulting':{'winged':1},'teats':{'injects':1},'mariner':{'s':1},'transported':{'in':1},'irs.':{'the':1},'scale':{'on':1,'we':1,'far':1,'of':4,'is':1,'in':2,'but':1,'to':1,'each':1,'the':4},'intent':{'efforts':1},'foot-print':{'of':1},'variable':{'monitor':2,'hare':2,'as':1,'stars':3,'in':1,'new':1,'before':1,'stock':1},'cleaver':{'of':1},'commensalism':{'with':1,'eating':1,'i.e.':1,'where':1},'fastened':{'to':1,'by':1,'up':1,'on':1},'microbes':{'such':1,'invading':1,'to':1},'packets':{'one':1},'coastlines':{'.':1},'ottawa':{'by':1},'time':{'and':11,'is':3,'it':2,'as':6,'in':5,'immemorial.':1,'thought':1,'rapidly':1,'for':1,'their':1,'with':3,'since':1,'when':5,'.':7,'to':5,'onwards':1,'swift':1,';':1,'until':1,'ahead.':1,'we':2,'energy':1,'that':5,'very':1,'than':1,'however':2,'much':1,'great':1,'a':1,'they':1,'during':1,'come':1,'by':1,'nor':1,'ago':1,'wide':1,'immemorial':1,'last':1,'like':2,'showed':1,'of':11,'required':1,'reminding':1,'appearing':1,'so':1,'she':1,'were':1,'about':1,'the':12,'or':1},'adult':{'and':1,'eel':1,'life':1,'by':1,'.':2},'peacock':{'and':1,'for':1},'irrigation':{'of':1},'chain':{'of':2,'instincts':1,'.':1},'perch':{'when':1},'colour-change':{'bony':1,'is':2,'sometimes':1,'expresses':1,':':2,'occurs':1},'lawlessly':{'they':1},'activated':{'by':1},'crocodile':{'pipes':1,'is':2,'would':1},'avalanche':{'.':1},'skate':{'and':1,'places':1},'93':{'000':2},'witmer.':{'peter':1},'ebooks.':{'':1},'hold':{'a':1,'all':1,'that':1,'of':2,'it':1,'their':2,'in':1,'the':1},'rottenness':{'eaters':1},'methodically':{'onwards':1},'94':{'photo':1,'from':1},'efficiencies':{'supply':1},'209':{'a':1,'homing':1},'chequered':{'by':1,'but':1},'walking-fish':{'or':2},'separated.':{'perhaps':1},'downloading':{'copying':1},'gisbert':{'electricity':1},'navigable':{'kingdom':1},'choice':{'of':1},'92.9':{'1.00':1},'gloomy':{'prognostications':1,'gorilla.':1},'bustle':{'of':1},'fullest':{'ears':1},'right-handed':{'and':1},'exact':{'and':1,'intensity':1,'it':1,'limits':1},'minute':{'and':2,'signs':1,'tag--but':1,'unicellular':1,'planets':1,'in':1,'diamond-like':1,'surfaces':1,'living':1,'rays':1,'organisms':2,'measurements':1,'.':1,'particles':1,'molecules':1,'6':1,'fragments':1,'that':1,'crustaceans':3,'after':1,'but':1,'hand':1,'waves':1,'satellites':1,'atoms':1,'transparent':2,'animals':2,'atom':1,'traces':1,'or':1},'tear':{'into':1,'asunder':1,'them':1,'are':1},'leave':{'me':1,'them':1,'this':1,'well':1,'atoms':1,'their':1,'the':4,'open':1,'him':1,'creatures':1},'solved':{'four':2,'there':1,'it':1},'settle':{'these':1,'on':1,'down':3},'team':{'at':2},'depository':{'of':2,'the':1,';':1,'he':1},'speculation':{'and':1,'about':1,'.':3,'is':2,'that':1},'unpaying':{'boarders':1},'prevent':{'you':1},'thinkers':{'the':1,'since':1,'have':2},'occurrence':{'of':5,'.':1},'chimpanzee--and':{'it':1},'insignificant':{'compared':1,'one':1},'trails':{'a':1},'milligram':{'of':1},'gnawed':{'the':1},'roof':{'of':3},'depressions':{'of':1},'mind--even':{'in':1},'parachuting':{'animals':1,'.':1},'educate':{'the':1},'leaf-butterfly':{'kallima':1},'axes':{'follow':1,'of':1},'melt':{'in':1},'current':{'rang':1,'is':6,'intellectual':1,'through':1,'275':1,'in':2,'279':1,'seems':1,'exhibits':1,'.':4,'to':1,'is.':1,'which':1,'instead':1,'was':2,'therefore':1,'donation':1,'not':1,'with':1,'the':2,'of':3,'passing':1,'where':1},'remembered':{'that':4},'looking':{'is':1,'backwards':6,'at':3,'extraordinarily':1},'period--its':{'length':1},'falling':{'and':1,'on':1,'stone':2,'into':1,'body':1,'water':2,'weights':1,'between':1,'particles':1},'ground':{'a':1,'on':2,'what':1,'his':1,'again.':1,'would':1,'though':1,'is':1,'or':2,'when':1,'by':1,'pushed':1,'as':1,'flapping':1,'in':1,'has':1,'the':2,'.':5,'was':1,'generate':1,'he':1},'coccyx':{'at':1},'climbs':{'on':2,'the':2,'up':1},'honour':{'of':1},'mauer.':{'d-e.':1},'understanding':{'and':1,'of':1},'exceptions':{'the':1,'as':1,'that':2},'magnetism':{'and':1,'we':1,'gravitation':1,'is':3,'supposes':1,'.':1,'differs':1,'he':1},'nemesis':{'of':2},'yards':{'and':1,'a':1,'off':1},'address':{'specified':1},'alone':{'is':2,'.':4,'swamp':1,'the':1,'has':1,'by':2},'along':{'a':3,'copper':1,'many':1,'lines':1,'two':1,'an':1,'its':1,'at':1,'which':3,'certain':2,'the':15,'with':9,'by':2},'dwindling':{'counterpart':1,'relic':1,'of':1,'structure--the':1,'race':1,'relics':1,'structures':1,'resources':1,'must':1},'anchoring':{'structures':1},'momentous':{'event':1,'step':1,'.':1,'except':1,'that':1},'testings':{'.':1},'neville':{'extinct':1},'brilliant':{'workers':1,'young':1,'or':1,'early':1,'experiment':1,'photosphere':1,'failures':1,'conquest':1,'coloration':1,'redness':1},'studied':{'a':1,'the':1,'was':1,'by':1},'wherever':{'the':2,'there':1},'commonly':{'found':1,'accepted':1},'brazilian':{'forest':1},'accomplished':{'in':1,'if':1},'ineffective':{'way':1,'movements':1},'vitiated':{'air':1},'studies':{'of':1},'unification.':{'we':1},'tasks':{'of':2},'love':{'as':1,'.':1,'hunger':1},'prefer':{'to':1},'relations.':{'when':1},'betraying':{'its':1},'deep-water':{'marine':1},'sky':{'means--light':1,'means':1,'no':1,'.':2,'will':1,'to':1,'overhead':2,'at':1,'in':1,'probably':1,'where':1},'engrain':{'capacities':1},'working':{'from':1,'of':2,'into':1,'methodically':1,'against':1,'powerfully':1,'which':1,'or':1,'out':1},'mankind--steps':{'in':1},'formulated':{'the':2},'positive':{'and':7,'knowledge':2,'electricity':6,'particles':1,'charge':1,'in':1,'the':1,';':1},'-fish':{'embryo':1},'anatomical':{'distinctions':1,'proof':2,'genius.':1,'structure':1,'evidence':1},'vigour':{'and':1,'of':1,'.':1},'down-breaking':{'disruptive':1},'opposed':{'to':1},'films':{'of':2},'scope':{'to':1},'theoretical':{'basis':1},'ten-miles-wide':{'moons':1},'perishes':{'for':1},'periophthalmus':{'of':1,'common':2},'chapters--the':{'feeding':1},'afford':{'food':1,'a':1,'to':2},'apparent':{'strokes':1,'suddenness':1,'.':1,'motion':1,'to':1,'stroke':1,'motions':1,'exceptions':1,'creeping':1},'assimilation':{'exceeding':1},'validity':{'there':1},'minnows':{'and':2,'learned':1,'were':1},'appendix':{'alone':1,'at':1,'which':1},'everywhere':{'forming':1,'there':1,'like':1,'in':1},'virtue':{'of':5,'as':1},'blood.':{'as':1},'disparagement':{'tentative':1},'easiest':{'of':1},'petrel':{'the':1,'or':2,'is':1},'logos':{'which':1,'.':1},'modernised':{'types':1},'originally':{'a':2,'derived':2,'intelligent':1,'supposed':1},'rutherford':{'and':2,'sir':1,'246':1,'one':2,'christened':1},'imagination.':{'the':1,'organic':1},'moulted':{'which':1,'in':1},'life--water':{'that':1},'believes':{'that':1},'printing':{'august':1,'april':4,'may':1,'june':4,'september':1,'sept':1},'values':{'most--control':1},'slowness':{'.':1},'stature':{'and':1,'than':1,'human':1},'believed':{'not':1,'to':1,'by':2,'that':2},'admired':{'the':1},'short-limbed':{'but':1},'frogs':{'and':3,'a':1,'show':1,'may':1,'sometimes':1,'herald':1,'jumping':1,'have':1,'meet':1,'along':1},'bulkiest':{'structure':1},'parachute':{'of':1,';':1,'wing':1,'before':1},'locks':{'.':1},'one--the':{'old':1},'238':{'photo':2,'whereas':1},'239':{'photo':1},'unveiled':{'in':1,'.':1},'allowed':{'to':1,'aliens':1,'for':1,'her':1,'of':1},'evidently':{'light':1,'puzzled':1},'232':{'photo':2},'233':{'photo':4},'winter':{'and':4,'by':2,'in':1,'of':1,'within':1,'freeze':1,'scene':2,'whiteness':1,'plumage':2,'.':1,'are':1,'sets':1,'nor':1,'the':1,'has':1,'dress':1,';':1,'retreat':1},'venation':{'of':1},'chromatophores':{'and':1,'in':1},'foul':{'waterholes':1,'with':1},'protozoon':{'and':1,'has':1,'or':1,'.':1},'s.':{'fairbanks':1,'illustration':1},'elephant':{'and':2,'rhinoceros':1,'a':1,'.':1,'helping':1,'at':1,'they':1,'was':1},'northwards':{'for':1},'divides':{'and':1,'into':2,'is':1},'edinburgh':{'the':1},'snaps':{'secure':1},'explores':{'a':1},'explorer':{'which':1},'motive-force':{'in':1},'spot':{'and':1,'on':2,'23':1,'though':1,'at':1,'where':1},'convincingly':{'the':1},'muellerian':{'after':1},'date':{'living':1,'from':1,'for':1,'on':1,'of':2,'contact':1,'at':1,':':1},'such':{'ingenious':1,'and':1,'remarkable':1,'publications':1,'constituents':1,'is':5,'metals':1,'well-known':2,'contrasts':1,'as':72,'diverse':1,'are':1,'planets':1,'in':1,'speed':1,'birds':1,'enemies':1,'dense':1,'things':1,'phrases':1,'unity':1,'wonderfully':1,'way':1,'instruments':2,'if':1,'conditions':1,'important':1,'movement':1,'that':3,'rock':1,'apparent':1,'furnaces':1,'depths':1,'wave-motions':1,'races':1,'fishes':1,'cases':2,'intelligent':1,'active':1,'stage':1,'a':19,'dangers':1,'changes':1,'occasions':1,'damage.':1,'betelgeux':1,'cells':1,'motion':1,'thing':4,'states':1,'hard-and-fast':1,'temperatures':2,'time':1,'similar':1,'order':1},'behaviour--experimenting':{'learning':1},'truly':{'wonderful':3},'data':{'transcription':1,'for':1},'codes':{'that':1},'lids':{'to':1,';':1},'waggons':{'at':1},'sy':{'1':1,'2':1},'forestier':{'of':3},'varieties':{'of':1,'which':1,'altogether':1},'conscious':{'guile':1,'agent':1,'imitation':1},'naturae':{'meaning':1,'the':1},'st':{'.':2},'inhabiting':{'this':1,'the':2},'castings':{'and':1},'remoter':{'part':1},'so':{'chicks':1,'they':2,'among':1,'fond':1,'subtle':1,'still':1,'generous':1,'slow':1,'young':1,'late':1,'to':3,'differently':1,'rich':1,'he':1,'clouded':1,'do':2,'good':1,'far':14,'safe':1,'apt':1,'closely':1,'vast':2,'easily':1,'like':2,'keenly':1,'shaped':1,'forth':3,'large':1,'stupid':1,'she':1,'small':2,'where':1,'simple.':1,'often':1,'attenuated':1,'are':1,'helpless':1,'pronounced':1,'for':1,'restricted':1,'below':1,'does':1,';':1,'numerous':1,'common':2,'we':6,'recently':1,'inextricably':1,'completely':1,'rapid':1,'strong':1,'by':1,'momentous':1,'gained':1,'on':16,'great':3,'many':7,'sensitive':1,'rudely':1,'striking':1,'powerful':1,'marked':2,'one':1,'long':3,'quickly':1,'readily':1,'fast':1,'from':1,'there':4,'sunlight':1,'.':3,'much':15,'clever':3,'that':43,'forming':1,'minute':1,'motionless':1,'mounted':1,'inconspicuous':1,'wide':1,'arranged':1,'this':1,'up':1,'will':1,'while':1,'obvious':1,'of':1,'similar':1,'bright--the':1,'is':3,'it':8,'an':1,'effectively':1,'as':6,'in':4,'clearly':1,'relatively':1,'proceeds':1,'very':3,'hot':1,'absorbed':1,'instead':1,'firmly':1,'watery':1,'may':1,'important':1,'conspicuous':1,'a':2,'short':1,'crowded':1,'clear':1,'well':1,'near':2,'deeply':1,'species':1,'fresh':1,'the':8},'sc':{'the':1},'mud-flats':{';':1},'pulled':{'.':1,'down':1,'twice':1,'at':1,'the':3,'by':4},'outflowing':{'network':2},'unsolicited':{'donations':1},'lighter':{'and':1,'materials':2,'in':1,'atomic':2,'.':1},'differences':{'separating':1,'of':3,'in':3,'between':2},'below.':{'1.f.':1,'illustration':2,'1.c':1},'copious':{'supply':1},'course':{'and':1,'associated':1,'is':1,'it':2,'an':1,'are':1,'in':1,'confirms':1,'her':1,'unknown':1,'there':2,'been':1,'to':2,'only':1,'5':1,'easy':1,'has':1,'be':2,'we':3,'cannot':1,'not':1,'with':1,'by':1,'he':2,'a':2,'for':3,'of':24,'the':2},'experiments':{'suggested':1,'towards':1,'proved':1,'chiefly':1,'showed':1,'that':1,'of':5,'in':4,'enabled':1,'.':4,'indicate':1,'without':1,'have':1,'which':1,'usually':1,'checked':1,'with':2},'frequents':{'two':1},'insurgence':{'and':2,'of':2},'tendency':{'to':11,'that':1,'among':1,'by':1,'of':2},'solitary':{'bit':1,'or':1},'limbs':{'is':1,'to':2,'at':1,';':1,'with':1,'or':1},'derive':{'their':1,'from':1},'yawning':{'in':2},'thumb':{'and':5,'th':1},'did.':{'looking':1},'hot':{'and':2,'gaseous':1,'for':1,'gas':1,'when':1,'but':1,'.':2,'as':1,'weather':1,'earth':1,'cinder':1,'or':1,'bodies':1},'decreases':{'.':1},'attraction':{'produces':1,'of':1,'is':1,'.':1,'can':1,'between':2},'creations':{'of':1,'.':1},'dwarfs':{'.':1},'constitutes':{'matter':2,'one':2},'instantly':{'fly':1},'conveying':{'it':1},'thereby':{'buoyed':1,'escapes':1},'earth--the':{'earth-knot':1},'youth.':{'sec':1},'experiment.':{'we':1},'indigenous':{'wild':2},'records':{'of':2,'the':1,'or':1,'.':1},'year.':{'in':1},'overpowering':{'and':1,'its':1},'water-shrew.':{'freshwater':1},'sorted':{'out':2},'twilight':{'by':1,'no':1},'runners':{'that':1},'one-seventh':{'and':1},'find.':{'fresh':1},'creation.':{'the':1},'establishing':{'itself':1,'or':1,'associations.':1},'veins':{'on':1,'of':1},'instability':{'and':1},'eighty-seven--and':{'that':1},'quarter':{'of':4,'days':2},'habitat-zones':{'and':1},'limb.':{'it':1},'turtle':{'found':1,'the':1,'that':1,'which':1,'of':1},'square':{'of':1,'.':1,'miles':2,'inch':2,'our':1,'the':1},'retrieve':{'its':1,'her':1},'receipt':{'of':1,'that':1},'parachutists--':{'flying':1},'prisms':{'the':1,'are':1},'woodcraft':{'the':1},'owing':{'to':4,'in':1},'entering':{'a':1,'the':4,'into':1},'beetle':{'running':1,'which':4},'instinct--the':{'mind':1},'neighbourhood':{'of':1},'crowding':{'there':1},'river-tortoises':{'which':1},'abide':{'by':1},'collisions':{'.':1},'contained':{'good':1,'meat':1,'in':4},'protections':{'against':1},'washington.':{'illustration':1},'suggesting':{'that':2},'granites':{'while':1},'ascendant':{'and':1},'soap-bubble':{'.':2},'siege':{'are':1},'million':{'millions':1,'square':1,'million':2,'stars.':1,'volts':1,'is':1,'trillion':1,'atoms':1,'meteorites':1,'miles':3,'electrons':1,'stars':1,'in':1,'horsepower':1,'250':1,'years':9,'.':1,'times':6},'envelop':{'the':1},'possibility':{'of':12,'is':1,'that':2,'in':1},'quite':{'uninterested':1,'certain':5,'direct':1,'comfortable':1,'as':1,'clever':1,'at':1,'impossible':1,'extinct':1,'indifferent':1,'readily':1,'different':5,'emancipated':1,'artificial':1,'difficult':1,'separated':1,'independent':1,'sure':2,'possible':2,'lively.':1,'invisible':1,'apart':3,'a':2,'easily':1,'novel':1,'clear':1,'so':3,'fundamental':1,'obscure':1,'away':1},'disintegrates':{'generates':1},'complicated':{'and':2,'elements':1,'than':1,'convolutions.':1,'atoms':1,'to':1,'atom':1,'cases':1,'wave':1,'by':1},'besides':{'even':1,'all':1,'his':1,'her':1,'turtles':1,'that':1,'this':1,'monkeys--in':1,'violent':1,'sunlight':1,'.':2,'these':1,'acting':1,'pulling':1,'struggle':1,'which':1,'instinctive':1,'the':4,'perceptual':1,'those':1},'remainder':{'of':1},'seventy':{'or':1},'vivum':{'e':1},'shores':{'and':1,'going':1,'which':1,'.':1},'training':{'given':1,'they':1,'nor':1,'.':1},'possum':{'lying':1},'tree-sloths':{'for':1,'tree-shrews':1},'undisguised':{'shore-animals':1},'ostrich':{'and':1,'with':1},'wanderers':{'.':1},'disguises':{'which':1},'massive':{'bulk':1,'jaws':1,'lower':1,'face':1},'routes':{'became':1,'round':1},'learning.':{'vi':1,'vii':1,'illustration':1,'animal':1},'puny':{'infant':1},'toads--it':{'serves':1},'emotion':{'as':1,'is':1},'saving':{'the':2,'clauses.':1},'symmetry':{'of':1,'is':1,'.':1,'well':1,'must':1},'serpent':{';':1},'spoken':{'of':1,'language':1},'one':{'over':1,'atom':3,'not':1,'mile':3,'whose':1,'cut':1,'group':1,'championed':1,'except':1,'should':3,'to':2,'primordial':2,'main':1,'might':2,'resting-place':1,'digit':1,'animal':1,'big':1,'colour--the':2,'answer':1,'year.':1,'cannot':1,'half':1,'foot':1,'rotation':2,'day':4,'three-hundredth':1,'reality--the':1,'name':1,'magnet':1,'fitness':1,'served':1,'side':5,'kernel':1,'revolution':1,'telescope':1,'second':1,'martian':1,'year':1,'close':1,'thinks':2,'living':1,'for':1,'disease':1,'time.':1,'discovers':1,'above':1,'example':1,'consisting':1,'body':6,'we':1,'state':1,'million':2,'here':1,'objects':1,'illustration':1,'key':1,'put':1,'sadly':1,'by':1,'momentous':1,'extreme':1,'on':4,'substance':1,'asks':1,'of':101,'local':1,'thing':3,'s':2,'place':3,'or':1,'comes':1,'family':1,'embodiment':2,'another':16,'comprises':1,'pulls':1,'cloud':1,'from':3,'would':3,'hundred-thousandth':1,'.':7,'water-shed':1,'crab':1,'half-hour':1,'was':2,'toe':1,'direction':1,'knows':2,'form':1,'that':3,'successful':1,'thousand':2,'but':1,'another.':1,'manifestation':1,'hopes':1,'line':1,'with':3,'must':1,'kind':3,'has':1,'type':1,'as':1,'will':1,'near':1,'obvious':1,'can':6,'country':1,'piece':1,'remembers':1,'and':8,'pound':3,'stream':2,'is':8,'hardly':1,'say':1,'way':2,'at':2,'in':3,'helium':1,'globe.':1,'end':6,'parish':1,'food-plant':1,'other':1,'which':3,'inch':1,'physical':1,'week':1,'snail':1,'may':1,'after':1,'molecule':1,'hand':2,'plane':3,'such':1,'class':2,'man':2,'planet':1,'owns':1,'colour':3,'electron':1,'element':1,'more':1,'time':5,'the':1,'lined':1,'egg':1,'order':1},'spanish':{'don.':1},'open':{'pipe':1,'sea':25,'jaws':1,'waters':2,'there':1,'up':1,'one':1,'water':1,'atlantic':1,'sea.':1,'doors':1,'sea--the':1,'the':1,'gateways':1},'city':{'ut':1,'like':1},'bite':{'of':1,'at':1},'indicate':{'a':2,'the':4,'that':1,'first':1,'an':1},'2':{'and':4,'among':1,'show':1,'gradual':1,'in':1,'it':1,'chromosomes.':3,'feet':1,'tons':1,'jupiter':2,'escape':1,'paternal':1,'egg':1,'nebulae':1,'factors':1,'physiological':1,'.':11,'0':1,'3':1,'holding':1,'newly':1,'500':3,'we':2,'maternal':1,'inches':2,'respectively':1,'instinctive':1,'canals':1,'with':1,'by':1,'a':1,'represents':1,'of':3,'the':13,'changes':1},'vapoury':{'tail':1},'stuffed':{'their':1},'bits':{'.':1},'lingering':{'influence':1,'here':1},'vapours':{'and':1,'that':1,'of':1,'whirling':1,'imaginable':1,'.':1,'above':1},'on.':{'we':1,'there':1,'illustration':1,'sec':1,'in':1,'the':3,'recent':1},'viviparous':{'the':1},'gently.':{'these':1},'proving':{'everything':1,'trying':1,'itself':1},'s.c.':{'on':1},'herds':{'extended':1},'absorbs':{'most':1,'the':2,'all':1},'photographic':{'emulsions':1,'plate':11,'negative':1},'structure.':{'differences':1,'in':1},'vapour.':{'millions':1},'meteors':{'and':2,'what':1,'showing':2,':':1,'approach':1,'or':2},'third':{'and':2,'case':1,'layer':1,'eyelid':2,'form':1,'of':3,'night':2,'rings':1,'digit':1,'haunt':1,'trial':1,'printing':1,'great':1,'have':1,'atom':1,'answer':1,'interglacial':3},'depressed':{'into':1},'himself.':{'when':1},'weapons--the':{'sea-anemone':1},'siding':{'we':1},'future':{'and':1,'for':1,'reproductive':1,'of':1,'holds':1,'.':6,'access':1,'cannot':1,'let':1,'need':1,'research':1,'generations.':1},'17-1':{'2':1},'trekking':{'to':1},'college':{'of':2,'observatory.':4},'wandering':{'about':1,'amoeboid':2,'.':1},'johnstone':{'j':1},'prospect':{'for':3,'.':1},'thousandths':{'of':1},'royalties':{'.':1,'under':1},'sac':{'beneath':1},'turned':{'towards':1,'from':1,'into':5,'round':1,'to':1,'sharply':1,'rapidly':2,'the':1,'its':1},'argument':{'supposes':1,'implies':1},'alley':{'at':1},'auroral':{'displays':1},'say':{'just':1,'is':1,'some':1,'it':2,'an':1,'brain':1,'as':1,'at':2,'in':1,'our':1,'its':1,'what':2,'for':1,'sodium':1,'much':2,'began':1,'there':3,'ignorabimus.':1,'.':2,'other':1,'therefore':1,':':1,'reflex':1,'more':4,'presently.':1,'we':2,'full':1,'that':26,'mammals':1,'here':1,'unification':1,'they':3,'half':1,'by':1,'a':1,'about':1,'like':1,'of':5,'enthusiastic':1,'according':1,'without':1,'ignoramus':1,'the':9},'buried':{'and':1,'eggs':1,'his':1,'egg':1,'alive':1},'horsepower':{'.':1},'1':{'and':3,'testing':1,'it':2,'an':1,'100th':1,'drawings':1,'in':1,'before':2,'67':2,'25':1,'giant':1,'for':1,'no':1,'sun':1,'except':1,'.':10,'1':1,'to':1,'340':1,'mars':1,'progress':1,'we':1,'300':1,'dam':1,'67000':1,'but':1,'000':2,'125':2,'367':1,'drought':1,'20417':1,'with':1,'by':1,'evolution':1,'1800':1,'of':4,'35':1,'1845':1,'the':12,'two':1},'sap':{'reminding':1,'and':1,'which':1},'saw':{'and':1,'a':1,'all':1,'that':1,'may':1,'is':1,'earlier':1,'about':2,'heard':1,'combine':1,'in':2,'the':1,'has':1,'was':1},'1903.':{'illustration':1},'law.':{'if':1},'unsuitable':{'and':1,'pools':1},'downwards':{'on':1,'along':1,'at':1},'aside':{'to':1,'conventional':1,'only':1},'zoo':{'with':1,'were':1},'note':{'that':1,'of':2,'is':2,'its':1,'how':2,'the':9,'still':1,'by':1},'take':{'frogs':1,'it':1,'an':3,'as':1,'in':1,'our':2,'its':1,'what':1,'from':1,'rather':1,'long':1,'1':1,'to':2,'much':1,'400':1,'place.':1,'photographs':1,'centuries':1,'advantage':1,'between':2,'about':1,'leaps':1,'one':1,'a':6,'great':2,'light':1,'up':1,'us':1,'place':1,'five':1,'the':10,'root':2,'50':1},'fruit-fly':{'drosophila':1},'wanting':{'of':1},'powers--man':{'still':2},'butterfly':{'kallima':2,'showed':1,'which':1,'an':1},'scents.':{'the':1},'hunt':{'insects':1,'from':1},'wilson.':{'peripatus':1,'rock':1},'opposite':{'pans':1,'direction':2,'electric':1,'ways':1,'of':1,'ends':1,'side':2,'picture.':1,'directions':3,'page':1},'knew':{'to':1,'what':1,'.':1,'but':1,'less':1},'molecule':{'of':4,'is':2,'contains':1,'as':1,'every':1,'therefore':1,':':1,'with':1},'talk':{'of':1},'detect':{'and':2,'a':2,'them':1,'less':1,'this':1,'as':2,'such':1,'the':2},'printed':{'cards':1,'on':2,';':1,'and':1,'editions':1},'remarks':{'of':1},'inserted':{'nuts':1},'pages':{'for':1},'adaptability':{'of':1},'average':{'distance':1,'would':1,'level':1,'of':1,'men':1,'molecule':1,'height':1,'depth':1,'5':1,'human':1,'estimate':1,'organism':1},'drive':{'electric':1},'crowd--we':{'cannot':1},'unabated':{'to':1},'messier':{'31':2},'atlantic':{'and':1,'cod-banks':1,'some':1,'.':1,'crowds':1,'overcome':1},'salt':{'and':1,'did':1,'of':1,'lake':2,'.':1,'water':2,'projects':1},'laws':{'and':1,'of':5,'alone':1,'regulating':1,'in':1},'walking':{'and':2,'on':1,'wood':1,'powers':2,'movements':1},'pencilled':{'above.':1},'definite':{'direction':2,'constant':1,'periodic':1,'positions':1,'function--we':1,'answers':1,'possibilities':1,'entities':1,'step':1,'race':1,'figures':1,'nervous':1,'learning':2,'mammals':2,'routes':1,'position':2,'concentric':1,'type':1,'order':1,'bronze':1},'imagines':{'when':1},'friction':{'and':1,'on':1,'.':1,'when':1,'of':1},'far-reaching':{'importance':1,'influences.':1,'with':1,'discoveries':1,'consequences':2},'bright':{'star':1,'globe':1,'lines':5,'central':1,'white':1,'cloudlets':1,'image':1},'fiord':{'estuary':1},'scarce':{'as':1,'multiplying':1},'imagined':{'the':1,'entity':1},'beetles':{'and':1},'slot':{'and':1,'of':1},'colony-making':{'protozoon':1},'slow':{'and':1,'like':1,'boiling':1,'one':1,'down':2,'to':3,'as':1,'vibrations':1,'although':1,'changes':1},'representation':{'of':6,'to-day':1},'gravers':{'and':1},'fox-terrier':{'turned':1},'liberation':{'and':1},'going':{'on':17,'appearing':1,'that':1,'back':5,'one':2,'to':4,'through':1,'farther':1,'on.':8,'beyond':1,'outward':1,'concern':1},'uppermost':{'portion':1,'layer':1},'helmholtz':{'lord':1},'dispute':{'as':1,'the':1},'evolution--but':{'even':1},'hindmost':{'pair':1},'guarded':{'against':1},'tail.':{'now':1,'it':1,'but':1,'man':1},'infallibly':{'between':1},'genera':{'and':1},'eel-fare':{'includes':1},'freezing':{'.':1,'point':1},'theory--had':{'a':1},'also--protection':{'for':1},'clearest':{'realities':1},'shallow-water':{'species':1},'keenly':{'aware':1},'parasitic':{'sporozoa':1,'death':1},'toads':{'newts':1,'and':2,'jump':1,'sometimes':1},'absurdly':{'small':1},'liable':{'to':3,'such':1},'where':{'and':1,'copper':1,'words':1,'it':10,'deep':1,'an':1,'sea':1,'any':1,'dense':1,'no':1,'there':5,'its':1,'their':1,'does':3,'routine':1,'you':1,'alertness':1,'we':3,'very':1,'they':2,'alone':1,'instinctive':1,'a':3,'this':2,'these':1,'each':1,'the':24},'sake--imitation--the':{'mind':1},'vision':{'and':1,'is':3,'holds':1,'than':1,'in':1},'press.':{'comparative':1},'proof--man':{'s':1},'attenuated':{'that':1},'electrons--and':{'the':1},'reign.':{'they':1},'silurian':{'and':1,'the':1,'when':1,'period':2,'rocks':1},'up':{'and':8,'individually':1,'intelligence':2,'into':14,'it':1,'general':1,'light-waves':1,'at':1,'questions':1,'in':10,'impressions':1,'rivulets':1,'the':26,'any':1,'living':1,'what':1,'from':2,'for':2,'how':1,'.':5,'to':8,'between':1,'estuaries':1,'new':1,'energy':1,'his':1,'an':1,'substances':1,'our':2,'nonproprietary':1,'trees':1,'but':1,'such':1,'one':1,'with':6,'by':10,'a':9,'on':5,'organic':1,'these':1,'light':1,'leaves':1,'carbon':3,'so':2,'of':9,'again':2,'everything':1,'photosynthesis':1,'or':4},'distended.':{'eventually':1},'impressions':{'go':1,'of':1,'.':1},'hastened':{'the':1},'830':{'000':2},'inequalities':{'of':1,'in':1},'compounds':{'to':1,'from':1,'activated':1,'like':1,'out':1},'representatives':{'of':3,'sometimes':1,'had':1,'except':1,'.':1},'under-skin':{'or':1,'.':1},'secondaries':{'are':1},'dormitory':{'instead':1},'--which':{'have':1},'moons':{'we':1,'of':4,'four':1,'to':1,'which':2,'certain':1,'round':1},'affecting':{'it':1,'nerve-cells':1},'man.':{'a':1,'on':1,'animals':1,'pariasaurus':1,'4':1,'triceratops':1,'it':1,'deperet':1,'according':1,'1':1,'illustration':1,'such':1,'eocene':1,'man':1},'volvox':{'a':1,'69':1,'the':1,'is':1,'.':1},'fir':{'cones':1},'spectroscopy':{'is':1},'vertical':{'line':1,'bars':1},'screen':{'and':1,'we':1,'for':1,'means':1,'where':1,'is':1,'.':4,'through':1,'which':1,'producing':1,'make':1,'glowed':1},'dome':{'like':1,'.':1},'ancestors--a':{'wolf':1},'big-brain':{'type':4},'proterozoic':{'ages':1,'eras':1,'era':1},'jets':{'of':2,'or':1},'engravings.':{'factors':1},'spark':{'on':1,'this':1,'.':1,'271':1,'274':1,'consists':1,'an':1,'or':1},'well-protected':{'pupa':1},'concentrated':{'upon':2},'circumference':{'so':1,'.':1},'many':{'insects':1,'instincts':1,'years':1,'bivalves':1,'experiments':2,'facts':1,'contributions':1,'birds':4,'young':2,'forms':4,'parts':2,'anticipations':1,'reptiles':2,'inventions':1,'thousands':2,'which':1,'tenses':1,'very':1,'crustaceans':1,'portions':1,'more.':1,'far-reaching':1,'minute':1,'fossils':1,'nerve-endings':1,'countries':1,'corners':1,'miles':2,'brownish':1,'small':4,'freshwater':1,'generations':1,'people':1,'animals':9,'fish':1,'parasites':1,'individual':1,'universes':2,'hundredfold':1,'creatures':2,'oceanic':1,'for':1,'ways':1,'migrations':1,'new':1,'open-sea':1,'levels--the':1,'we':1,'were':2,'hours':1,'broken':1,'directions.':1,'yards':1,'directions':3,'about':1,'brilliant':1,'of':23,'months':2,'haunts':1,'times':3,'shore-animals':2,'tree-loving':1,'already':1,'useful':1,'annelids':1,'another':1,'fees':1,'protozoa':2,'establish':1,'millions':5,'ancient':1,'would':1,'.':1,'tropical':1,'stars':2,'dangers':1,'more':1,'acquisitions':2,'that':2,'mammals':3,'regard':1,'sciences.':1,'amphibians':1,'cases':9,'an':1,'plants':1,'prehistoric':1,'unsegmented':1,'places':1,'apples':1,'planes':1,'drops':1,'similar':2,'and':2,'likewise':1,'days':3,'have':1,'domesticated':1,'occur':1,'different':5,'things':1,'shore':1,'astronomers':4,'other':9,'doors':1,'units':1,'mysteries':1,'kinds':1,'thoroughgoing':1,'eggs':1,'swiftly':1,'problems':1,'important':1,'waves':1,'fishes':1,'types':2,'a':3,'land':1,'minutes':1,'sometimes':1,'peculiarities':1,'electrons':1,'nuclei':1},'moon.':{'illustration':1},'estimates.':{'the':1},'thickly':{'peopled':2},'s':{'chicks':1,'atmosphere':3,'skeleton':1,'sentence':1,'stinging-cells':1,'instincts':1,'sheltering':1,'brain':3,'snapping-blades':1,'hairs--an':1,'skin':2,'chicken':2,'visceral':1,'principal':1,'web':3,'anvil':1,'interesting':1,'instruction':1,'monkeys':1,'hidden':1,'real':1,'beginnings.':1,'return':1,'orbit':1,'arboreal':3,'big':1,'theory--had':1,'famous':2,'shell--there':1,'sons':2,'moods':1,'saying':1,'hands':1,'press':7,'world':1,'rotation':4,'continued':1,'day':4,'runs':1,'establishment':1,'cry':1,'solution':1,'experiments':1,'activity':1,'sake--imitation--the':1,'ceaseless':1,'mental':2,'energy':2,'mongoose':1,'notice':1,'past':1,'affiliation':1,'books':1,'mighty':1,'year':1,'laboratory':1,'indirect':1,'ascent':2,'arm':1,'shining':1,'pedigree':2,'apparatus':2,'nebula':6,'crust':4,'finger':1,'rational':1,';':2,'eggs':1,'discovery':1,'body':8,'prerogative.':1,'theory':2,'leg':1,'beak-like':1,'men':4,'behaviour':1,'magnetism':2,'compass':1,'dwindling':1,'tide-producing':1,'intense':1,'advance':2,'great':2,'derivation':1,'side':1,'croaking-sacs':1,'patagium':1,'action':1,'history':2,'frequent':1,'skill':1,'point':4,'feelings':1,'inquisitive':1,'long':2,'beak':2,'theory.':1,'story':1,'sake':1,'initial':1,'frog':1,'.':26,'dropping':1,'pedigree--man':1,'structure':1,'danger-note':1,'white':1,'store':1,'mundane':1,'eyes':2,'hard':1,'flight':1,'relationship':4,'cluck':1,'training':1,'shard':1,'bulk':1,'heat':2,'surface':19,'ear':1,'food-canal':1,'essays':1,'he':1,'pull':2,'wise':1,'skull':3,'solid':2,'gravitational':1,'bill':12,'fly-trap':1,'light':4,'propeller':1,'head.':1,'earth.':1,'ein':1,'and':1,'words:':1,'discovery.':1,'ingenuity':1,'horns':1,'escape':1,'mind':3,'head':3,'apartness':1,'dog':1,'shell':1,'at':1,'cathedral':1,'wonderful':1,'clothing':1,'laws.':1,'movements':2,'cage':1,'rays':5,'maxim:':1,'diurnal':1,'inheritance':1,'heat.':1,'forceps':1,'blood-relationship':1,'food':1,'strange':1,'animal':1,'hedgehog-like':1,'predestined':1,'civilisation':1,'composition':1,'conclusion':1,'vestigial':1,'nest':1,'philosophy':1,'reach':1,'hand':1,'ancestors':4,'mouth':1,'device':1,'does;':1,'sand-grouse':1,'descent':3,'mysteries':2,'remote':1,'expert':1,'foot':1,'undeniable':1,'age':2,'handiness.':1,'coastlines':1,'star-book':1,'mass':1,'gill-plates.':1,'the':2,'wing':4,'goals':1},'mane':{'reaching':1},'expended':{'their':1},'flipper':{'of':3},'expression':{'of':6,'is':1,'as':1,'are':1,'familiar':1,'instinctive':1,'has':1},'moon;':{'it':1},'riddle':{'that':1},'stoats':{'hares':1},'ants':{'and':5,'beneath':1,'bees':3,'are':1,'hive':1},'air-breathing':{'insects':1,'arthropods':3,'amphibians':1,'invertebrates':1},'boar':{'and':1,'below':1,'coloured':1,'were':1},'extinct':{'and':2,'reptile':2,'apes':1,'animals':2,'volcanoes':1,'fish':1,'flying':3,'leaving':1,'monsters':1,'neanderthal':1,'reptiles':1,'types--':1,'race':1,'in':1,'not':1,'vegetarian':2,'type':1,'or':1,'pterodactyls':1,'flightless':2},'twig':{'and':1,'breaks':1,'for':1},'want.':{'illustration':1},'fitful':{'gleams':2},'collides':{'with':1},'cetaceans':{'some':1},'stretch':{'of':1,'vast':1},'mounting':{'of':1},'lettering':{'to':1},'diurnal':{'tint.':1,'variation':1},'collided':{'with':1},'combined':{'to':1,'operation':1},'finger-tip':{'they':1},'reflective':{'one':1},'covering':{'and':1,'many':1,'is':1,'of':2},'recaptures':{'it':1},'day--a':{'long':1},'enable':{'their':1,'the':1,'us':4},'gist':{'of':2},'lakelets':{'of':1},'thousand':{'and':1,'or':2,'trillion':2,'of':1,'cells':2,'million':2,'together':1,'years':10,'millions':1,'miles':3,'.':1,'steep':1,'thousand':1,'generations':1,'times':6},'formed':{'a':1,'then':1,'has':1,'from':3,'float':1,'young':1,'it':1,'solids':1,'at':1,'sandstones':1,'in':2,'the':4,'.':2,'by':2},'haunt':{'forever':1,'for':1,'of':8,'some':1,'stops':1,'includes':1,'so':1,'which':1,'has':1},'photos':{':':5},'indents':{'the':1},'observe':{'these':1,'and':1,'in':1},'infusorians':{'to':1,'like':1},'diffuse':{'and':1,'gas':1},'co-ordination':{'of':1},'prominence':{'to':1,'by':1,'would':1},'intimately':{'associated':1,'bound':1},'dints':{'impressed':1,'have':1},'confidently':{'say':1},'situation':{'.':5,'for':1,'in':1},'region':{'smaller':1,'of':5,'is':1,'when':1,'to':1,'at':1,'known':1,'the':4,'called':1,'south':2},'girth':{'.':1},'concatenation':{'of':1},'birth.':{'enough':1},'regularity':{'of':1},'rock-cod':{'requires':1},'ascii':{'start':1,'or':2},'adopted.':{'the':1},'binary':{'compressed':1},'beginning.':{'in':1},'shuts':{'on':1},'preparatory':{'to':1},'perpetually':{'giving':1},'coconuts':{'is':1},'emulsions':{'can':1},'way.':{'this':1,'bearing':1},'wires':{'as':1,'are':1,'in':1},'sickness':{'.':5},'edges':{'and':1,'of':4},'advertisement':{'impressing':2},'six':{'meant':1,'feet':1,'great':1,'main':1,'inches':1,'very':1,'thousand':1,'months':1,'quite':1,'colours':1,'to':2,'miles':1,'greatly':1,'years':1,'weeks':1,'stages':2},'volcanoes':{'.':1},'tentacle':{'touches':1},'know':{'and':2,'almost':1,'indeed':1,'is':1,'it':4,'not':1,'as':2,'are':1,'in':1,'if':1,'fire':1,'what':1,'from':1,'their':1,'when':3,'gases':1,'.':3,'to':2,'outside':1,';':1,'be':1,'that':17,'very':1,'but':1,'nothing':1,'now':2,'with':1,'a':1,'also':1,'about':1,'to-day':2,'whether':3,'of':4,'no':1,'definitely':2,'far':1,'life.':1,'the':5,'nothing.':1,'something':1},'peculiarities':{'and':1,'of':5,'.':1,'say':1,'in':2,'such':1},'costs':{'and':2},'engulfing':{'and':1,'large':1,'in':1},'unimagined':{'.':1},'persistently':{'used':1,'resorted':1},'216':{'photo':2},'summer':{'and':2,'full':1,'darkness':1,'of':1,'green-flies':1,'months':1,'scene':2,'day':1,'plumage':1,'s':1,'does':1,'at':1,'weather.':1,'than':1},'followed.':{'illustration':1},'manifold':{'significance.':1,'influence':1},'213':{'photo':2},'being':{'already':1,'closely':1,'swept':2,'blown':1,'unpalatable':1,'able':1,'moved':1,'investigated.':1,'an':3,'held':1,'as':1,'set':2,'dried':2,'human':1,'nonplussed':1,'swallowed':2,'any':1,'given':1,'built':1,'to':1,'washed':2,'due':1,'continually':1,'liberated':1,'outside':1,'incessantly':1,'deposited':1,'surveyed':1,'endowed':1,'polygamous':1,'more':2,'a':1,'affected':1,'evolved':1,'that':3,'very':1,'mammals':1,'formed':1,'what':1,'driven':1,'imperfectly':1,'nourished':1,'dissipated':1,'on':1,'than':1,'regrown':1,'thrown':1,'begins':2,'devoured':1,'indivisible':1,'embryos':1,'frozen':2,'consumed':1,'utilised':1,'replaced':1,'greatly':1,'hurled':1,'each':1,'quick':1,'the':3,'left':1,'reinforced':1},'drone-fly':{'is':1},'slime':{'from':1},'rest':{'and':1,'repair':1,'assured':1,'of':5,'is':1,'belong':1,'.':3,'till':1,'through':1,'in':1},'steamer':{'and':1},'crust.':{'on':1},'potentiality':{'of':1},'aspect.':{'illustration':1},'water-basins':{'or':1},'ligula':{'or':1},'weekly':{'nature':1},'occasional':{'light':1,'flash':1,'traces':1},'tactility':{'.':2},'geological':{'clock':1,'time-table':1,'estimates.':1,'tree':1,'middle':1,'periods':1,'time':1,'past.':1},'silver':{'on':1,'mirror':1},'instrument':{'and':1,'again':1,'used':2,'for':3,'that':1,'of':3,'however':1,'to':1,'which':2,'in':1,'the':2,'has':1,'ever':1,'gets':1},'formative':{'times':1},'continuation':{'of':2},'prominently':{'whenever':1,'displaying':1},'form-resemblance.':{'illustration':1},'skies':{'.':1},'aspects':{'of':3,'matter':1,'folk':1,'.':1},'around':{'sun':1,'the':8,'its':1,'us':1,'an':2},'decomposed':{'into':1},'dart':{'to':1},'dark':{'sprawling':1,'and':1,'absorbing':1,'spots--they':1,'in':1,'silent':1,'nebula':1,'moorland':1,'spots':1,'forms':1,'to':1,'only':1,'parts':1,'stars':1,';':1,'body':1,'bands':2,'water':1,'heat':1,'lines.':1,'markings':1,'areas':1,'varieties':1,'corners':1,'region':1,'fringe':1,'lines':3,'matter':1,'of':1},'bandage':{'which':1},'vacuum':{'tube--the':1,'tube':7,'tubes':1,'.':2},'world':{'and':2,'would':1,'new.':1,'throwing':1,'is':4,'within':1,'an':1,'as':1,'are':2,'in':2,'provokes':1,'if':1,'wondered':1,'internat':1,'when':1,'.':13,'without':1,'too':1,'which':2,';':2,'was':1,'over':1,'then':1,'knows':1,'means':1,'becomes':1,'who':1,'but':2,'than':2,'like':1,'a':1,'about':1,'for':2,'of':7,'professor':1,'monkeys':3,'will':1,'s':1,'became':1,'can':2,'always':1,'biological':1,'the':2,'entered':1,'settled':1,'came':1,'once':1},'breakage':{'plane':1},'vague':{'idea':1},'dare':{'not':1,'say':1,'one':1},'sensational':{'stories':1,'estimates':1,'discoveries':1},'60':{'spotted':1,'000':2,'reproduced':1,'days':1},'fossils':{'we':1,'e.g':1,'of':1,'when':1,'but':1,'coloured':1,'.':1,'in':1,'binding':1,'many':1,'by':1},'pole':{'to':2,';':1,'of':5,'was':1,'in':1},'claw':{'it':1},'stationary':{'.':1},'clap':{'of':1},'65':{'photo':1,'reproduced':1},'satisfactory':{'and':1,'fossils':1,'or':1,'way':1},'fives':{'or':1},'wattle':{'or':1},'law--senses':{'of':1},'lobster':{'swimming':1},'all-pervading':{'similitude':2},'diving':{'in':1,'flying':1,'capacity':1,'but':1,'suit':1},'racial':{'evolution':2,'profit.':1,'ventures':1,'strains':1,'vigour':1,'change':2,'qualities':1,'process':1,'qualities--notably':1},'armoured':{'fishes':1},'thinks':{'of':1,'the':1,'that':3,'less':1},'wrongly':{'call':1,'shows':1},'dissociated':{'and':1},'dimensions':{'11':1,'this':1,'.':2,'cannot':1,'in':1,'than':1},'cavity':{'the':2},'memories':{'and':1,'of':3},'noon':{'of':1},'tree-snake':{'is':1},'nook':{'of':1},'favourite':{'answer':1},'semotilus':{'atromaculatus':2},'918':{'miles':1},'happened':{'to':2,'over':1,'later':1,'in':2,'one':1},'levels--the':{'tendency':1},'transmutation':{'of':1,'brighten':1,'would':2},'refer':{'to':3,'throughout':1},'scientific':{'glories':1,'methods':1,'habit':2,'mind':2,'imagination':1,'caution':1,'weekly':1,'instruments.':1,'ideas':6,'way':1,'description':1,'description.':1,'american.':1,'men':2,'problems':1,'hypothesis':1,'statement.':1,'spirit':1,'man':1,'acquisitions':1,'definition':1,'study':1,'american':1,'way.':1,'spectator':1,'position':1},'power':{'used':1,'from':1,'stations':1,'of':37,'stations.':1,'that':1,'to':1,'enough':1,'in':1,'or':1,'is':2},'intimate':{'physiological':1,'part':1,'partnership':3,'physiology':1},'sprung':{'from':1},'precious.':{'illustration':1},'endogamy':{'tending':1},'five.':{'if':1},'lens':{'and':2,'weighs':1,'of':1,'is':1,'two':1,'.':3,'four':1,'near':1,'however':1,'at':2,'resolved':1,';':1,'called':1},'stone':{'implements':3,'and':1,'neolithic':1,'curlews':1,'generates':1,'hunting':1,'resting':1,'of':1,'age':3,'implements--knives':1,'until':1,'to':1,'running':1,'.':1,'into':1,'living':1,'the':2,'trying':1,'its':1,'or':1,'age.':3},'origins':{'are':1},'swarms':{'of':1},'industry':{'and':1},'slender':{'stream':1},'side':{'and':5,'for':1,'tells':1,'of':19,'actions':1,'.':8,'to':9,'below':1,'so':2,'are':1,'veins':1,';':1,'must':1,'was':2,'by':1,'view':1},'practicable':{'to':1},'act':{'though':1,'of':2,'was':1,'against':1,'as':2,'together':1,'experimentally':1,'instinctively':1,'with':1},'composed--':{'one':1},'johnston':{'in':1},'--brushes':{'off':1},'puzzle-box':{'at':1},'diversely':{'adapted':1},'fundraising':{'.':1},'burning':{'and':1,'coal':1,'wood':1,'of':1},'image':{'and':1,'of':2,'.':1},'electricity.':{'what':1,'4':1},'surinam':{'toad':4},'carey':{'s':2},'mic.':{'sci.':1},'sneering':{'curl':1},'wave-movements':{'on':1},'lively':{'cheerful':1,'and':1,'commotion':1,'.':1},'wade':{'cautiously':1},'excrementitious':{'material':1},'snakes':{'are':3,'.':1},'tropical':{'shores':1,'africa':2},'repertory.':{'from':1,'according':1},'her':{'and':1,'silken':1,'family':2,'supply':1,'almost':1,'advantage.':1,'hand.':1,'mind':1,'hindmost':1,'young':1,'chin':1,'in':1,'arm':1,'web':1,'ancestors':1,'two':1,'stealthy':1,'short':1,'to':2,'tail':1,'eggs':6,'body':2,'life':1,'maternal':1,'offer':1,'nest':1,'attention':1,'back':2,'behaviour':1,'nimble':1,'mouth-parts':1,'intent':1,'beak':1,'instinctive':1,'teacher':2,'clumps':1,'a':1,'perceptions':1,'cocoon':1,'limits':1,'performances':1,'except':1,'range':1,'race':1,'teeth':1,'mouth':1,'relation':1},'bristles':{'.':1},'reflectors':{'and':1,'.':1},'symbiosis':{'.':1},'secretion':{'such':1,'of':1},'hen':{'leave':1,'there':1,'which':1},'bubble':{'would':1,'of':3,'ascends':1,'coloured':1,'as':1,'are':1,'were':1,'the':1,'is':2},'survives':{'in':1},'journ':{'.':2},'continents':{'and':4,'are':1,'.':1},'secreted':{'strange':1,'from':2,'by':1},'semnopithecus':{'entellus':1},'mammals':{'and':9,'among':1,'there':2,'besides':1,'show':2,'enjoy':1,'it':1,'as':2,'including':1,'are':3,'have':2,'in':1,'ourselves':1,'whose':1,'by':2,'from':1,'hoofed':1,'did.':1,'burrowers':1,'.':13,'to':2,'master':1,'emerged':1,';':2,'save':1,'is':1,'we':2,'repeat':1,'which':1,'may':1,'but':1,'like':9,'arose':1,'they':2,'such':4,'flowering':1,'now':1,'adaptive':1,'possess':1,'off':1,'especially':1,'e.g':1,'these':1,'always':1,'will':1,'very':1,'the':2,'furnish':1},'nitrogenous':{'waste':2,'material':1},'foreheads':{'well-marked':1},'another.':{'investigation':1,'sec':1,'besides':1,'illustration':1},'survived':{'and':1},'elimination':{'of':3},'mice':{'learn':1},'with':{'all':8,'pointing':1,'less':1,'frontispiece.':1,'over':1,'particular':1,'worms':2,'yellow':1,'far-reaching':1,'hind-legs':1,'experiments':1,'human':1,'signs':1,'alternative':1,'its':12,'colour-associations':1,'one':4,'cave-bear':1,'remarkable':1,'decomposing':1,'much':5,'young':2,'reason--lays':1,'better':1,'insects':1,'neighbours':1,'internal':1,'microscopic':1,'4':3,'disgust':1,'gravel':1,'instincts':1,'awareness':2,'alternating':2,'them':3,'his':11,'increased':1,'permission':1,'arboreal':1,'capacities':1,'longish':1,'balancing':1,'negative':1,'words':2,'instinctive':1,'silk':1,'motor':1,'progressive':1,'sense-organs':1,'ageing':1,'large':4,'this':11,'coco-nut':1,'each':1,'perceptual':1,'traces':1,'engravings':1,'mental':1,'intelligence':2,'energy':2,'hard':1,'some':6,'plumage':1,'us':1,'our':3,'instinct--the':1,'rough':1,'folk':1,'planetesimal':1,'what':3,'definite':1,'fingers':2,'worship':1,'difficulties':1,'rational':1,'numerous':2,'public':1,'scientific':1,'zest':1,'cellulose':1,'seaweeds':1,'out-flowing':1,'extraordinary':1,'compressed':1,'tartan':1,'by':1,'universals.':1,'both':1,'great':7,'freshwater':2,'distinctness':1,'many':3,'parts':1,'motion':1,'benevolence':2,'grain':1,'greatly':1,'atoms.':1,'warning':1,'or':2,'embryo':1,'copper':1,'equally':1,'there':1,'peculiar':1,'sweet':1,'powerful':1,'marked':1,'hearing':1,'sympathy':2,'unicellular':1,'another':4,'such':3,'faraday':1,'.':1,'open':1,'your':1,'fossil-bearing':1,'startling':1,'little':1,'her':3,'shells':1,'positive':1,'flying':1,'two':1,'particulars':1,'anyone':1,'their':9,'2':2,'which':17,'reptiles':1,'vapours':1,'life':1,'only':1,'that':1,'becoming':1,'apparent':1,'flinty':1,'stone':1,'amphibians':1,'it':7,'offers':1,'determination':1,'external':1,'excellent':1,'prodigious':2,'an':11,'active':2,'considerable':2,'those':2,'animals':1,'adaptations':1,'glory':1,'these':4,'instinct':2,'sea-anemones':1,'project':2,'matter':2,'paragraph':2,'temperatures':1,'wicketed':1,'concepts':1,'wild':1,'about':1,'more':6,'beliefs':1,'something':2,'and':1,'associated':1,'protrusive':1,'almost':2,'certain':3,'universal':1,'suggestions':2,'few':1,'general':4,'as':1,'breathing':1,'numbers':1,'aristotle':1,'in':6,'partner':2,'mediocre':1,'agility':1,'any':2,'currents':1,'masterly':1,'astonishing':1,'different':2,'awkward':1,'no':2,'unsuitable':1,'ideas':1,'immense':1,'pectoral':1,'food':1,'other':3,'coconuts':1,'animal':1,'ordinary':1,'enormous':1,'calendar-keeping':1,'rude':1,'opposite':1,'mentality':1,'unsurpassed':1,'most':1,'mankind':1,'moss':1,'mendel':1,'astronomy':1,'buttonholes':1,'man':2,'a':72,'short':1,'branches':1,'traps':1,'conscious':1,'others.':1,'professor':1,'incredible':1,'eddies':1,'peculiarities':1,'points':1,'electrons':2,'very':1,'the':149,'mating':1,'reserve':1},'pull':{'of':3,'acting':1,'which':1,'each':1,'the':3,'than':2},'rush':{'violently':1,'through':1,'of':2},'october':{'10':1,'3':2,'5':2},'stoneless':{'plum':1},'world-cloud':{'of':1},'universe--astronomical':{'instruments.':1},'nearest':{'planet':1,'to':5,'star':2,'stars':2,'of':1},'agree':{'rather':1,'to':7,'.':1,'with':1,'that':2},'darker':{'in':1},'gone':{'furthest':1,'far':1,'back.':1,'to':1,'through':1,'in':1,'wild':2,'further':1,'beyond':1,'by':1},'haunts--such':{'as':1},'certain':{'comets':1,'individuality':1,'abilities':1,'hormones--itself':1,'facial':1,'repertory':1,'is':2,'pre-arrangements':1,'number':1,'actions':1,'sounds':1,'internal':1,'depth':1,'from':1,'degree':2,'microbes':1,'that':15,'peculiarities':1,'parts':1,'black':1,'units':1,'ancestor':1,'lichens':1,'long-headed':1,'backgrounds':1,'we':1,'clever':1,'kinds':1,'desires':1,'substances':1,'ductless':1,'however':1,'effective':1,'atoms':1,'sensory':1,'dinosaurs':1,'chemicals':1,'words':1,'cases':3,'minerals':1,'types':2,'areas':1,'plants':1,'dark':2,'kind':1,'difficulties':1,'predisposition':1,'commands':1,'lines':2,'strange':1,'amount':7,'implied':1,'limit':1,'of':1,'fixed':1},'ak':{'99712':1},'cuttles':{'or':1},'am':{'of':1},'an':{'ovule':1,'impression':4,'atmosphere':1,'evolutionary':1,'earthworm':5,'astronomical':1,'egg-cell':1,'infant':3,'aquatic':1,'atomic':2,'intricate':2,'earth':1,'abundant':2,'imagined':1,'outer':1,'anvil':1,'interesting':13,'apple--out':1,'endeavour':1,'instrument':4,'advanced':1,'easy':2,'orange':1,'electrical':2,'adequate':1,'unprecedented':1,'equilibrium':1,'increased':2,'advantage':1,'arboreal':3,'inspiriting':1,'indubitable':1,'educative':1,'account':1,'indigenous':2,'answer':3,'unimportant':1,'historic':1,'asymmetrical':1,'aerolite.':1,'awful':1,'instinctive':2,'emergence':1,'antiquity':2,'association':1,'eye-piece':1,'old-established':1,'evolution':1,'onion':1,'organ':3,'extremely':1,'unnecessary':1,'absurdly':1,'emphatic':1,'intensification':1,'activity':1,'entirely':2,'automatic':3,'essential':3,'associative':1,'adaptation':1,'unsatisfied':1,'abbreviated':1,'old':1,'x-ray':2,'insignificant':1,'energy':2,'animalcule':1,'hour.':1,'inkling':2,'astronomer':2,'individual':5,'all-pervading':2,'exuberant':1,'ascent':1,'extinct':5,'electric':20,'index':1,'apparatus':2,'opaque':1,'open':1,'ice':1,'hereditary':1,'increase':2,'appreciative':1,'indian':1,'eight-armed':2,'economical':1,'inborn':2,'indication':1,'antler':1,'increasing':2,'eagle':1,'evolving':2,'earlier':4,'explosive':1,'aeroplane':2,'intimate':1,'ever-lengthening':1,'exudation':1,'illustration':6,'outfit':1,'egg':1,'extraordinary':2,'experimenting':1,'immature':2,'expansion':2,'arithmetical':1,'invisible':2,'entrancing':1,'exciting':2,'advance':1,'enormous':10,'instant':1,'indivisible':1,'envelope.':1,'exceptionally':1,'amount':1,'ineffective':1,'anthropoid':3,'invitation':1,'offshoot':1,'observation':1,'expression':1,'elongated':1,'untutored':1,'utterly':1,'exuberance':1,'intellectual':1,'echo':1,'active':1,'appropriate':1,'eleventh':1,'extraneous':1,'eventful':2,'elementary':1,'inorganic':3,'immensely':1,'electronic':1,'ether':4,'ancient':3,'elastic':1,'eclipse.':1,'alligator':2,'unknown':1,'indispensable':1,'outline':2,'approximate':1,'immense':7,'intermediate':1,'examination':2,'inner':2,'interest':1,'ounce':1,'egg-layer':1,'exploring':1,'extensive':1,'imperfect':2,'amoeba':1,'inclined':1,'immediate':1,'idea':1,'appreciation':1,'external':2,'impulse':2,'atom':16,'upright':1,'improved':1,'institution':1,'encyclopaedia':1,'otter':1,'abundance':1,'exception':1,'apprenticeship':2,'hour':2,'eclipse':3,'harmonious':1,'obvious':1,'empty':2,'historical':1,'emotional':1,'outflame':1,'average':2,'undercharged':1,'assemblage':1,'enforced':1,'angel':1,'almost':2,'expanding':1,'expedient':1,'ant':3,'aristotle':1,'element':2,'apparently':1,'everyday':1,'open-water':1,'angle':2,'infantile':1,'awkward':1,'alphabet':1,'eloquent':1,'american':2,'event':1,'instance':1,'epoch':1,'internal':2,'inquiry':1,'oar':1,'animal':19,'elephant':1,'inch':19,'ordinary':6,'intelligent':6,'explanation':2,'unutterably':1,'independent':1,'extended':1,'easygoing':1,'opposite':1,'actual':2,'object':3,'astounding':2,'insect':5,'important':6,'appreciable':1,'advertisement':1,'infinite':3,'alpha':1,'irretraceable':1,'advantageous':1,'older':1,'undeniable':1,'age':2,'electron':8,'innocent-looking':1,'ocean':2,'intruder.':1,'exceedingly':1,'experimental':2,'african':2,'inhabitant':1,'opportunity':2,'order':1},'as':{'peacock':1,'all':2,'hunger':1,'being':1,'when':2,'mackerel':1,'dancers':1,'soon':1,'rest':1,'symbols':2,'brain':1,'bright':1,'dog':1,'vastly':1,'go':1,'graptolites':1,'expressions':1,'fine':1,'yet':4,'before':2,'one':6,'slow':1,'thrilling':1,'greenwich':1,'fit':1,'sodium':2,'possible.':1,'deposits':1,'examples':2,'to':38,'must':1,'wood':1,'smolts':1,'molecules':1,'ours':1,'gills':1,'has':6,'noctiluca':1,'frogs':1,'good':1,'pre-dravidians.':1,'easily':1,'very':1,'big':1,'locusts':1,'sappers':1,'possible':2,'dark':1,'every':1,'nearly':1,'they':17,'instinctive':1,'now':1,'dr':1,'crabs':1,'worlds':1,'evolution':1,'fossils':1,'heat-waves':1,'cavendish':1,'gifted':1,'modern':1,'large':3,'rods.':1,'stuff':1,'mind-body':1,'relics':1,'each':1,'beasts':1,'amoebae':1,'imprints':1,'mathematical':1,'reactions':1,'set':3,'rats':1,'grouse':1,'curved':1,'radium':2,'creation':1,'some':1,'dead':1,'parasites':1,'miniatures':1,'among':1,'are':2,'specified':1,'body-mind':1,'our':2,'fear':1,'best':1,'happens':2,'established':1,'shown':9,'palaeolithic':1,'for':1,'1850':1,'fingers':1,'food':3,'may':1,'health':1,'monkeyish':1,'copper':1,'public':1,'iron--and':1,'can':1,'granites':1,'we':59,'wheat':1,'inert':1,'cauliflower':1,'nature':1,'equivalent':1,'valuable':1,'atoms':1,'water':2,'basalts':1,'members':1,'represented':1,'oxalic':1,'safer':1,'dwindling':1,'by':1,'change':1,'on':1,'great':2,'kids':1,'of':1,'taking':1,'chamberlin':1,'thinking':1,'cormorants':1,'other':1,'grilse.':1,'peripatus':1,'heavy':2,'equally':1,'there':6,'bricks':1,'explained':1,'powerful':2,'marked':1,'parachutists':1,'walt':1,'freely':1,'einstein':1,'thick':1,'obliging':1,'earthworms':1,'he':3,'described':1,'crocodiles':1,'distinct':1,'twenty':1,'cradles':1,'two':1,'long':9,'quickly':1,'their':4,'much':4,'sponges':1,'man':1,'was':1,'empty':1,'clever':1,'corresponding':1,'that':7,'leptocephali':1,'shoots':1,'mentality':1,'about':1,'amphibians':1,'glass':1,'heat':2,'regards':11,'external':1,'mounted':1,'with':1,'those':9,'inconspicuous':1,'darwin':2,'hour':1,'brusque':1,'reliable':1,'this':2,'sea-anemones':1,'lungbooks':1,'will':1,'matter':3,'projecting':1,'thin':1,'many':6,'cats':1,'primitive':2,'refractors':1,'distinguished':2,'ants':2,'something':2,'collecting':1,'stubborn':1,'bullhead':1,'defined':1,'is':11,'year':1,'it':60,'an':14,'professor':5,'well.':1,'pieces':1,'numbers':1,'aristotle':1,'in':30,'handle':1,'lambs':1,'any':1,'if':16,'cave-men':1,'sir':3,'different':1,'compared':2,'no':1,'shell-shock':1,'means':1,'uranium':1,'far':5,'internal':1,'useless':1,'pure':1,'elephant':1,'resembling':1,'you':2,'volplanes':1,'higher':1,'open-water':1,'used':1,'beauty':1,'though':1,'contrasted':1,'mutual':1,'rain':1,'most':2,'but':1,'significant':1,'such':2,'elvers':1,'commensalism':1,'probable':1,'a':95,'crystals':1,'safe':1,'pithecanthropus':1,'light':1,'clear':1,'sun-spots':1,'well':11,'grilse':1,'donkeys':1,'having':1,'beds':1,'these':2,'electrons':1,'mechanical':1,'at':1,'the':98,'drawing':1,'restored':2},'associating':{'certain':1},'at':{'distances':1,'all':21,'rest':2,'four':1,'london':1,'its':10,'20':1,'work.':2,'mauer':2,'paris':1,'those':1,'heidelberg':1,'dates':1,'seventy':1,'his':2,'washington.':1,'mathura':1,'birth':1,'half':1,'12:30':1,'least.':1,'colonising':1,'night':9,'fixed':1,'right':4,'learning':1,'some':4,'coldrum':1,'home':4,'once.':1,'sunrise':1,'3':1,'various':3,'between':1,'nine':2,'each':1,'things--that':1,'hundreds':1,'here':1,'nightfall':1,'by':3,'great':2,'last':4,'many':2,'dublin':1,'so':1,'times':1,'http:':6,'first':9,'cambridge':1,'successive':1,'one':6,'another':2,'250':2,'total':2,'from':1,'twenty':1,'three':1,'least':20,'.':1,'their':2,'2':1,'186':2,'gibraltar':1,'leisure.':1,'500':1,'flight':1,'www.gutenberg.org':2,'that':6,'about':1,'but':1,'92':1,'present':12,'this':7,'work':3,'piltdown':1,'abrupt':1,'4557':1,'1.':1,'and':1,'it':1,'an':7,'niagara':1,'in':1,'any':9,'these':3,'different':4,'no':3,'perhaps':1,'things':1,'other':3,'sobral':2,'which':3,'new':1,'ordinary':1,'enormous':1,'simplicity':1,'opposite':1,'our':1,'earlier':1,'hand':2,'most':1,'two':1,'last--that':1,'such':1,'a':43,'lower':1,'e':1,'ottawa':1,'st':1,'809':1,'sunset':1,'the':123,'drawing':1,'once':11},'fumbling':{'at':1},'walks':{'of':1,'slowly':1,'erect':1},'watched':{'and':1},'tranquil':{'world':1},'dawn':{'of':10,'breaking':1,'to':1},'uplifts':{'of':1},'collie':{'at':1},'pliohippus':{'about':1},'2001':{'the':1},'predestined':{'plan.':1},'puppy':{'came':1},'contemporaries':{'in':1},'fry.':{'sir':1,'j':1,'but':1},'indemnify':{'and':1},'vocabulary':{'so':1},'walk.':{'how':1},'terra':{'firma':3},'gifts':{'as':1},'herbs':{'and':1},'environing':{'difficulties':2},'dives--':{'--carrying':1},'waterhouse':{'hawkins':1},'partitioned':{'box':1},'tricks':{'given':1},'mask':{'their':1,'the':1},'mimic':{'the':1,'is':1},'mass':{'and':3,'condensed':1,'of':20,'is':2,'spinning':1,'333':1,'persisted':1,'in':2,'gave':2},'dislodgment':{'is':1},'original':{'ancestors':1,'form':2,'plain':1,'nebula':1,'crust':1,'moorings':1,'greek':1,'peculiarities':1,'cradle':2,'home':3,'hole':1,'first':1},'external':{'methods':1,'opening':1,'hangers-on':1,'of':1,'partnership':1,'pouch;':1,'registration':1,'gills':2,'pouch':1,'method':1},'period--the':{'twenty':1},'sci':{'.':2},'consider':{'a':1,'what':1,'that':1,'.':1,'possibilities.':1,'the':7,'man':1},'elements.':{'sec':1},'31900':{'4':1},'instincts':{'and':1,'where':1,'are':1,'but':1,'.':2},'landlocked':{'corners':1,'dwindling':1},'debris':{'and':1,'of':1},'upkeep':{'of':1},'welfare':{'of':2},'reasoning':{'that':1,'man':1,'.':1},'causes':{'and':1,'of':1,'sleeping':4,'.':1,'the':1,'an':3},'particles':{'and':2,'move':1,'as':1,'are':4,'suspended':1,'in':2,'250':1,'even':1,'.':3,'which':3,'travelling':2,'was':1,'more':1,'may':1,'upon':1,'he':1,'on':1,'of':17,'will':1,'were':2,'the':2,'or':1},'careful':{'and':1,'comparison':1,'reading':1,'calculation':1,'observers':1,'piecing':1,'experiments':1,'way':1,'education':1},'disciples':{'of':1},'hunting':{'enabling':1,'on':1,'leopards':2,'or':2,'small':1},'spirit':{'of':4,'.':2},'to':{'all':6,'consider':4,'remarkable':1,'land-snails':1,'relieve':1,'yellow':1,'four':2,'mild':1,'skate':1,'go':13,'follow':1,'discern':1,'whose':1,'calculate':2,'animal':1,'paris':1,'shrinkage':1,'send':1,'environment':4,'charge':1,'reptiles':1,'swoop':1,'vegetation.':1,'include':1,'crest':4,'shoot':1,'point':3,'arboreal':2,'dispense':2,'induce':1,'me':2,'smack':1,'every':2,'trough':1,'fall':4,'affect':2,'converge':1,'monkeys':2,'look':6,'exaggerate':1,'tear':1,'try':2,'this':19,'settle':2,'us.':1,'speculation':1,'tortoises':2,'prevent':1,'force':1,'ten':1,'discover':4,'jump':1,'surrounding':1,'pass':7,'link':1,'further':2,'changefulness':1,'folk':1,'paralyse':1,'inspire.':1,'what':5,'giving':1,'disentangle':1,'asia':1,'him.':1,'experiment':4,'new':3,'alertness':1,'elsewhere.':1,'fend':1,'berthelot':1,'slow':2,'sink':1,'making':1,'evolutionist':1,'100':1,'fifteen':1,'interpret':1,'wait':1,'dry':9,'great':4,'receive':2,'30':1,'alaska':1,'anchor':1,'credit':3,'amount':1,'social':1,'climb':1,'otters':1,'changes':1,'say--of':1,'secure':2,'complying':1,'africa':1,'replace':2,'put':3,'decrease':2,'instinct--a':1,'establish':2,'estimate':3,'manipulate':1,'everybody':1,'use':5,'proceed':1,'prove':1,'two':5,'almost':1,'live':4,'doubt':2,'call':2,'strike':3,'survive':2,'themselves':1,'evolve.':1,'tell':4,'more':4,'breathe':5,'substances':1,'expose':1,'impress':1,'about':2,'extinction.':1,'particular':2,'scale.':1,'hold':1,'effort':1,'fly':2,'account':6,'pursue':1,'science':1,'work':2,'pieces--a':1,'reproduce':1,'learn':15,'meet':5,'pick':1,'control':2,'compare':1,'type.':1,'tap':1,'give':17,'sense':1,'accept':2,'pieces':1,'high':1,'his':10,'something':2,'slip':1,'arise':2,'handle':1,'keep':4,'attract':1,'occur':2,'huge':1,'end':2,'sit':1,'provide':3,'travel':10,'1':1,'how':1,'vital':1,'hop':1,'answer':4,'over-population':1,'stir':1,'both.':1,'utilise':5,'sir':2,'lag':1,'eighty':1,'germinal':1,'moult':1,'produce':1,'lighting':1,'lay':2,'date':1,'such':2,'bloom':1,'grow':1,'man':15,'a':76,'attempt':2,'remember':1,'light':5,'spout':1,'element':2,'inquire':4,'maintain':2,'deposit':1,'allow':4,'enter':3,'order':1,'punting':1,'contraction.':1,'help':3,'move':7,'vary':1,'stability':1,'insurgence':1,'its':16,'perfect':1,'26':1,'fit':2,'fix':3,'water-weed':1,'equalise':1,'absence':1,'overcome':1,'them':6,'good':1,'return':5,'greater':1,'introduce':1,'break':3,'mention':1,'conquer':2,'half':1,'accumulate':2,'speculate':2,'realize':1,'maintaining':1,'possess':3,'subtler':1,'form.':1,'evade':2,'condense':2,'vibrations':1,'realise':5,'each':2,'cliffs':1,'side':5,'mean':3,'square':1,'retrieve':2,'mental':2,'generation':2,'recapitulate':1,'tip':2,'expect':2,'measure':3,'our':13,'happen':1,'witness':1,'clothe':1,'depress':1,'profit':2,'open':3,'abide':1,'strangers':1,'sustain':1,'adapt':1,'7':1,'impart':1,'medicine':1,'twenty-five':1,'cause':1,'red':1,'metchnikoff':1,'assist':1,'associate':2,'interpose':1,'given':1,'sneak':2,'reason':1,'base':1,'struggle':1,'ask':2,'obliteration':1,'cough':1,'generate':1,'reflect':1,'prepare':1,'language':1,'david':1,'turn':4,'place':2,'deep-sea':1,'loud':1,'think':12,'south':1,'predominate':1,'feed':3,'striking':1,'feel':3,'one':6,'another':13,'carry':4,'radiate':1,'ring':1,'fiji':1,'172':1,'millions':1,'guess':1,'their':13,'bite':1,'construct':2,'anyone':1,'indicate':2,'master':2,'king-crabs':1,'white':1,'bits':1,'listen':1,'efface':1,'nutrition':1,'hug':1,'x-rays':1,'that':11,'continuous':1,'serve':2,'direct':1,'part':2,'peck':1,'insect-visitors--began':1,'10':1,'require':1,'tree':2,'project':3,'matter':1,'fruits':2,'gigantic':1,'and':6,'exert':1,'modern':1,'say':46,'lull':1,'have':19,'accompany':1,'any':2,'eels':1,'offer':1,'isolate':1,'gravity':1,'note':1,'blushing':1,'build':5,'which':31,'destroy':2,'begin':8,'acquire':1,'electric':1,'trace':2,'wind-blown':1,'reach':7,'complexity.':1,'most':3,'detect':4,'eight':1,'glow':6,'expound':1,'seize':1,'professor':1,'gather':2,'science.':1,'drive':1,'face':3,'furnish':1,'weigh':1,'justify':2,'institutions':1,'incomplete':1,'show':14,'fifty':1,'bring':3,'determine':3,'tree.':1,'melt':1,'earth':2,'find':19,'wriggle':1,'generation.':1,'knowledge':1,'environing':1,'explain':9,'storms':1,'eat':1,'surroundings':1,'betray':1,'darwin':3,'hope':1,'do':17,'waltz':1,'hit':2,'get':17,'beat':1,'express':1,'watch':1,'bear':3,'instinctive':1,'dr':1,'him':3,'comply':1,'reveal':1,'evolution':1,'investigate':1,'release':1,'them.':1,'freshwater':1,'where':2,'respond':1,'traverse':1,'set':1,'resist':1,'see':9,'sea':3,'violet':1,'fail':1,'find.':1,'gravitation':1,'sail':1,'birds':2,'pressures':1,'various':1,'conceptual':1,'donate':2,'glasgow':1,'man.':3,'notice':8,'extend':1,'parental':1,'deliver':1,'succeed':1,'wear':2,'travellers':1,'distinguish':2,'come':3,'improve':1,'both':2,'protect':3,'last':3,'many':2,'contract':1,'laplace':1,'plants':1,'admit':2,'cylindrical':2,'lash':1,'swallow':1,'radio-activity':1,'supply':2,'smother':1,'kin-sympathy':1,'subscribe':1,'pole':2,'air-breathing':3,'250':1,'technicalities':1,'speak':5,'decline':1,'raise':2,'deep':1,'teach':1,'create':2,'three':1,'.':2,'whom':1,'much':1,'change':2,'mars':2,'waste':1,'500':1,'life':2,'describe':3,'flight':1,'amphibians':1,'assert':1,'observe':2,'understand':9,'reason.':1,'an':14,'diffuse':1,'those':6,'sound':1,'adaptations':1,'these':2,'leave':4,'twigs':1,'britain':1,'near':1,'suppose':9,'guide':2,'spawn':4,'apprehend':1,'lapland':1,'it':7,'sting':1,'itself':2,'blame.':1,'everyday':1,'capture':4,'different':1,'develop':1,'perform':1,'suggest':3,'make':23,'cross':1,'unite':1,'check':1,'them--as':1,'split':1,'copying':1,'crustaceans':1,'several':1,'dusk':1,'kelvin':1,'nest':1,'drink':1,'hang':1,'effect':1,'viewing':1,'moving':1,'experiment.':1,'patagonia':1,'expend':1,'in':1,'miss':1,'mother':1,'very':2,'the':388,'left':1,'mingle':1,'being':1,'uranium':1,'accurate':1,'obtain':1,'rest':1,'electrification':1,'select':1,'harmonise':1,'identify':1,'human':2,'colonise':2,'fearful':1,'readers':2,'conclude':1,'deposits':1,'board':1,'snap':1,'save':2,'humanity':1,'scientific':1,'take':11,'swim':1,'read':4,'big':2,'possible':1,'dart':1,'five':1,'know':8,'decipher.':1,'press':1,'immediately':1,'tick':2,'insert':1,'rotate':6,'backboned':1,'electronic':1,'hunt':1,'tons':1,'roll':1,'collect':2,'continue':2,'seashore':1,'soft':1,'herons':1,'side--a':1,'shed':1,'right':1,'deal':8,'titan':1,'some':21,'play':2,'certain':1,'deduce':1,'convey':1,'escape':1,'star':1,'scale':2,'avoid':2,'separate':1,'ether':1,'leap':1,'behave':1,'cloud':1,'quote':1,'prof':1,'warranties':1,'trout':1,'illustrate':2,'be':180,'incandescence':1,'obey':2,'reaching':1,'rock':1,'breed.':1,'utter':1,'become':7,'instinct':3,'littoral':1,'five.':1,'throw':4,'shine':1,'stone':1,'age.':1,'conceal':1,'practical':1,'her':2,'act':2,'or':3,'imitation':1,'within':1,'guard':1,'promise':1,'sow':1,'excrementitious':1,'propel':1,'acquiesce':1,'support':2,'transform':1,'sunlight':2,'start':2,'suit':1,'enregister':3,'attach':1,'manufacture':1,'north':2,'complete':2,'form':13,'educate':1,'ascend':1,'believe':6,'regard':1,'heat':2,'hear':1,'another.':2,'heap':1,'atom':4,'promote':1,'considerable':2,'donate.':1,'count':3,'folk-ways':1,'us':24,'record':1,'convince':1,'grasp':2,'demonstrate':1,'stages':2,'similar':2,'agree':1,'150':3,'cover':3,'year':1,'rubble':1,'muscular':1,'disease':1,'as':1,'exist':4,'paraguay':1,'domesticated':1,'trip':1,'fill':2,'discriminate':5,'inborn':1,'compel':1,'other':8,'5':1,'branch':2,'test':1,'you':5,'shrink':2,'picture':1,'repeat':1,'indemnify':1,'mankind':1,'living':1,'walk.':1,'drift':1,'terra':3,'overtax':1,'recognise':6,'scores':1,'astronomy':1,'land':3,'sail.':1,'cling':2,'assume':1,'age':2,'lift':2,'time':1},'tail':{'and':2,'often':1,'is':1,'it':1,'as':1,'are':1,'in':1,'if':1,'from':1,'seems':1,'two':1,'.':5,'rivals':1,'which':2,';':1,'by':1,'projects':1,'a':1,'always':1,'coiled':1,'of':2,'served':1},'postglacial':{'times.':1},'th':{'.':1},'lankester':{'to':1,'has':1,'says:':1,'between':1},'animals--birds':{'and':1},'degeneration':{'may':1},'case':{'we':2,'better.':1,'although':1,'no':1,'these':1,'of':38,'is':2,'there':1,'it':3,'.':3,'leads':1,'to':1,'that':1,'however':2,'they':1,'in':2,'known':1,'probably':1,'the':2,'with':2,'than':1},'cause.':{'section':1},'cloud-belts':{'and':1},'puzzled':{'over':1,'when':1},'discrepant':{'.':1},'floated':{'on':1},'square-jawed':{'short-limbed':1},'trillions':{'of':9},'c-f.':{'the':1},'interpreting':{'the':1,'in':1},'instinct.':{'the':1},'m.d':{'.':2},'condition':{'of':2,'the':1,'had':1,';':1,'.':1},'s.f.':{'3':1},'accompanying':{'diagram':1},'marvellous':{'still':1,'atom':1},'ageing':{'.':1},'laying':{'down':2,'aside':1},'joined':{'to':1,'them--a':1},'large':{'and':3,'telescope':1,'insects':1,'fish':2,'in':1,'colony':2,'number':6,'bath':1,'brain':1,'as':3,'planets':1,'mirror':2,'skulls':1,'size':2,'rhinoceros':1,'scale':3,'heads':1,'lungs':1,'ventral':1,'masses':1,'proportion':1,'.':2,'terminal':1,'internal':1,'red':2,'we':1,'testes':1,'degree':1,'that':1,'quantities':1,'eggs':1,'ovaries':1,'however':1,'haunt':1,'lens':4,'meteorites':1,'coil':1,'marine':2,'telescopes':1,'areas':1,'a':1,'animals':1,'eye-sockets':1,'gape':2,'ones.':1,'magnet':1,'gibbon':1,'amount':1,'amphibian':1,'of':1,'excesses':1,'ready-made':1,'section':1,'anthropoid':1},'dinosaur':{'about':1,'reptiles.':1,'stock':1},'sand':{'and':3,'of':1,'over':1,'so':1,'.':2},'swirling':{'seething':1},'three-millionth':{'of':2,'part':1},'harry':{'johnston':1},'small':{'and':2,'shark':1,'family':2,'insects':1,'ears':1,'spider':2,'one':1,'bright':1,'spiders':1,'such':1,'globes':1,'intestine':1,'patch':1,'frog-hoppers':1,'creatures':1,'web':1,'compared':1,'group':1,'pin':2,'organisms':1,'water-animals':1,'gossamer':1,'organism':1,'per':1,'.':3,'particles':3,'to':3,'individuals':1,'vocabulary--he':1,'fraction':3,'units':1,'figures':1,';':1,'molecules':1,'coal-field':1,'tortoise-shell':1,'polyps':1,'fry.':1,'ripples':1,'multiple':1,'minority':1,'degree':1,'that':2,'may':1,'mammals':3,'tides':2,'whirling':1,'but':2,'it':1,'lens':1,'moths':1,'scale':2,'fishes':2,'number':1,'importance':1,'quantity':2,'volume':1,'about':1,'animals':4,'pests':1,'bullet':1,'items':1,'batteries':1,'corona':1,'bee':1,'staff.':1,'part':2,'donations':1,'anthropoid':1,'shore-animals':2,'arboreal':1,'sea-anemone-like':2,'marble--there':1,'crab':3,'are':1},'mammal':{'and':1,'essentially':1,'sucks':1,'is':1,'when':1,'mind':1,'s':1,'as':1,'mind.':1,'in':1,'the':1,'stocks':1,'with':1},'autotomy.':{'in':1},'abbreviated':{'recapitulation':1},'quicker':{'than':1},'methodical':{'habits':1},'proof--embryological':{'proof--man':1},'197':{'diagram':1,'000':1},'196':{'the':1},'191':{'hornbill':1,'life-history':1,'avocet':1,'spoonbill':1,'puffin':1,'falcon':1},'hour.':{'these':1,'the':1},'193':{'early':1},'192':{'hind-leg':1,'photo':1},'past':{'and':5,'a':1,'all':1,'generation.':1,'in':1,'century.':1,'ages--for':1,'generation':1,'there':1,'upon':1,'it':1,'amphibians':1,'one':1,'.':3,'at':1,'which':1,'time':1,'the':1,'still':1,';':1,'persisting':1},'displays':{'its':1,'.':1},'pass':{'on':2,'gradually':1,'from':3,'vertically':1,'suddenly':1,'over':1,'amongst':1,'by':1,'to':4,'behind':1,'through':11,'between':1,'along':2,'straight':1,'before':1},'situated':{'near':1,'at':1},'17.--a':{'map':1},'richard':{'owen':1},'clock':{'we':1,'would':1,'.':1,'struck':1,'beating':1,';':1},'section':{'of':2,'later':1,'1':1,'3':2,'2':1,'through':3,'4':2,'5':1},'reproduction':{'a':1,'both':1,'from':1,'for':1,'may':1,'is':2,'.':5,'which':1},'scientists':{'confront':1},'method':{'and':1,'used':1,'that':1,'simple':1,'of':6,'is':2,'exactly':1,'.':1,'namely':1,'much':1,'are':1,'which':1,'you':1,'was':2,'by':2,'if':1},'contrast':{'this':1,'to':3,'with':1,'between':2},'revealing':{'an':2},'full':{'and':1,'on':1,'terms':2,'license':1,'inheritance':1,'of':5,'stop':1,'stop.':1,'project':7,'flood':1,'daylight':1,'individual':1,'fathoms':1,'extent':1,'refund':2,'dawn':1,'resources':1},'escaping':{'pursuit':1},'installations':{'.':1},'argonaut':{'in':1},'leaping':{'a':1,'at':2},'7.--the':{'visible':1},'hours':{'on':1,'we':1,'from':1,'afterwards':1,'immediately':1,'of':1,'after':1,'days':1,'forty':1,'early':1,'to':1,'old':1,'in':1,'it':1,'i.e':1,';':1,'.':4,'until':1,'before':2},'concluding':{'this':1},'november':{'19':2,'6':1},'transformation':{'of':5,'comes':1,'such':1},'refractors':{'and':1,'are':1},'riviera':{';':1},'introductory':{'note':1,'the':1},'compliance':{'with':2,'requirements':1,'for':1,'.':1},'247':{'photo':2},'experience':{'and':2,'or':1,'for':1,'though':1,'of':1,'no':1,'it':1,'but':1,'.':1,'to':1,'nothing':1,'which':2,'in':2,'not':1,'known':1,'with':1,'by':1},'anthropologists':{'and':1},'bulges':{';':1},'periodic':{'shrinkages':1,'the':1,'variations':1,'tax':1},'social':{'group':1,'intercourse':2,'becoming':1,'person.':1,'face':1,'environment':1,'life--of':1,'systems':1,'heritage':2,'institutions--all':1},'action':{'and':2,'on':1,'like':2,'facility':1,'not':1,'of':4,'is':1,'it':1,'.':4,'how':1,'in':1,'following':1,';':1,'by':1},'matter--but':{'no':1},'slope':{'to':1,'from':2,'of':1},'struggle':{'all':1,'through':1,'for':21,'against':2,'out':1},'followed':{'on':1,'rapidly':1,'that':1,'with':1,'in':1,'some':1,'up':1,'without':1,'year':1,'from':1,'the':2,'was':1,'by':2,'roentgen':1},'moorland':{'.':1},'vii':{'the':1,'.':2},'aeschylus':{'gave':1},'hard-and-fast':{'boundary':1,'lines':1},'beheld':{'in':1},'pulls':{'the':2,'every':1},'substance.':{'it':1},'coercion':{'and':1},'nerve-centres':{'keep':1},'eddington':{'even':1,'of':1,'professor':1,'tells':1},'granular':{'appearance':1},'attendance':{'on':1,'fertilises':1},'magnitude--and':{'these':1},'educability.':{'young':1},'petroleum':{'ten':1},'6':{'1914.':1,'and':1,'great':1,'inches':1,'then':1,'.':5,'1919':1,'tadpole':1,'other':1,'the':2},'evolve.':{'viii':1},'more':{'limited':1,'developed':1,'accurate':2,'dynamic':1,'purely':1,'distant':1,'abundant':1,'rapid':4,'rapidly':2,'knowledge':1,'fit':2,'interesting':3,'complex':4,'passive':1,'to':3,'willing':1,'convoluted':1,'portentous':1,'inconspicuous':1,'familiar':1,'courage':1,'nearly':1,'trouble':1,'advanced':1,'debatable':1,'generalised':1,'masters':1,'like':3,'oxygen':1,'marvellous':1,'fully':1,'radiant':1,'loosely':1,'prolonged':1,'possibilities':1,'economically':1,'intelligence':2,'energy':1,'direct':2,'likely':2,'intelligible.':1,'besides.':1,'advantageous':1,'sail':1,'uniform':1,';':2,'numerous':3,'advantageously':1,'we':1,'explosive':1,'intimate':1,'importance':1,'masterful':1,'free':3,'atoms':2,'curved':1,'complicated':5,'besides':4,'flowering':1,'intelligent':1,'intense':1,'promiseful':1,'chapter':1,'about':3,'of':5,'thickly':1,'sensitive':3,'smoke':1,'adapted':1,'or':14,'frequent':1,'and':10,'primitive':2,'powerful':2,'marked':1,'highly':2,'quickly':2,'readily':3,'startling':1,'ancient':1,'illumined':1,'erect':1,'.':4,'wonderful':2,'resolute':1,'dome-like':1,'vigorous':1,'complete':2,'successful':1,'continuous':1,'mentality':1,'conspicuously':1,'but':1,'strenuous':4,'upright':1,'natural':1,'general':1,'than':64,'must':1,'parts':1,'romantic':1,'instructive':1,'grey':1,'discriminating':1,'matter':1,'actively':1,'promising':2,'drops':1,'ascetic':1,'varied.':1,'conjectural':1,'certain':1,'it':1,'comfortable':1,'in':1,'controlled':4,'convenient':1,'emancipated':1,'eloquent':2,'till':1,'vital':2,'gateways':1,'which':1,'so':1,'smell':1,'difficult':3,'clear-cut':1,'felt':1,'convincing':1,'alert':1,'important':3,'blood':1,'nutritive':1,'freely':1,'remote':1,'for':1,'effective':1,'mobile':1,'light':1,'definitely':1,'electrons':3,'wide-awake':1,'the':2,'marsupials':1},'door':{'and':1,'is':1,'two':1,'.':1},'testes':{'.':1},'substances':{'such':1,'or':1,'like':1,'give':1,'this':1,'disintegrate':1,'near':1,'but':1,'coloured':1,'as':1,'therefore':1,'permeating':1,'which':2,'in':1,'become':1,'the':1,'has':1,';':2,'are':5},'inquisitiveness':{'a':1,'and':1},'company':{'as':1,'with':1},'berridge.':{'shoebill':1,'woolly':1,'young':1,'surinam':1,'an':1,'common':1,'harpy-eagle':1,'the':3},'one-sided':{'as':1},'tested':{'for':1,'.':1},'foundations':{'of':4},'stampings':{'.':1},'keeping':{'this':1,'the':3,'his':1},'fatal':{'as':1,'.':1},'science':{'and':1,'lenard':1,'liquefies':1,'vol':3,'is':8,'it':1,'an':1,'produced':1,'as':1,'in':1,'should':1,'for':1,'introduction':1,'.':4,'to':1,'which':1,'surpasses':1,'has':3,'was':1,'naturally':1,'we':1,'after':1,'that':1,'who':1,'but':1,'tries':1,'were':1,'arrived':1,'encourages':1,'must':1,'a':1,'on':1,'this':1,'ever':2,'reads':1,'so':1,'of':5,'the':2,'makes':1},'centrifugal':{'force':1},'agoing.':{'illustration':2},'indicating':{'the':1,'that':1},'evolved':{'a':1,'and':2,'we':1,'from':5,'all':1,'but':1,'one':1,'reptiles':1,'amphibians':1,'hand':1,'in':2,'.':2,'or':1},'learn':{'and':2,'all':1,'more':2,'that':4,'.':1,'to':7,'its':2,'how':3,'the':2,'an':1,'with':1,'by':2,'quite':1,'if':1},'knocked':{'it':1},'lamp-shell':{'lingulella':1,'ligula':1},'male':{'and':2,'parent':1,'with':1,'of':3,'fish':2,'who':2,'or':1,'sea-horse':1,'mounts':1,'s':2,'helps':1,'kurtus':1,';':1,'has':3,'makes':1,'side':1},'plants--romance':{'of':1},'beautiful':{'and':2,'stone':1,'spectacles':1,'zoological':1,'is':2,'object':1,'one':1,'flint-shelled':1,'experiments':4,'green':1,'are':1,'sight':1,'pink-flush':1,'cradle':1,'brine-shrimp':1,'robe':1,'red':1,'opalina':1},'stated':{'that':1},'cosmic':{'dust':2,'rubbish':1},'wave.':{'illustration':1},'brain-mind':{'we':1},'suggestions':{'may':1,'of':2,'have':1},'accept':{'a':1,'the':1,'all':1},'states':{'and':2,'do':1,'we':1,'copyright':1,'of':2,'who':1,'.':3,'to':1,'without':2,'swims':1,'the':1,'where':1,'check':1},'obliquely':{'on':1},'sense':{'separated':1,'a':1,'and':2,'still':1,'of':19,'except':1,'but':1,'one':1,'born':1,'which':1,'in':1,'it':2,'such':1,'the':1,'.':2},'plan.':{'in':1},'dress':{'is':3,'it':1,'that':1},'struck.':{'there':1},'salts':{'of':3,'but':2,'.':2,'to':1,'as':1,'using':1},'axis':{'cylinder':1,'that':1,'of':3,'is':1,'but':1,'.':2,'to':1,'as':1,'at':1,'in':4,'once':3},'huge':{'electric':4,'paw':1,'family.':1,'agglomerations':1,'increase':1,'carcase':1,'crocodilian':1,'cavern':1,'three-horned':1,'extinct':2,'sieve':1,'electronic':1,'infantile':1},'respective':{'bodies':1},'instruments.':{'ii':1,'the':1},'imminent':{'destruction':1},'emancipated':{'more':1,'from':1,'.':1},'fruition':{'of':1},'gannets':{'and':1},'oligocene':{'the':1,'times':1,'period':1,'n':1},'glowing':{'metal':1,'into':1,'gas':1,'gases':4,'coal':1,'mass':2,'in':1,'hydrogen':4,'with':1},'cling':{'to':1,'on':1,'together':3,'firmly':1},'relinquished':{'the':1},'creature':{'and':2,'being':1,'is':3,'fond':1,'as':2,'standing':1,'from':1,'.':4,'to':2,'too':1,'expresses':1,'save':1,'reproduced':1,'eminently':1,'that':2,'with':3,'has':2,'like':1,'retreated':1,'whether':1,'of':2,'sometimes':1,'s':2,'the':1,'profits':1},'rungs':{'of':2},'plant':{'and':2,'we':1,'would':1,'may':1,'of':1,'about':1,'called':2,'as':1,'preparing':1,'or':1},'salt.':{'this':1},'lanky':{'legs':1},'intended':{'to':2},'thickened':{'skin':1},'perrin':{'the':1,'jean':1},'plane':{'of':6,'is':1,'namely':1,'.':1,'near':1,'in':1,'the':1},'waves':{'and':4,'longer':1,'give':1,'is':1,'whatever':1,'see':1,'are':5,'in':4,'279':1,'still':1,'ether':1,'from':1,'breaking':1,'.':9,'1':1,'sparkle':1,'only':1,'too':1,'which':5,';':1,'cause':1,'sent':1,'we':1,'used':1,'that':1,'our':1,'enter':1,'like':1,'five':1,'they':3,'must':1,'carried':1,'are--measuring':1,'light':1,'culminating':1,'transmitted':2,'can':1,'of':11,'the':4,'its':1,'or':1},'mendel':{'.':1},'acquisitions':{'gradually':1,'that':1,'of':3,'as':1,'in':1,'the':2},'resemble':{'a':2,'the':1},'boarders':{'those':1},'register':{'themselves':1,'the':2},'tentacles':{'and':1,'around':1,'some':1,'it':1,'can':1,'radiate':1,'round':1,'minute':1,'are':1},'cases.':{'using':1,'the':1},'fundamental':{'substance':1,'to':1,'nature':1,'importance':1,'instruments':1,'food-supply':1,'bodily':1,'entities--matter':1,'entities':2,'unity':1,'way':2,'existences':2,'facts':1,'impressions':1,'realities':1,'matter':1},'triassic.':{'comparatively':1},'grasshoppers':{'orthoptera':1},'replied':{'is':1},'passages':{'and':1},'barnard':{'yerkes':2},'self-destructively':{'would':1},'incessantly':{'bombarded':1},'reminded':{'that':1,'in':1},'trade':{'from':1},'attitude':{'and':1,'of':1,'as':2,'there':1},'paper':{'on':1,'nautilus':3,'bait':1,'exactly':1,'packet':1,'.':1,'were':1,'in':1,'edition.':1,'lying':1},'signs':{'and':1,'of':1,'printed':1},'looks.':{'illustration':1},'its':{'precise':1,'summer':1,'walking':1,'remarkable':1,'disturbances':1,'constituents':1,'beak':1,'mission':1,'years':1,'four':1,'brain':1,'shape':1,'disc':1,'existence.':1,'victim':2,'skin':2,'existence':1,'partisans':1,'previous':1,'completion':1,'particles':2,'limbs':2,'different-lengthed':1,'outer':1,'thumb':1,'anvil':2,'striking':1,'possessors':1,'young':3,'environment':4,'surroundings':2,'tail':2,'concavity':1,'microscopic':1,'molecules':1,'tail.':1,'gyges':1,'gills':2,'main':1,'position--it':1,'first':1,'giants':1,'breathing':1,'victims':2,'cloud-belts':1,'reptilian':1,'means':1,'far':1,'big':2,'oceans':1,'mouth':2,'young.':1,'germ-cells':1,'encircling':1,'emerald':1,'rotation':1,'far-reaching':1,'wings':4,'retreat':1,'lineage':1,'evolution':1,'name':1,'course':2,'bearings':1,'solution':1,'possibilities':1,'race':2,'activity':1,'soft':1,'lesson.':1,'exquisite':1,'ears':1,'upper':2,'habitat':1,'appearance':1,'energy':3,'fully-formed':1,'back':1,'collaterals':1,'prolonged':1,'opposite':1,'legacy':1,'bare':1,'measurement':1,'home':1,'functioning':1,'mother':3,'best':3,'mottled':1,'cilia':1,'leaf':1,'probable':1,'borrowed':1,'endowment':1,'self-effacement':1,'intimate':1,'definite':2,'frond-like':1,'dormitory':1,'venom':1,'new':1,'peg':1,'hind-legs':2,'speed':1,'body':7,'core':1,'toes':1,'business':1,'leg':1,'strata':1,'atoms':3,'extraordinary':2,'magnetism':1,'salient':1,'formation':1,'egg-cocoons':1,'trunk':1,'early':1,'path':2,'canals':1,'whiteness':1,'evolution.':1,'colours':1,'enormous':1,'shaggy':1,'brilliant':1,'many':2,'leaves':1,'parts':4,'greater':1,'counterpart':1,'wave-length':1,'pattern':1,'nucleus':1,'tongue':2,'whole':2,'relatives.':1,'origin':1,'diameter':1,'primitive':1,'own':18,'heart':1,'marginal':1,'coming':1,'habitual':1,'primary':3,'race.':1,'height':1,'utilisation':1,'date':1,'eggs':2,'brain.':1,'formidable':1,'owner':2,'table':1,'mere':1,'size':3,'wings.':1,'strong':2,'eye':1,'temperature':2,'width':1,'tremendous':1,'own.':1,'two':1,'spiral':1,'long':2,'plains':1,'secret':1,'wonderful':1,'prey':1,'pool':1,'way':5,'typical':1,'diving-bell':1,'legs':1,'voracity':1,'501':1,'interests':1,'mountains':1,'head':1,'stomach':1,'fiery':1,'high-pitched':1,'wits':1,'successful':1,'feathers':1,'great':1,'validity':1,'climax.':1,'neighbour':2,'heat':3,'cranial':1,'tentative':1,'constituent':1,'hole':1,'highest':1,'effort':1,'present':3,'kind':1,'lifetime':1,'skull':2,'characteristic':1,'straight':1,'bill':1,'attached':1,'gravitational':2,'father':1,'nine':1,'vitality.':1,'growing':1,'distribution':2,'millennia':1,'history':1,'predecessor':1,'climax':4,'influence':1,'faintness':1,'surface':7,'general':1,'return':1,'partner':1,'comparative':1,'sharp':1,'mouth.':1,'dress':1,'own--a':1,'swim-bladder':2,'huge':1,'ancestors':1,'stolidity':1,'winter':2,'paw':2,'flight':2,'air-dome':1,'centre.':1,'bell-like':1,'shoulders':1,'forests':1,'reality':1,'arboreal':1,'relatives':1,'strange':1,'sentiments':1,'special':1,'influences':1,'talons':1,'estuaries':1,'mammoth':1,'ordinary':1,'axis':13,'composition':2,'development':1,'immediate':1,'electric':1,'beginnings':1,'centre':4,'neck.':1,'nest':2,'teeth':1,'reach':1,'surface--before':1,'substitute':1,'companion':1,'gill-cavity':1,'dimensions':1,'journey':3,'moving':1,'colouring':1,'saucer-shaped':1,'share':1,'movements':2,'capacity':1,'burrow':2,'structure':1,'eyes':1,'so-called':1,'short':1,'branches':2,'gullet':1,'surprising':1,'revelations':1,'light':3,'colour':5,'starting-point':1,'life':2,'persistent':1,'benefactress':1,'tale':1,'inhabitants':1,'edge':1,'mass':2,'greatest':1,'broad':1,'volunteers':1,'path.':1,'original':3,'immensity':1,'function.':1},'roots':{'and':1,'to':2,'of':2},'imaginings':{'of':1},'rapidly':{'and':4,'on':2,'we':1,'towards':1,'altering':1,'revolving':1,'between':1,'round':1,'to':1,'in':1,'changing':1,'revolved':1,'alter':1},'shifts':{'the':1,'for':4},'man-ape':{'and':1,'to':1},'coarser':{'vibrations':1},'conjugation':{'of':1},'bell-animalcules':{'a':1},'adepts':{'at':1,'in':1},'isaac':{'newton':5},'travelling':{'and':2,'rapidly':1,'faster':1,'at':5,'the':1,'with':1,'round':2},'pinions':{'.':1},'atom--that':{'what':1},'formosa':{'those':1},'tentatively':{'just':1,'sets':1},'lowell':{'evolution':1,'made':2,'who':1,'to':1,'mars':1,'observatory.':1},'entire':{'shell':2,'uselessness':1,'system':1,'absence':1,'cessation':1,'belt':1},'secondarily':{'wingless.':1},'agitated':{'and':2,'communicate':1,';':1,'electrons':1},'saltatory':{'display':1},'iridescent':{'colours':1},'weeds':{'in':1},'speculate':{'where':1,'that':1},'laboratory.':{'a':1,'an':1},'sea-urchins':{'sea-lilies':1,'and':1,'we':1},'cambrian':{'and':1,'period':5,'correspond':1,'to':1,'reached':1,'the':1},'likeness':{'to':2},'fowlers':{'and':1},'all.':{'sec':1},'loosely':{'connected':1,'.':1},'20417.txt':{'or':1},'piping':{'cry':1},'nautiloids':{'and':1,'to':1,'began':1},'found':{'the':2,'is':1,'it':1,'an':1,'at':2,'in':22,'close':1,'next':1,'its':1,'elsewhere':1,'for':1,'their':1,'there':1,'long':1,'well-formed':1,'to':4,'out':1,'vigorous':1,'around':1,'in:':1,'that':11,'far':1,'gliding':1,'however':1,'but':1,'hundreds':1,'most':1,'everywhere':1,'not':1,'along':1,'quite':1,'by':2,'he':1,'a':5,'on':3,'practically':1,'no':1,'up':1,'.':2,'eighty-seven--and':1,'e.g':1},'energetically':{'rub':1,'through':1},'physiologically':{'expensive':1,'best':2,'.':1},'reactions':{'and':2,'to':1,'.':2,'which':1,'between':2},'england':{'and':1,'.':1},'oyster-catcher':{'and':1},'resolute':{'.':1},'fewer':{'and':1,'mistakes':1},'measurement':{'.':1},'blues':{'and':1,'are':1},'niger':{'120':1,'is':1},'really':{'a':1,'radiating':1,'taking':1,'move':1,'had':1,'occurred':1,'two':1,'excessively':1,'tell':1,'are':2,'travelling':1,'gigantic':1,'important':1},'try':{'to':4,'walking':1},'neanderthal':{'and':2,'men':4,'race':2,'ravine':1,'species':2,'man':10},'psychology':{'and':1,'that':1},'sea-meadows':{'and':1,'of':1,'as':1,'to':1},'boxed-in':{'energy':1},'research':{'on':1,'.':2,'as':1,'justified':1,'has':1,'shows':1,'must':1},'misses':{'the':1},'reward.':{'the':1},'kelvin':{'and':2,'who':1,'56':1,'one':1,'s':1,'lord':1},'denoted':{'by':1},'climatic':{'conditions':2},'occurs':{'even':1,'on':2,'about':2,'from':1,'is':1,'in':1,'with':1},'chapelle-aux-saints':{'175':1,'the':1},'belief':{'is':1,'that':2,'in':2},'risen':{'three':1},'drifting':{'past':1,'life':2},'porcelain':{'are':1},'qualify':{'the':1},'gravelly':{'bed':1},'imagine':{'them':1,'that':2,'could':1,'some':1,'how':2,'the':1},'stomach':{'and':1,'to':1},'rises':{'a':1,'to':5,'and':2,'why':1,'.':2},'occur.':{'illustration':1},'producers':{'using':1,'or':1},'albatross':{'and':1,':':2},'reared':{'themselves':1},'retained':{'in':1},'english':{'serial':1,'character':1,'disciples':1},'w':{'.':30},'expedient':{'by':1,'.':1},'mangrove-trees':{'or':1,'.':1},'exhibited':{'by':1,'in':1},'delicate':{'embryo':1,'body':1,'shell':2,'larva':1,'ctenophores':1,'experiment':1,'build':1,'films':1},'impart':{'violent':1},'reversing':{'layer':2},'slipped':{'on':1,'over':1,'from':1},'thereafter':{'perhaps':1},'mimetic':{'resemblance':1},'number':{'and':2,'on':1,'develop':1,'being':1,'of':42,'is':3,'one':1,'she':1,'which':1,'mr':1,'not':1,'.':2},'slipper':{'animalcule':3},'animals--beginnings':{'of':2},'annelids':{'related':1},'star-clouds':{'will':1},'differ':{'considerably':1,'from':1,'chiefly':1,'rather':1,'as':1,'very':1,'only':1,'greatly':1,'in':3},'heads':{'and':1,'the':1,'selected':1,'breaking':1,'it':1},'world...':{'.':1},'introduction':{'of':2,'3':1,'there':1,'every':1},'cradles':{'for':1},'calculations':{'based':1,'show':1},'essays':{'on':1},'molecular':{'motion.':1,'reality':1,'motion':1,'motions.':1,'motions':2,'disintegration':1,'movement':1},'elaboration':{'known':1},'relationship':{'and':1,'with':6,'between':1},'immediate':{'access':2,'surroundings':1,'precursors':2,'cradle':1,'circle':1},'appreciation':{'of':5},'self-mutilation':{'or':1},'zeppelin':{'or':1},'licensed':{'works':1},'calendar-keeping':{'and':1},'modes':{'of':6},'diffusion':{'or':1},'ungrateful':{'to':1},'observatory':{'greenwich.':6,'of':2,'victoria':2,'near':1,'fig':1,'such':1,'the':1,'or':1,'at':1},'vocal':{'and':1,'organs':2,'cords':2,'powers':1},'determined':{'beyond':1,'by':1},'fishermen':{'whom':1},'hot.':{'crossing':1},'algol':{'is':2,'has':1},'remembers':{'that':1},'streamed':{'night':1},'possibilities.':{'illustration':1},'well-developed':{'forehead':1,'head':1,'luminous':1,'form':1},'colour-resemblance':{'was':1},'vitally':{'interlinked':1,'important':1},'germ-cells--the':{'ovum':1},'reorganisation':{'which':1},'cleverness':{'.':1,'it':1,'in':1},'odd':{'cells':1,'which':1},'fashion.':{'finally':1},'internat':{'.':1},'commotion':{'is':1},'silvery':{'jacket':1,'air-bubble--air':1,'smolts':1,'halo':1},'also':{'among':1,'rang':1,'because':1,'followed':1,'unpalatable':1,'land-snails':1,'contribute.':1,'in':5,'it':1,'marked':1,'one':1,'mild':1,'are':1,'pass':1,'seen':1,'visible.':1,'handicapped':1,'opened':1,'for':3,'belong':1,'able':1,'due':1,'anatomical':1,'to':3,'implied':1,'aerates':1,'burrow.':1,'caused':2,'has':1,'more':1,'breathe':1,'be':6,'noteworthy.':1,'towards':1,'that':1,'very':3,'offered':1,'formed':1,'serve':1,'cheaper':1,'react':1,'produce':1,'rudimentary':1,'govern':1,'known':1,'necessary':1,'the':8,'proceed':1,'a':3,'on':1,'arranged':1,'driving':1,'showed':1,'receive':1,'of':3,'drop':1,'will':1,'defective':1,'became':1,'involved':1,'found':1,'enacted':1,'changes':1,'experimental':1,'something':1},'internal':{'surfaces':4,'partnership':1,'furnishings':1,'revenue':1,'tides':1,'adjustments':1,'as':1,'surface':1,'parasites':1,'source':1,'heat':3,'secretions':1,'game':2,'atomic':1,'secretion':1,'experimenting':1,'gills':1,'structure':2,'unpaying':1},'centrosomes':{'one':1},'seized':{'the':1,'by':2},'play':{'a':2,'among':1,'we':1,'for':1,'of':3,'is':2,'an':2},'index':{'of':1},'swiftly':{'gliding':1,'electrons':1},'nasal':{'bones':1},'complexity.':{'corpuscles':1},'virus':{'or':1},'plan':{'.':1},'accepting':{'unsolicited':1,'it':1},'colliding':{'and':1,'of':1},'head-end':{'remains':1},'demand':{'a':2,'which':1},'galway':{'that':1},'whalebone':{'whales':2,'plates':2},'lessons':{'both':1,'for':1,'of':1,'began':1,'had':1,'learned':1},'long-headed':{'square-jawed':1},'sometimes':{'work':1,'almost':1,'hard':1,'marked':1,'one':1,'niggardly':1,'as':1,'manages':1,'at':1,'have':1,'seen':1,'sought':1,'slumped':1,'happens':2,'to':4,'leading':1,'make':1,'there':1,'justifies':1,'few':1,'only':1,'much':1,'helps':1,'replaced':1,'several':1,'thousands':1,'difficult':1,'swim':1,'alongside':1,'far':1,'however':1,'but':1,'sooner':1,'they':1,'competitive':1,'an':1,'a':2,'many':1,'no':1,'constitutional':1,'used':2,'deposit':1,'found':1,'the':4},'cover':{'the':2,'itself':1,'in':1,'an':1},'firma':{'and':2,'also':1},'artistic':{'race':2,'drawings':1,'sense':1},'donkeys':{'.':1},'attacking':{'a':2},'hydatina--has':{'nine':1},'far-flung':{'fire-mists':1},'golf':{'ball':2},'hoar-frost':{'or':1},'gold':{'constituted':1,'leaf':2,'is':2,'.':1,'will':1,'to':1,'in':1,'has':1,'into':1},'evaporation':{'and':1},'agassiz':{'once':1},'fatal.':{'it':1},'pill-like':{'ball':1},'hinkins':{'son.':2},'impact':{'of':2},'ape-man':{'reconstructed':1,'to':1,'as':2,'and':1},'food-signal':{'.':1},'spineless':{'cactus':1},'writes':{':':1,'so':1},'fauna--the':{'two':1},'failed':{'.':1},'life--of':{'which':1},'factor':{'which':1,'that':1},'indifference':{'to':1,'that':1},'armour':{'of':1,'or':1},'giants':{'and':2,'over':1},'noctiluca':{'whose':1,'which':1},'sand-pit':{'at':2,'must':1},'dependent':{'on':6},'liquid':{'and':1,'we':1,'when':1,'air':3,'can':1,'cling':1,';':1,'the':1,'.':3,'or':2},'adventurers':{'all':1},'flowing':{'of':1,'through':1,'out':2},'sunny':{'side':1,'bank':1},'clavius':{'the':1},'oceans.':{'they':1},'closely':{'comparable':2,'investigated':1,'corresponding':1,'resemble':1,'interwoven':1,'wrapped':2,'to':2,'resembling':1,'similar':2},'compass':{'and':1,'there':1,'possible':1},'man-of-war':{'there':1,'119':1},'4230':{'2':1},'enemy':{'home.':1},'devoured':{'by':1,'.':1},'avocet':{'s':2},'progressive':{'evolution':1,'mammals':1,'conquest':2,'mammals.':1,'.':1,'simian':1},'paddling':{'with':1,'in':1},'body.':{'this':1,'what':2,'illustration':1,'if':1},'sojourn':{'.':1},'surrendering':{'the':1},'croatia':{'and':1},'liver-fluke':{'of':1},'obscure':{'the':1,'but':2},'river':{'and':2,'heads':1,'.':3,'in':1,'the':1,'or':2},'approaching':{'the':1},'bulky':{'fuel':1},'body':{'and':14,'equally':1,'up':1,'acquired':1,'is':14,'thus':1,'one':1,'as':3,'at':1,'during':2,'in':1,'into':1,'if':1,'again':1,'containing':1,'or':2,'from':2,'possible.':1,'that':2,'decreases':1,'.':15,'to':6,'which':3,'engulfing':1,'before':1,'was':1,'until':1,'shows':1,'locate':1,'do':1,'though':1,'may':2,'becomes':1,'breaks':1,'of':11,'but':4,'were':1,'such':1,'with':2,'by':3,'sways':1,'on':1,'has':2,'always':2,'might':2,'could':2,'say':1,'worth':1,'will':1,'so':3,'overcharged':1,'keeps':1,'far':1,'the':1,'clearness':1,'called':1,'elongated':1,'are':2},'delicately':{'and':2,'built':2},'set':{'off':1,'encoding':1,'of':5,'up':4,'free':3,'electrons':1,'in':6,'forth':8,'apart':1},'ferments':{'.':1},'temperatures.':{'but':1},'enabled':{'to':3,'physicists':1,'us':1},'vertebrates':{'are':1,'or':1,'arose':1,'except':1},'sex':{'another':1,'for':1,'often':1},'see':{'among':1,'right':1,'reference':1,'is':1,'in':7,'it':1,'billions':1,'at':2,'signs':1,'our':1,'.':1,'theoretically':1,'if':1,'again':1,'what':5,'for':1,'explain':1,'that':12,'when':1,'next':1,'how':3,'much':1,'fig':1,'evidences':1,'sections':1,'into':1,'life':1,'means':1,'edge-on':1,'photograph':1,'diagram':1,'them':1,'violet.':1,'now':1,'a':8,'on':2,'evolution':1,'this':2,'later':1,'us':1,'whether':1,'paragraph':2,'so':1,'these':1,'the':7},'sec':{'.':77},'migration':{'and':1,';':1,'or':1,'up':1,'in':2},'sea':{'and':15,'cambridge':1,'salt':1,'is':2,'it':1,'117':1,'including':1,'are':3,'in':3,'.':13,'by':1,'stood':1,'for':2,'pelagic':1,'there':2,'shore':1,'should':1,'to':3,'2':1,'too':1,'has':1,'was':1,'we':1,'that':1,'very':1,'but':2,'others':1,'128':1,'rises':1,'desert':1,'a':2,'especially':1,'of':2,'as':2,'while':1,'gathers':1,'does':1,'usually':1,'the':9,'where':1,'or':2},'aberdeen':{'with':1},'outward':{'behaviour':1,'from':1,'by':1},'shower':{'of':3},'eminently':{'educable.':1,'educable':1},'foraminifer':{'polystomella':2},'taming':{'of':1},'jewels.':{'there':1},'dilutes':{'as':1},'exudation':{'of':1},'endure':{'the':1},'europe':{'a':1,'from':2,'for':1,'.':2,'so':1,'have':1,'were':1,'such':1,'slopes':1,'was':2,'or':1},'jaws.':{'power':1},'eustachian':{'tube':2},'incident':{'is':1},'mingling':{'of':1,'with':1},'things--that':{'fits':1},'energy--may':{'appear':1},'prospects':{'of':1},'lingulella':{'of':1},'improved':{'nervous':1,'habits':1,'by':1},'barely':{'separated':1},'harpy':{'occurs':1},'possible.':{'the':3,'for':1,'illustration':1},'connection':{'with':12,'however':1,'between':2},'amoeba':{'pelomyxa':1,'is':1,'61':1,'greatly':1,'overtakes':1,'pursues':1},'lash':{'large':1,'or':1},'everything.':{'sheer':1},'whole':{'prospect':1,'solar':1,'follows':1,'series':1,'is':1,'creation':1,'it':3,'earth':6,'floating':1,'civilisation':1,'declined':1,'physical':1,'stretch':1,'integrative':1,'to':1,'of':4,'world.':1,'body':1,'we':1,'universe.':1,'originated':1,'sufficient':1,'material':2,'but':1,'grilse':1,'somewhat':1,'world':3,'structure':1,'simpler':1,'a':1,'progressive':1,'bubble':1,'thing':1,'truth':1,'universe':3,'the':1,'extent':1,'or':1,'history':2},'1919':{'to':1,':':1,'.':1,'one':1},'loaf':{'taken':1},'volcanic':{'material':1,'ash':1,'gases':1,'activity':1},'bell':{'be':1,'becomes':1,'is':1,'however':1,'at':1,'which':1,'the':1,'its':1},'etre':{'of':1},'seems':{'a':1,'little':1,'transitional':1,'that':8,'almost':1,'certain':1,'clear':1,'no':2,'possible':1,'an':1,'to':19,'so':1,'at':1,'permissible':1,'of':1,'not':1,'impossible':1,'highly':1,'far':1},'acted':{'on':1},'corresponds':{'to':5,'with':1},'race.':{'the':1},'hollow':{'caves':1,'flattened':1},'unicellular':{'and':1,'protozoa':1,'plants':1,'algae':2},'agents':{'and':1},'adaptation':{'of':2,'to':5,'.':1},'church':{'pictures':1,'is':1,'there':1},'sees':{'and':1},'reflective--which':{'is':1},'belt':{'of':1,'the':1},'moon--the':{'mountains':1,'earth':1},'publishing':{'co':2},'originators':{'of':3},'lizards':{'and':2,'paddling':1,'the':1,'turtles':1},'acceptance':{'.':1},'clay.':{'the':1},'intricacies':{'of':1},'extravagant':{'in':1},'scions':{'of':1},'extreme':{'changes':1,'is':2,'end':1,'cold--an':1,'rarity':1},'firm':{'of':1,'fulcrum':1,'basis':1},'resting':{'on':2,'or':1,'during':1},'pliocene':{'and':1,'that':1,'period':1,'.':1,'as':1,'were':1,'before':1,'n':1,'or':1,'times':1},'squirrel':{'and':2,'making':1,'is':2,'with':1},'high-pitched':{'voice':1},'fire':{'a':1,'on':1,'and':1,'for':2,'is':1,'but':1,'as':1,'which':1,';':2,'until':1},'amphibians':{'and':4,'frogs':1,'some':1,'known':1,'as':1,'before':1,'sprang':2,'fed':1,'from':1,'for':1,'had':1,'.':4,'which':1,'was':1,'we':1,'towards':1,'led':1,'that':1,'burrowing':1,'altogether':1,'fishes':1,'with':3,'by':1,'retained':1,'implied':1,'were':1,'called':1},'fritz':{'mueller':1},'races':{'brethren':1,'and':1,'to-day':1,'of':6,'than':1,'met':1,'as':1,'--which':1,'go':1,'the':1,'or':2,'must':1},'representative':{'and':1,'of':6,'fauna':1,'illustrations':1,'--from':1},'formless':{'gaseous':1},'sixes':{'fives':1},'handling':{'organ':1},'uncertain':{'.':2,'some':1,'but':1,'ground':1},'7700':{'0':1},'reliable':{'a':1,'calculations':1},'admire':{'in':1},'receive':{'specific':1,'a':1,'the':3,'from':1,'them':1},'formats':{'will':1,'readable':1},'amniota':{'in':1},'projecting':{'filaments':1,'upper':1,'wire':1},'robin':{'redbreast':1},'secluded':{'retreat.':1},'pound':{'of':5,'to':1},'jettisons':{'the':1},'agitation':{'of':1},'moth':{'emerges':1,'emerging':1,'e.g':1,'is':1,'should':1,'76':1,'are':1,'the':1,'has':2,'settled':1,'automatically':1},'von':{'indetal':1},'owen':{'said':1},'binding':{'the':1},'level.':{'yet':1},'36':{'seconds':1,'photo':1},'feather-wing':{'a':1},'cerebrum':{'the':1},'owes':{'much':1},'beautifully':{'worked':1,'modified':2},'vanish':{'.':1},'acquires':{'a':1},'greenwich.':{'comet':1,'the':1,'fig':3,'typical':1},'processes--':{'1':1},'cyclostomes':{'such':1},'shorten':{'and':1},'beune':{'throughout':1,'179':1},'shorter':{'and':4,'the':1,'in':1,'period--its':1,'waves':3},'read':{'partly':1,'that':2,'these':1,'it':1,'this':1,'understand':1,'the':3,'by':1},'pecking':{'scratching':1},'serum':{'of':1},'survey':{'of':4,'the':1},'specimen':{'of':3},'knitting':{'needle':1},'snail':{'chopped':1,'and':2,'is':1,'s':2},'comprehensive':{'articles':1},'blue-greens':{'harmonise':1},'alert':{'very':1,';':1,'than':1},'viewing':{'displaying':1},'levels':{'.':2,'in':1},'leaps':{'violently':1,'along':1,'from':2,'through':1},'necessity':{'and':1,'has':1,'for':2},'mussel':{'cannot':1,'.':2},'recent':{'observation':1,'advances':2,'study':1,'eclipse':1,'discovery':1,'british':1,'times':3,'discoveries':3,';':1,'years':5,'research':2,'achievement':1,'view':1},'race-continuing':{'adaptations':1},'expend':{'this':1,'considerable':1},'inches.':{'i':1,'illustration':1},'food-plant':{'to':1,'in':1},'concrete':{'suggestions':1,'mental':1},'regulating':{'and':1,'charities':1},'qualities--notably':{'health':1},'ltd.':{'a':1,'electric':1,'this':1,'professor':1,'charles':1,'an':1,'rotating':1,'the':3},'crayfish':{'and':1},'body-building':{'by':1},'woodward':{'s':1},'abbreviation':{'the':1},'hercules':{'a':1,'108':1,'37':1},'spinners':{'let':1},'plant-like':{'animal':2},'tribe.':{'keen':1},'readers':{'who':1,'wishing':1},'recommended':{'to':1},'making.':{'but':1},'resemblances':{'to':1},'causing':{'an':1},'parents':{'and':2,'bring':1,'thrusting':2,'in':1},'types--':{'lost':1},'physics--the':{'wonders':1},'sojourning':{'for':1},'surprised':{'by':1},'putnam':{'s':2},'provisional.':{'illustration':1},'clutches':{'.':1},'victims':{'such':1,'or':1},'demands':{'.':1,'general':1},'couple':{'of':1},'wives':{'are':1},'stockholm.':{'a':1,'wing':1},'suffering':{'from':1},'sea-lettuce':{'or':1},'shading':{'off':1},'emergence':{'of':11},'projects':{'freely':1,'from':1},'heightened':{'.':1},'sorting':{'out':2},'imposed':{'by':1},'dislodged':{'sea-anemone':1},'hue.':{'there':1},'aridity':{'set':1,'led':1},'sulphite':{'screen':1},'communications':{'in':1},'well-poised':{'head':1},'continue':{'consistently':1,'on':1,'its':2,'to':5},'spiny':{'ant-eaters':1},'exquisitely':{'beautiful':1},'tribes':{'of':1},'horsetails':{'which':1},'disorder':{'and':1,'of':1},'interbreeding':{'of':1,'.':1},'irresistibly':{'suggests':1},'methods':{'and':1,'we':1,'used':1,'like':1,'that':1,'of':10,'is':1,'it':1,'.':3,'to':1,'have':1,'really':1},'spring':{'and':2,'wheat':2,'of':1,'tides':2,'tide':2,'flower-perfumed':1,'out':1},'leptocephali':{'a':1},'obscure.':{'seasonal':1,'when':1,'illustration':1,'hunger':1},'mighty':{'theory':1,'swarms':1,'globe':1,'dead':1,'swarm':1,'flame':1,'animal':1,'shadow':1},'sight':{'and':2,'this':1,'of':1,'who':1,'.':2,'in':2,'not':1,'hearing':1,'more':2},'steam-engine':{'.':1},'curious':{'about':1,'organ':1,'sideways':2,'is':1,'blood-containing':1,'thing':1},'battalion':{'of':1},'committing':{'ourselves':1},'gill-clefts--':{'a':1},'stamens':{'kneads':1,'holding':1},'measurements':{'1':1,'at':1,'which':1,'.':1},'behave':{'as':2,'like':1},'newcomb':{'popular':1,'is':1,'the':1},'dating':{'from':1},'lowell.':{'the':1},'answers.':{'the':1},'inclination':{'to':1},'be':{'invariable':1,'splitting':1,'founded':1,'sunk':1,'spaced':1,'reshufflings':1,'poorly':1,'compact':1,'to':2,'fatal':1,'separated.':1,'brown':1,'counted.':2,'radio-active':1,'exact':1,'transformed.':1,'illustrated':1,'perceived':2,'dealt':4,'small':1,'ultra-violet':1,'noted':4,'ten':1,'invaded':1,'dried':1,'picked':2,'further':1,'estimated':1,'expressive':1,'even':2,'giving':1,'beaten':1,'liberated':1,'prejudicially':1,'learned':2,'told':2,'met':1,'active':1,'implicit':1,'obtained':1,'great':1,'broken':4,'involved':1,'accomplished':1,'periodic':1,'settled':1,'composed':1,'named':1,'followed':2,'explained':3,'visible':4,'readily':2,'fed':1,'working':1,'positive':1,'wiped':1,'two':2,'therefore':1,'taken':4,'more':6,'inclined':1,'suffused':1,'known':1,'producing':1,'modified':1,'evolved':1,'following':1,'cited':1,'something':1,'allowed':1,'terrestrial':1,'influenced':1,'white-hot.':1,'unavailable.':1,'six':1,'1':1,'located':1,'called--it':1,'fostered':1,'undergoing':1,'reconciled':1,'earlier':1,'wrong':1,'understanded':1,'waves':1,'a':27,'overtaken':1,'light':1,'rather':1,'so':2,'pulled':1,'counted':2,'over':1,'interpreted':1,'produced':2,'still':2,'negotiated':1,'actually':1,'better':1,'permanent':1,'overcome':1,'affected':1,'easily':2,'indivisible.':1,'always':1,'identified':1,'applied':1,'found':11,'physiologically':1,'suspended':1,'investigated':1,'our':2,'avoided':1,'borne':1,'shown':3,'washed':1,'hastily':1,'content':2,'laid':1,'believed.':1,'given':1,'completely':1,'put':3,'universally':1,'enormous':1,'created':4,'blown':1,'omitted':2,'one':4,'done':2,'adopted':1,'directly':1,'impossible':2,'earthworms':1,'little':2,'approximately':1,'too':7,'final':1,'discovered':2,'that':11,'released':1,'somewhat':1,'eliminated':2,'convinced':1,'ungrateful':1,'frankly':1,'splendidly':1,'determined':1,'supposed':1,'17-1':1,'and':1,'lightly':1,'well':1,'confessed':1,'turned':2,'buried':1,'seen':22,'clearly':2,'built':1,'thoroughly':1,'able':5,'lit':1,'absorbed':1,'green':1,'sure':2,'clearer':1,'paid':1,'said':19,'nothing':1,'measured':2,'considered':4,'calculated':1,'sometimes':1,'inferred':1,'looked':1,'accounted':2,'left':3,'shot':1,'supported':1,'fifty':1,'rotating':1,'carefully':1,'enormously':1,'slow':2,'based':1,'going':1,'judged':2,'credulous':1,'employed':1,'guarded':1,'exceptional':1,'between':2,'liable':1,'nibbled':1,'delicately':1,'set':1,'swept':1,'seas':1,'observed':2,'luminous':2,'best':1,'subject':1,'invoked':1,'halved':1,'enough':1,'unable':1,'allotted':1,'drawn':3,'profitable':1,'we':1,'renamed.':1,'however':2,'clues':1,'improved':1,'many':1,'called':14,'plants':1,'conquered':1,'adapted':1,'asked':3,'otherwise':1,'regulated':1,'deflected':1,'associated':4,'unearthed':1,'destroyed':2,'described':6,'three':2,'quickly':1,'recognised':2,'expected':1,'copied':1,'life':3,'robbed':1,'sufficient':1,'gas':1,'worked':1,'present':1,'inconspicuous':1,'sound':1,'abandoned':2,'freely':2,'almost':1,'violently':1,'thus':1,'helped':1,'examined':2,'in':8,'reminded':1,'linked':1,'stimulated':2,'patient':1,'split':2,'agitated':1,'several':3,'difficult':1,'used':5,'upon':1,'compared':2,'arrived':1,'prophesied':1,'circumvented':1,'kept':1,'older':1,'changes':1,'constitutional':1,'thought':3,'very':11,'the':11,'realised':1,'departed':1,'less':1,'stored':1,'handed':1,'useful':4,'recapitulated':1,'rapid':1,'regarded':7,'lured':1,'transformed':2,'easy':1,'engulfed':1,'increased':1,'read':1,'dissected':1,'required.':1,'dark':1,'accepted':2,'advanced':1,'necessary':1,'like':4,'admitted':5,'either':1,'translated':3,'simply':1,'reduced':1,'right':1,'often':1,'exposed':1,'some':2,'understood':2,'curious':1,'dissociated':1,'gradually':1,'expressing':1,'eating':1,'bold':1,'remembered':4,'analysed':1,'precious.':1,'accompanied':1,'about':2,'cautious':1,'carried':1,'getting':1,'entailed':1,'of':6,'discussed':2,'urged':1,'avoided.':1,'within':1,'bound':2,'due':1,'.':4,'mere':1,'indispensable':1,'there':1,'noticed':3,'much':2,'infected':1,':':1,'forming':1,'satisfactorily':1,'removed':1,'true':4,'made':11,'arranged':1,'embedded':1,'placed':3,'below':1,'converted':2,'mature':1,'pumped':1,'clear':1,'darker':1,'proud':1,'proved':1,'moved':1,'slowing':1,'an':5,'as':5,'at':2,'constructed':1,'effected':1,'beyond':1,'inborn':1,'no':15,'discerned':1,'when':1,'dimmed':1,'other':1,'transported':1,'included':1,'fastened':1,'utilised':2,'doubted':1,'far':1},'paloloworm':{'of':1},'obscures':{'them':1},'agreement':{'and':2,'disclaim':1,'by':1,'for':2,'shall':2,'amongst':1,'.':3,'will':1,'you':3,'the':1,'with':1,'violates':1,'nor':1,'before':1},'departures':{'among':1,'from':2,'of':2,'or':2,'behaviour-variations':1,'they':1,'in':2,'occur':1},'1919.':{'taken':1},'method.':{'illustration':1},'tidal':{'action':1,'energy':1,'river':1,'theory':1,'waves':1},'-273':{'deg':1},'by':{'saying':1,'all':4,'endeavour':2,'less':1,'being':3,'gradual':1,'both':1,'seizing':1,'worms':1,'rest':1,'rotating':1,'experiments':1,'animals':1,'ice':1,'human':1,'disadvantageous':1,'glue-like':1,'budding':3,'abundant':1,'its':4,'pterodactyls':1,'homology':2,'limbs':1,'dividing':2,'consistently':1,'dubois':1,'glowing':1,'passage':2,'coaxing':1,'insects':2,'other':2,'reptiles':1,'helmholtz':1,'hideous':1,'meadows':1,'it.':1,'division':1,'them':1,'someone':1,'influences':1,'means':18,'food':1,'overflows':1,'dr.':1,'permission':20,'cutting':1,'friction':1,'prof':5,'instinctive':1,'dr':4,'day':4,'association':1,'viscid':2,'moist':1,'name':1,'profound':1,'h':1,'bay':1,'involution':1,'surrendering':1,'vibrations':2,'ductless':1,'bats':1,'mr':3,'automatic':1,'legions':1,'liberating':1,'immigrants':1,'ferments':1,'burying':1,'intelligence':1,'radium':1,'some':7,'rivers':1,'crows':1,'full':1,'sight':1,'defences':1,'our':5,'civilisation':1,'tracheate':1,'intercrossing':1,'even':1,'what':2,'still':1,'superposing':1,'ejecting':2,'driving':1,'deliberate':1,'memories':1,'circulating':1,'representatives':1,'artificial':1,'birds':2,'e-mail':1,'acting':1,'experiment':2,'various':3,'vascular':1,'out-side':1,'new':1,'falling':2,'reading':2,'numerous':2,'u.s':1,'contrast':1,'columbus':1,'blowing':1,'scientific':1,'cellulose':1,'nature':2,'men':2,'water':1,'pressure':1,'experimenting':2,'threads':1,'others':3,'holding':1,'hiding':1,'comparison':1,'great':1,'accident':1,'your':1,'g':1,'freely':1,'ribs':1,'larger':1,'lichens':1,'experience':8,'plunging':1,'periodic':1,'radiation':1,'social':1,'passing':3,'changes':1,'frequent':1,'this':3,'discharging':1,'volcanic':1,'gas-bubbles':1,'burning':1,'striking':1,'suddenly':1,'churning':1,'powerful':1,'one':2,'spinning':1,'very':1,'air-breathing':1,'incandescent':1,'motor':1,'such':3,'collisions':1,'shortening':1,'revolutionising':1,'relapses':1,'squirting':1,'considering':1,'accumulating':1,'to':1,'taking':1,'people':1,'two':3,'.':1,'their':6,'cooling':1,'physicists':1,'calculations':1,'which':13,'dalton':1,'themselves':1,'variational':1,'reflex':1,'more':1,'introducing':1,'endeavour.':1,'that':2,'fire':1,'frost':1,'amphibians':1,'jellyfishes':1,'heat':2,'carrying':1,'blood.':1,'domestication.':1,'careful':1,'travelling':1,'those':1,'plants':2,'keeping':1,'migrants':1,'applying':1,'understanding.':1,'contracting':1,'solid':1,'thousands':1,'severe':1,'air-tubes':1,'air':2,'gills':2,'many':6,'growing':1,'making':2,'providing':1,'laplace':1,'clock-work':1,'imitation':1,'and':4,'firing':1,'roentgen.':1,'biologists':1,'almost':1,'j':19,'it':1,'an':6,'collision':1,'pressing':1,'grazing':1,'numbers':1,'planets':1,'sense':1,'anything':1,'any':2,'increased':1,'terrestrial':1,'sir':2,'different':2,'beginning.':1,'no':1,'studying':1,'tucking':1,'sending':1,'uranium':1,'ideas':4,'astronomers':1,'brian':2,'mr.':1,'strange':1,'geographical':1,'peoples':1,'over-population':1,'absorbing':1,'smell':2,'continuous':1,'accidental':1,'students':1,'amphibians.':1,'hand':1,'watching':1,'chance':3,'gravitation':1,'moving':1,'kin':1,'coercion':1,'successive':2,'fishes':1,'changing':1,'causing':1,'inconceivable':1,'moons':1,'man':4,'a':57,'night':3,'using':4,'fully':1,'pithecanthropus':1,'professor':7,'circumventing':1,'itself':3,'hungry':1,'sudden':1,'these':1,'peculiarities':1,'big-brained':1,'far':1,'fresh':1,'the':161,'starting':1,'drawing':1,'contingents':1},'analysing':{'light':4,'portion':1},'evolved--destined':{'in':1},'anything':{'and':1,'for':1,'was':1,'wot':1,'into':1,'else':1,'the':1,'with':1},'modernity':{'in':1},'nautilus':{'a':1,'nautilus':1,'pompilius':1,'is':1,'it':1,'186':3,'argonauta':2,'the':1,'hardly':1,'or':1,'are':1},'ear-bones':{'of':1},'deserves':{'to':1},'hatched':{'larvae':1,'salmon':1,'.':1,'bird':2,'in':1,';':1,'the':1},'repair':{';':1,'change':1},'into':{'flippers':2,'gold':1,'being':1,'ocean-troughs':1,'existence':1,'its':10,'masses':1,'lake':1,'forms':1,'internal':1,'combination-boxes':1,'sound':1,'his':1,'very':2,'dark':1,'boxes':1,'every':2,'shreds.':1,'this':2,'glass-eels':1,'activity':2,'freshwater':1,'unit-bodies':1,'reactions':1,'smaller':1,'radium':1,'some':2,'zones':1,'our':1,'canada':1,'organisms':1,'space':4,'definite':1,'safety':1,'new':2,'fragments':1,'red':1,'power':1,'water':1,'active':2,'simpler':1,'about':1,'many':1,'mutually':1,'connection':1,'one':4,'puzzle-boxes':1,'another':1,'thick':1,'little':1,'man--the':1,'distinct':1,'two':11,'their':3,'stars':1,'white':1,'energy':2,'empty':1,'continents':1,'account.':1,'heat':1,'races':1,'pieces':1,'plants':1,'these':1,'work':1,'britain':1,'this.':1,'matter':1,'gigantic':1,'something':3,'gas.':1,'it':5,'deep':1,'an':3,'as':1,'itself':1,'eras':1,'close':2,'mountain':1,'different':1,'things':1,'unity':1,'vital':1,'electrical':1,'which':2,'emphatic':1,'independent':1,'effect':1,'waves':1,'dust':1,'such':1,'extremely':1,'man':1,'a':24,'varieties':1,'electrons':1,'the':45},'encasements':{'with':1},'appropriate':{'action':1,'trigger-pulling':1,'trigger':1,'conditions':1,'one':1},'chalk-forming':{'animals':3,'foraminifera':1},'primarily':{'restricted':1},'repaid':{'when':1},'harnessed':{'electricity':1},'claspers':{'and':1},'spending':{'our':1},'gases':{'on':1,'from':1,'exposed':1,'of':1,'is':2,'in':1,'.':3,'spread':1,'can':1,'which':1,'between':1,'with':1,'into':1},'thirdly':{'every':1,'when':1},'double-armed':{'spiral':1},'burrow.':{'evolution':1},'suit':{'and':2,'of':2,'various':1},':':{'seasonal':1,'summer':1,'all':1,'skeleton':1,'photo':80,'magnetic':1,'rotating':2,'rischgitz':6,'disintegration':1,'its':1,'before':1,'death':1,'baron':1,'royal':8,'hermit-crab':1,'to':1,'only':1,'fig':11,'stephen':2,'darwin':1,'dead-leaf':1,'protective':2,'wave':1,'early':1,'falcon':1,'silk':1,'minute':1,'james':7,'cagcombe':2,'vortex':1,'h':6,'side-view':1,'greenland':1,'life-history':1,'national':2,'spoonbill':1,'yerkes':3,'astrophysical':2,'jupiter':1,'are':1,'leadbeater.':2,'conjectures':1,'what':2,'paintings':1,'ten-armed':1,'new':10,'discovery':2,'volvox':1,'variability':1,'we':3,'full':1,'reproduced':11,'underwood':2,'harvard':4,'ernest':2,'by':1,'suggested':1,'c':2,'improved':1,'g':6,'o':2,'whence':1,'pictorial':1,'hence':1,'origin':1,'pelican':1,'elliot':1,'surinam':1,'lafayette.':1,'proterospongia':1,'throughout':1,'from':13,'there':1,'imperial':4,'storm':1,'inclined':1,'flinty':1,'albatross':1,'photos':2,'true':1,'photograph':3,'avocet':1,'f':2,'this':1,'science':1,'mount':8,'j':24,'will':1,'w':22,'reproduction':1,'gambier':6,'making':1,'male':1,'laplace':1,'http:':1,'and':1,'nautilus':1,'is':1,'modern':1,'thus':1,'it':2,'surface':1,'an':5,'arrangements':1,'niagara':1,'british':12,'in':1,'woodpecker':1,'ascii':1,'if':1,'dying':1,'january':1,'six':1,'when':1,'puffin':1,'1':4,'how':2,'rischgitz.':2,'lafayette':1,'elliott':3,'lick':4,'hornbill':1,'electric':1,'okapi':1,'after':6,'diagram':5,'genealogical':1,'restoration':2,'such':1,'inconceivable':1,'man':1,'a':28,'natural':2,'for':2,'whenever':1,'light':1,'professor':3,'daily':2,'electrons':1,'english':1,'the':38,'egg':1,'wing':1},'opens':{'and':1,'many':1,'with':1,'up':1},'considerably':{'in':1,'less':1},'excavating':{'a':2},'elsewhere':{'as':1,'.':1,'in':1,'e.g':1},'inches':{'high':1,'square':2,'off':1,'of':1,'away':2,'long':5,'one':1,'shorter':1,'to':1,'below':1,'long.':1,'in':7,';':1,'per':1},'vicissitudes.':{'the':1},'slums':{'in':1},'moon--meteors':{'and':1},'archaic':{'mammals':1,'animal':1},'link':{'lives':1},'pacific':{'and':1,'golden':1,'west':1,'oceans':1,'oceans.':1,'ocean':1,'in':1},'legs.':{'illustration':1},'atom':{'and':5,'is':7,'within':1,'it':1,'as':2,'itself':1,'are':1,'in':2,'passes':1,'amounts':1,'there':1,'.':6,'to':6,'which':1,';':2,':':1,'was':3,'energy':1,'gives':1,'known':2,'such':1,'by':1,'a':1,'of':17,'can':1,'were':1,'the':4,'or':1},'coldest':{'places':1},'line':{'represents':1,'or':1,'from':1,'that':1,'of':21,'is':2,'capable':1,'but':1,'.':2,'to':1,'can':1,'altogether':1,'seen':1,'the':1,'gave':1,'with':2,'between':1,'across':1,'at':1},'considerable':{'and':1,'force':1,'mental':1,'evidence':1,'periods':1,'.':1,'strength':1,'uniformity':1,'heights':1,'dispersion':1,'results.':1,'degree':1,'loss':1,'fascination':1,'part':1,'effort':2,'distance':3,'amount':2,'magnitude':2,'time':2,'aid':1,'changes':1,'quantity':2},'posted':{'on':1,'with':3,'at':1},'open.':{'but':1},'ut':{'84116':1},'spectroscope':{'and':3,'reveals':1,'we':3,'enables':1,'splits':1,'for':1,'49':1,'any':1,'is':5,'in':1,'it':1,'an':1,'will':3,';':2,'can':1,'which':1,'sorts':2,'the':2,'.':3,'by':1,'shows':1},'burrows':{'circulating':1},'moths.':{'illustration':1},'us':{'and':6,'consider':2,'plainly':1,'feel':1,'is':2,'others':1,'phenomena':1,'back':2,'see':2,'through':1,'something':1,'directly':1,'in':2,'pulls':1,'precisely':1,'its':1,'select':1,'even':1,'better':1,'by':2,'for':2,'how':2,'inquire':1,'there':1,'when':1,'except':1,'.':11,'particles':1,'to':19,'take':2,';':1,'across':1,'picture':1,'return':2,'little.':1,'that':7,'very':2,'some':1,'stop':1,'bear':1,'indulge':1,'not':1,'with':3,'than':2,'a':8,'on':1,'about':1,'to-day':1,'remember':1,'this':1,'many':1,'as':2,'keep':1,'try':1,'turn':1,'so':1,'of':2,'the':3,'once':1,'say':2,'at':2},'paired':{'fins':1},'ball.':{'illustration':1},'mature':{'sperm-cell':1,'egg-cell':1,'animal':1,'.':1},'laplace':{'10':1,'s':3,'one':1,'spoke':1,'to':1},'side.':{'--i':1,'--1':1},'storing':{'fishes':2,'up':1},'genial':{'climatic':1},'aerial':{'and':1,'but':1,'journeys':2},'protrusive':{'lips':1,'face':2},'creature.':{'there':1,'sec':1},'defined':{'is':1,'primitive':1},'likewise':{'a':2,'have--there':1,'evolution':1,'react':1,'connected':1,'crumbs':1,'were':1,'simpler':1},'influence':{'and':2,'on':1,'of':5,'well':1,'retreats':1,'will':1,'in':1,'the':1,'or':1,'must':1},'surpassing':{'themselves':1},'char':{'that':1},'duration':{'of':2},'diverse':{'forms':2,'territory':1,'description':1,'angles':1,'results':1},'nautical':{'almanac':2},'pontobdella':{'an':1},'living.':{'some':1,'parental':1},'element.':{'two':1},'intrepid':{'explorers':1},'puzzling':{'and':1,'phenomenon':1},'tuft':{'as':1},'fixing':{'itself':1},'uranium':{'and':1,'then':1,'x.':1,'for':1,'would':1,'may':1,'should':1,'itself':1,'salt':1,'.':3,'spontaneously':1,'are':1,'in':1,'has':1,'changes':1,'by':1,'he':1},'preventing':{'their':1,'the':1},'close-packed':{'refractive':1},'conceptions':{'of':1},'points':{'one':1,'we':1,'that':1,'clearly':1,'of':4,'away':1,'back':1,'should':1,'to':2,'in':1,'forward':1,'.':1,'or':2,'out':3},'sails':{'for':1},'revision':{'.':1},'elements':{'a':1,'on':2,'commands':1,'for':1,'oxygen':1,'that':1,'may':1,'sun':1,'into':1,'in':2,'about':1,'.':2,'to':1,'as':2,'are':4,'have':1,'each':1,'it':1,'such':1},'small-brained':{'archaic':1},'energetic':{'particles':1,'men':1,'electrons':1,'actions':1},'beginnings':{'of':4,'.':1,'on':1},'sal-ammoniac':{'but':1},'faintly':{'lit':1,'visible':2},'bibliographies':{'appended':1},'habits--the':{'truly':1},'sides':{'and':1,'of':7,'nor':1,'to':1},'ago':{'and':2,'is':2,'in':3,'it':2,'as':1,'at':1,'178':1,'174':1,'for':1,'regarded':1,'when':3,'.':10,'to':1,'that':1,'may':1,'illustration':1,'they':1,'others':1,'with':1,'a':1,'showed':1,'the':4,'or':1,'are':1},'furthest':{'in':1},'land':{'and':3,'ran':1,'is':2,'surface':1,'skimming':1,'at':2,'have':1,'.':11,'bridges':1,'tending':1,'to':1,'there':1,'had':3,'actually':1,'also':1,'5':1,'between':1,'has':3,'was':2,'over':1,'meant':1,'but':1,'by':1,'continued':1,'than':2,'plants':1,'flora':1,'animals':10,'should':2,'animals--the':1,'leaving':1,'implied':1,'many':2},'sail.':{'the':1},'reasoned':{'discourse':2},'marble--there':{'are':1},'rescued':{'triumphantly':1},'diffraction':{'grating':2},'walked':{'about':1,'through':1},'cryptozoic':{'or':1},'opposing':{'the':1},'came':{'a':2,'about':6,'from':3,'barking':1,'into':1,'to':11,'slowly':1,'in':1,'first':1,'before':1},'harks':{'back':1},'fresh':{'waters--the':1,'racial':1,'contacts':1,'starts':1,'waters':2,'air':1,'water':7,'invention':1,'gulps':1,'offshoot':1,'supplies':1,'experiments':1,'expression':1,'or':2},'having':{'a':4,'little':1,'implies':1,'no':1,'comparatively':1,'somehow':1,'to':1,'only':1,'entangled':1,'planets':1,'not':1,'learned':1,'the':2},'placentals--show':{'a':1},'repeopled':{'by':1},'hampton':{'court':3},'code':{'of':1},'partial':{'counts':1,'eclipse':1,'or':1},'rubbish':{'is':1},'illustrates':{'very':1,'the':3,'part':1,'evolution':1},'scooped':{'the':1,'out':1},'knotted':{'spiral':1},'results':{'a':1,'what':1,'which':1,'of':6,'in':1,'.':2,'to':1,'are':2,'have':1,'were':1,'affecting':1,'the':2},'existing':{'lizards':1},'illustrated':{'and':1,'on':1,'when':1,'its':1,'in':1,'the':1,'by':3},'stops':{'struggling':1,'with':1,'its':1},'broader':{'palates':1},'dainty':{'and':1},'seemed':{'then':1,'for':1,'no':1,'almost':1,'to':2,'so':1},'tearing':{'small':2,'away':1},'club-mosses':{'and':1},'iii':{'adaptations':1,'.':2},'concerned':{'chiefly':1,'is':1,'here':1,'simply':1,';':1,'with':1},'hunger':{'and':2,'is':2,'in':1},'rufous':{'brown':1},'young':{'and':2,'emerge':1,'mound-birds':1,'reeds':1,'cheetahs':2,'water-bird':1,'fish':1,'woodpeckers':1,'orang':1,'foxes':1,'one':2,'crocodile':2,'as':1,'ducklings':1,'at':1,'in':2,'earth':1,'herring':1,'birds':5,'creatures':2,'eels':4,'described':1,'for':1,'liberated':1,'perhaps':1,'bittern':2,'frog':1,'.':4,'crocodiles':1,'fishes.':1,'fry':1,'bird':1,'elver':1,'then':1,'life':1,'thrush':1,'form':1,'that':1,'mammals':1,'ones':17,'twined':1,'text-book':1,'man':1,'a':1,'about':1,'animals':1,'turtles':1,'e.g':1,'this':1,'science':1,'frog-hopper':1,'toads':1,'moorhen':1,'plovers':1,'can':2,'mammal':1,'the':1,'stages':1,'are':3},'send':{'donations':1,'it':1,'out':2},'universes--':{'island-universes':1},'citing':{'these':1},'outwards':{'from':1,'for':1},'resources':{'and':1,'of':2,'upon':1,'are':1,'more':1},'inference.':{'on':1},'matter--other':{'new':1},'garden':{'on':1},'continues':{'to':3,'the':1,'sitting':1},'waters.':{'the':1},'mouth-parts':{'the':1,'.':1},'mixing':{'colours':4,'with':1,'in':1},'continued':{'and':1,'elevation':1,'conquest':1,'.':1,'to':3,'through':1,'in':1,'the':1,'over':1},'minerals':{'the':1,'.':1},'squids':{'various':1},'archaeopteryx':{'jurassic':1,'after':1,'.':1,'91':1,'the':1,'was':1},'earth-knot':{'of':1},'back-teeth':{'were':1},'anxious':{'warning':1},'race':{'because':1,'is':1,'depends':1,'well-defined':1,'owes':1,'if':1,'living':2,'would':2,'since':1,'.':9,'to':2,'which':1,'between':1,'was':1,'lived':1,'that':1,'after':2,'but':1,'includes':2,'they':1,'now':1,'by':1,'possess':1,'a':1,'of':3,'as':1,'without':2,'through':1,'or':3,'say':1},'trypanosome':{'which':2,'that':1},'others--the':{'placentals--show':1},'trypanosoma':{'gambiense':2},'mediterranean':{'region':1,'or':1,'for':1},'wavy-to':{'curly-haired':1},'unprofitable':{'for':1},'imply':{'enormous':1,'an':1,'ether':1,'it':1},'burrower':{'which':1},'munitions':{'which':1},'primeval':{'supporting':1,'coherence':1,'vegetation':1,'amphibians':1,'stuff':2},'make.':{'the':1},'that.':{'now':1},'apparatus':{'and':1,'for':3,'being':1,'of':1,'to':1,'which':1,'fine':1,'by':1},'waning':{'of':2,'remain':1},'expressed':{'by':1,'is':1,'.':1,'itself':1,'in':1,'along':1,'the':1},'hereditary':{'and':1,'enregistration':1,'obligations':1,'items':1,'pre-arrangements':1,'qualities':1,'capacity':1,'or':1,'enemies':1},'consistently':{'the':1,'presenting':1,'offer':1},'vapours--the':{'reversing':1},'indestructible':{'and':1,'it':1},'expresses':{'emotion':1,'the':1,'itself':2,'his':1,'its':1},'guinea-pigs':{'we':1},'bird':{'flies':1,'multiplying':1,'into':1,'dived':1,'it':1,'migration':1,'in':3,'feeding':2,'had':1,'sails':1,'.':5,'to':2,'without':1,'has':3,'was':2,'shows':1,'then':1,'we':1,'showing':2,'but':1,'with':1,'than':1,'about':1,'mimicry':2,'archaeopteryx':2,'of':6,'looked':1,'s':8,'allied':1,'the':1,'or':2,'hesperornis':2},'thin':{'dry':1,'atmosphere':1,'gas':1,'gases':1,'as':1,'sheets':1,'coatings':1,'out':1},'scenery':{'on':1,'effects':1,'if':1},'advantageously':{'sensitive':1},'scepticism':{'at':1},'led':{'eventually':3,'.':1,'to':7,'our':1,'was':1,'by':1},'license.':{'1.e.6':1},'convergences':{'and':1},'leg':{'to':1,'is':2,'but':1,'.':1,'broken':1,'in':1,'across':1},'respectively':{'.':1},'gathered':{'five':1,'together':1,'obviously':1},'dressed':{'but':1},'let':{'go':1,'the':2,'themselves':1,'them':2,'us':20},'octave':{'of':1},'consideration':{'of':2,'that':1},'invented':{'to':1,'cannot':1,'by':1,'something':1},'fifteen':{'thousand':1,'or':1,'miles':1,'in':1,'minutes':2,'feet--the':1},'physiology':{'and':2,'of':1,'would':1,'.':1},'darwinism':{'and':1},'substratum':{'on':1,'was':1,'.':1},'great':{'restriction':1,'evolutionary':2,'deliberateness':1,'effect.':1,'friction':1,'swooping':1,'philosopher':1,'skill':1,'speed':2,'projection':1,'resemblance':1,'patches':1,'density':1,'distances;':1,'auk':1,'storms':1,'improvement':1,'source':1,'collections':1,'majority':5,'division':2,'advantage':2,'advances':1,'oceans':1,'theme.':1,'coal-fields':1,'school':1,'clouds':1,'gift':1,'naturalist':1,'investigator':1,'aridity':1,'rocks':1,'excellence':1,'red':1,'truth':1,'waterfalls':1,'biological':1,'river':2,'italian':1,'dexterity':1,'wariness':1,'thinkers':1,'telescope':1,'deal':4,'series':1,'globe':1,'yerkes':1,'astronomer':1,'individual':1,'measure':1,'racial':1,'factors':1,'cerebral':1,'nebula':4,'southward':1,'ice':4,'abysses':4,'increase':1,'importance':4,'leap':2,'difficulties':3,'safety':1,'steps':8,'contrast':2,'claws':2,'beetling':1,'scientific':1,'power':1,'educability':1,'french':2,'difficulty':1,'reason':1,'extent':1,'congestion':1,'cities':1,'orb':1,'change':1,'advance':1,'search':1,'piece':1,'cavities':1,'pressure':1,'many':1,'step':5,'range':1,'comet':2,'canopy':1,'changes':1,'tongues':1,'groups':1,'unrest.':1,'height':1,'channels':1,'improvements':1,'doctrine':1,'illumination':1,'ridge':1,'service':2,'outbreaks':1,'depths.':1,'question':1,'nebular':1,'.':3,'swarm':1,'secret':2,'development':1,'interest':5,'brazilian':1,'length':1,'100-inch':1,'war':2,'fire-mists':1,'gaseous':1,'fiery':1,'quantities':1,'whirling':2,'it':1,'bulk':1,'part':3,'gain':1,'wheatfields':1,'abundance':1,'divisions':1,'fold':1,'deeps':2,'plain':1,'strides':1,'official':1,'value':1,'excitement':1,'sun-spot':2,'freedom':1,'refractors':1,'and':2,'tracts':1,'discovery.':1,'comet--the':1,'modern':1,'influence':1,'haunt':1,'haunts':1,'cluster':1,'as':4,'reptiles.':1,'glaciation':1,'numbers':1,'in':1,'diversity':2,'cleverness':1,'continents':1,'pink':1,'compared':1,'club-moss':1,'variety':3,'things':1,'forests':1,'flood':1,'electrical':1,'significance':1,'intelligence':1,'physical':1,'scarlet':2,'staying':1,'ball':1,'volumes':1,'disadvantages':1,'invasions':1,'gallery':1,'spot':1,'claw':1,'falls':1,'depths':2,'leaps':1,'invasion':2,'bustard.':1,'types':1,'acquisitions':2,'zooelogical':1,'accumulations':1,'complexity':1,'races':1,'mass':1,'fundamental':1,'velocity':1,'laboratories':1,'salt':1},'engage':{'the':1},'credits':{'every':1},'technical':{'section':1,'improvements':1},'involved':{'astronomers':1,'a':2,'this':1,'in':3},'resulting':{'from':1,'spectrum':1},'opinion':{'seems':1,'as':1,'now':1,'says':1,'about':1},'residents':{'in':2},'amphibians;':{'but':1},'pleistocene':{'perhaps':3,'period':2,'while':1,'era':1,'or':1,'before':1},'involves':{'a':1,'much':1,'hard':1,'nutritive':1},'holmes':{'kept':1,'writes':1,'poked':1},'chains':{'bind':1,'is':1,'or':1,'which':1},'halfpenny':{'it':1},'complying':{'with':3},'333':{'432':1},'mariners':{'before':1},'it--whatever':{'that':1},'hedgehog-like':{'test':1},'tools':{';':1},'fit.':{'at':1},'standing':{'stones':1,'on':1,'out':1,'with':1,'before':1},'bloweth':{'where':1},'recalling':{'even':1,'the':1},'whipping':{'in':1},'self-luminous':{'.':1},'next':{'set':1,'generation':1,'period':1,'grade':1,'stroke.':1,'year':1,'tooth':1,'to':2,'few':1,';':1,'article.':1,'notice':1,'that':1,'moult':1,'chapter.':1,'atom':1,'great':1,'room':1,'morning':1,'offshoot':1,'the':1,'page':1},'eleven':{'years':1},'doubt':{'and':1,'about':1,'for':1,'that':20,'whether':1,'many':1,'there':1,'some':1,'it':1,'as':7,'at':1,'the':1,'by':1},'animal.':{'illustration':1},'doubling':{'of':1},'midday':{'work':1},'pencil':{'on':1,'upon':1},'occurred':{'about':1,'without':1,'in':1,'the':1,'along':1,'more':1},'bodily':{'and':4,'life':2,'frame':2,'immortality':1,'attributes':1,'along':1},'carrying':{'a':1,'them':3,'her':2,'an':1,'the':1,'its':2},'extinction.':{'the':1},'baby':{'reveals':1,'orang':2,'had':1,'orang-utan':2,'chimpanzees':2,'learning':1},'balls':{'on':1},'animals':{'show':2,'abundant':1,'had':1,'should':1,'to':5,'overcome':1,'take':1,'division':1,'breathing':1,'showing':1,'cannot':1,'not':2,'monkeys':1,'like':6,'where':1,'enjoy':1,'illustrating':1,'often':1,'191':1,'began--a':1,'namely':1,'sec':1,'are':12,'living':5,'hide':1,'lead':1,'below':1,'tend':2,';':2,'we':2,'were':4,'however':1,'illustration':1,'sink':1,'put':1,'come':2,'on':2,'began.':1,'e.g':2,'of':7,'allied':1,'or':5,'secure':1,'physophora':2,'61':1,'1872':1,'protozoa':1,'illustrate':1,'from':2,'would':2,'there':4,'.':14,'live':2,'themselves':1,'was':1,'that':3,'but':1,'with':2,'must':2,'made':1,'these':1,'say':1,'remain':1,'learn':1,'called':1,'and':16,'do':1,'likewise':2,'is':6,'it':2,'as':1,'have':19,'in':5,'radiolarians':1,'thoroughly':1,'began':1,'burrow':1,'globigerinid':1,'which':7,'many':1,'important':1,'such':5,'man':1,'a':2,'lower':1,'especially':1,'together':2,'without':1,'the':5,'left':1},'retreated':{'northwards':1,'within':1},'this':{'freak':1,'impression':1,'selection':1,'phenomenon':1,'being':1,'when':1,'sporting':1,'leads':1,'distant':1,'consists':1,'earth':1,'oldest':1,'reasoning':1,'tendency':1,'seemed':1,'colony-making':1,'certainly':1,'outer':2,'advance--the':1,'work.':3,'common':1,'sheaf':1,'state':3,'instrument':2,'magnetic':1,'does':2,'has':5,'might':2,'over':1,'happened':1,'kingdom':1,'then':1,'good':1,'greater':1,'advantage':1,'means':5,'very':1,'period':5,'early':2,'hermon':1,'diary':1,'probably':1,'not':1,'world':2,';':1,'vapour':1,'organ':1,'progressive':1,'did':1,'pinch':1,'pillar':1,'dinosaur':1,'stuff':1,'she':1,'reasonable':1,'succession':1,'small':1,'ultra-violet':1,'movement':2,'page':1,'view':3,'system':1,'the':6,'namely':1,'picture':2,'colossal':1,'garment':1,'globe':1,'notochord':1,'persistent':1,'relative':1,'second':1,'owing':1,'result':1,'mirror':1,'ruse':1,'belief':1,'blue':1,'project':3,'still':1,'for':1,'waning':1,'distinctive':1,'away':1,'thickness':1,'case':8,'time.':1,'race':1,'vascular':1,'new':2,'falling':1,'before':1,'method':2,'law':1,'discovery':2,'body':1,'variability':1,'wheat':1,'theory':9,'fish':1,'creature--far':1,'applies':2,'agreement':16,'possibility':1,'like':1,'extraordinary':1,'surely':1,'web':1,'marquis':1,'vigorous':1,'path':1,'estimate':2,'respect':2,'by':1,'change':2,'stage':1,'chapter':1,'on':1,'great':3,'substance':1,'license':2,'argument':1,'of':2,'motion':3,'quaint':1,'range':1,'regular':1,'lively':1,'pictorial':1,'argue':1,'makes':2,'or':1,'inference':1,'family':1,'point':9,'simple':3,'image':1,'within':2,'colony':1,'number':1,'incessant':2,'will':2,'fiery':1,'raises':1,'littoral':1,'inorganic':1,'drawing':2,'electronic':3,'attendant':1,'sympathetic':1,'little':1,'ancient':1,'lens':2,'would':2,'attraction':1,'important':1,'outline':5,'question':3,'spiral':1,'.':2,'immense':1,'wonderful':2,'low':1,'statement':1,'ocean':1,'mysterious':1,'australian':1,'scheme':1,'was':15,'energy':7,'minor':1,'gives':1,'sort':2,'direction':1,'partly':1,'way':11,'that':4,'explanation':1,'continuous':1,'gas':1,'took':1,'but':1,'haunt':1,'implied':1,'instrument.':1,'reason.':1,'particular':1,'implies':3,'rivalry':1,'white':2,'must':2,'steel':1,'pull':3,'kind':5,'made':1,'conception':1,'conviction':1,'characteristic':1,'work':11,'sifting':1,'air':1,'planet':1,'below':1,'paragraph':1,'fertilisation':1,'can':3,'cannot':1,'were':2,'merely':1,'property':1,'x-ray':2,'distance':6,'and':3,'layer':2,'constant':1,'resemblance':1,'century':1,'process':1,'molecular':1,'is':63,'modern':1,'turned':1,'it':5,'swarm':1,'an':1,'sample':1,'cluster':1,'as':1,'ether':1,'at':2,'file':2,'sense':3,'relic':1,'mysteriously':1,'apparently':1,'internal':1,'film':1,'absolute':1,'again':2,'law.':1,'moves':1,'twofold':1,'woodpecker':1,'age-old':1,':':2,'eloquent':1,'radiation':1,'thorough':1,'any':1,'note':1,'field':1,'strange':2,'inquiry':1,'ante-natal':1,'answer':1,'subject':1,'shows':1,'conclusion':1,'tension':1,'neolithic':1,'book':3,'living':1,'may':7,'ebook':6,'to':3,'diagram':2,'scale':2,'nucleus':1,'purpose':2,'position':1,'discharge':1,'bodily':1,'opportunity':1,'wonder-world':1,'a':1,'in':2,'amoeboid':1,'observation':1,'imply':1,'light':1,'voice':1,'shift.':1,'dog':1,'obviously':1,'points':1,'principle':1,'time':2,'velocity':1,'effect':2,'egg':1,'order':1,'fact':4},'cuvier':{'1769-1832':2},'pour':{'from':1},'reproduce':{'it.':1,'tell':1},'publications':{'as':1},'of':{'dissolution':1,'comparatively':1,'four':4,'straws':1,'chameleons':1,'electricity':18,'ceylon':1,'out-breeding':2,'lord':1,'arboreal':4,'pigment':2,'thinopus':1,'every':2,'radio-active':3,'vastly':1,'monkeys':5,'kataleptic':1,'unrelated':1,'relics':3,'venus':5,'clothes':1,'force':2,'senescence':1,'infancy':1,'direct':1,'surrounding':1,'second':1,'microscopists':1,'even':1,'change.':1,'organisms':2,'thunder':1,'nature.':2,'asia':1,'children':2,'change;':1,'salt-accumulation':1,'fossil':1,'new':6,'increasing':3,'ever':2,'men':7,'unexhausted':1,'atoms':25,'anthropology':1,'100':1,'cardboard':1,'dry':2,'luther':1,'light.':3,'smoke':1,'changes':1,'golden':1,'feelings':1,'patience':1,'negative':5,'civilisation.':1,'telegraph':1,'thorndike':1,'musk':2,'x-rays--the':1,'glass':3,'continual':3,'things.':1,'93':1,'92':1,'work':3,'mammalian':1,'parachuting--a':1,'mr':1,'radiance':2,'india':1,'corroborating':1,'present-day':2,'absolute':1,'reptiles--snakes':1,'nuts':1,'damages.':1,'how':2,'messrs':1,'ordinary':1,'after':1,'vicious':1,'long-continued':1,'parallel':1,'types':1,'effective':1,'carbonic':1,'order':1,'wind':1,'over':7,'crumbs':1,'symmetry':2,'bodies--evolution':2,'better':2,'them':36,'widely':1,'penetration':2,'molecules.':1,'pinkish':1,'silver':1,'oxygen':7,'brightness':1,'each':10,'telescope':2,'spider':2,'parasites':1,'armour--the':1,'hive-bees':1,'forty':1,'particles':3,'heavenly':1,'millions':6,'stamping':1,'turning':1,'monkeys--activity':1,'eternal':1,'strata':3,'free':2,'sensory':1,'struggle':1,'mastering':1,'calcareous':1,'detecting':3,'monkey':2,'enormous':2,'perhaps.':1,'cosmic':1,'days':1,'hearing':4,'another':3,'scissors':1,'thick':1,'electronic':4,'mercury':2,'ten':2,'pelagic':1,'legs':3,'dogs':1,'hydatina--has':1,'project':8,'matter':67,'torpedo-net.':1,'iron':10,'feeling':3,'oxygen-capture':1,'mind':10,'spectrum':1,'controversy.':1,'oxygen-combustion':1,'relatively':1,'affairs':3,'snow':3,'metallic':1,'chitin':2,'australia--all':1,'knowledge--the':1,'blue':1,'anatomy':1,'drought':2,'nutritive':3,'observation':1,'fitter':1,'professor':4,'metal':1,'swamps':1,'dover':1,'pollen':1,'hunger':1,'insects':8,'nerve-cells':3,'counteractive':1,'lessons':1,'latent':1,'sugar':1,'structure.':1,'fluid':1,'energy--what':2,'tuberculosis':1,'saturn':2,'dr':1,'to-day--the':1,'fields':1,'shape':1,'progress.':2,'architecture':2,'freshwater':1,'steam':3,'head-brains':1,'radium':15,'testing':1,'combustion':2,'rings':1,'artificial':1,'paternal':1,'luminescent':1,'finger':1,'caves':1,'profitable':1,'nature':18,'were':2,'wear':1,'carbon':1,'flowering':3,'caledonia':1,'out-flowing':1,'climate':3,'air--a':1,'distinction':1,'inquisitive':1,'tons':2,'250':1,'merchantibility':1,'three':2,'quickly':1,'much':4,'sponges':1,'parents':1,'life':50,'in-breeding':2,'chili':1,'air':8,'horse-power':1,'zoologists':1,'balance':1,'amphibians--the':1,'remembering':1,'seven':1,'is':1,'it':16,'brake':1,'in':1,'comparative':1,'things':5,'daughter-units':1,'damages':1,'colonies':1,'capacities':1,'typhoid':1,'rain':1,'hand':1,'kin':1,'patagonia':1,'turtle-backs':1,'opportunity':1,'butter':1,'engrained':1,'neptune':1,'contact':1,'greatest':1,'the':1665,'kinship':1,'deep-red':1,'indigo':2,'newton':2,'disguise':3,'human':9,'life-preserving':1,'yet':1,'evolution.':5,'vibration':1,'leibnitz':1,'alchemy':1,'transformed':1,'innocent':1,'humanity':1,'survival':1,'possible':3,'it--for':1,'desire':1,'melting':2,'insurgence':1,'plants--romance':1,'haunts--such':1,'homing':1,'people':1,'dead':2,'deflection':1,'jupiter':5,'escape':1,'animate':4,'proceeding':1,'ice':1,'everything':1,'conquering':2,'man--body':1,'palatable':1,'losing':1,'self-preserving':1,'primitive':4,'successive':3,'obtaining':2,'intellectual':1,'bats':2,'palaeozoic':1,'support':2,'flying':2,'jealousy':1,'sunlight':2,'grasping':1,'head':2,'forming':4,'becoming':3,'heat':14,'solar':1,'crystal':1,'meteorites.':1,'temper':1,'paragraphs':1,'muscular':1,'evidence':2,'prayer':1,'physical':1,'discriminate':1,'lungs':1,'inborn':1,'no':4,'font-de-gaume':2,'reality':1,'tin':1,'holding':1,'smell':5,'white-hot':2,'clear-cut':1,'diet':1,'rising':1,'authorities':1,'to-day':15,'potato':1,'time':10,'serious':1,'remarkable':2,'colour-change':2,'varying':1,'computation':1,'skin':7,'passage':1,'reptiles':6,'protective':3,'exact':1,'feeble':1,'minute':5,'level':1,'magnet':1,'coincidences':1,'excellence':1,'slouching':1,'backboneless':2,'speculation':1,'perceptual':2,'tortoises':1,'thinkers':1,'radium.':1,'mind--even':1,'bacteria':1,'water-plants':1,'constitution':1,'uniform':2,'wave-motion':1,'falling':1,'flame.':1,'tibet':1,'hairs':1,'mauer.':1,'water':19,'meteorites':3,'magnetism':1,'galileo':1,'change':4,'box':1,'brilliant':1,'smoke-like':1,'exploitation':1,'sex--beginning':2,'ineffective':1,'locomotion':2,'useful':2,'relations.':1,'illumination':1,'sympathetic':1,'working':2,'positive':8,'uncritical':1,'france':3,'prey':2,'assimilation':1,'cases':2,'capturing':2,'haddington':1,'avoiding':1,'nature--on':1,'inveterate':1,'stature':1,'following':1,'making':4,'warm-bloodedness':1,'breeds':1,'spy':1,'development--that':1,'238':1,'mankind--steps':1,'hydrogen':9,'rays':3,'winter':1,'condensation.':1,'species':4,'vital':3,'huge':2,'may':1,'mankind':3,'such':9,'man':52,'natural':6,'neck':1,'liquid':1,'st':1,'lagoon':1,'years':25,'course':35,'experiments':1,'cold':3,'still':3,'birds':13,'limbs':1,'apes':3,'forms':1,'physics--research':1,'ours':3,'fire-mist':1,'years--but':1,'tails':1,'half':1,'twilight':1,'name':1,'times':4,'creation.':1,'establishing':2,'rock':1,'square':1,'elephants':1,'receipt':2,'prisms':2,'woodcraft':1,'catching':1,'entering':1,'wheat--changes':1,'living':17,'space':10,'these--which':1,'looking':3,'receiving':1,'picture-logic':1,'california':1,'marine':1,'advance':2,'sparrows':1,'language':1,'tree-sloths':1,'british':1,'motion':6,'thing':1,'deep-sea':1,'learning.':1,'adventure':4,'surviving':1,'coming':1,'one':18,'gases':1,'them--':1,'field-voles':1,'rome':1,'size':2,'little':5,'man--the':1,'anyone':2,'cooling':1,'2':1,'alfred':1,'white':1,'exploring':1,'that':14,'centipedes':1,'flowers':1,'eohippus':1,'12':1,'meteors':5,'third':1,'sailing':1,'three-spined':2,'trekking':1,'cards':1,'gigantic':3,'wandering':1,'and':3,'gathering':1,'chlorophyll':1,'psychical':1,'any':20,'1903.':1,'bavaria':1,'coal':3,'efficient':1,'physiologists':1,'equipment':1,'potential':1,'hydrogen--which':1,'invertebrate':1,'printed':1,'men--conspicuous':1,'america':2,'greyish':1,'dragon-flies':1,'average':1,'later':1,'science.':2,'wing':1,'salt':2,'precise':2,'far-reaching':1,'bright':2,'uranus':1,'slow':2,'only':1,'wood':1,'flood.':1,'awareness':1,'masking':1,'space.':1,'nearly':3,'lighter':3,'primates':2,'aluminum':1,'miles':13,'girdles':1,'vision':4,'famine':1,'weapons--the':1,'registering':1,'ways':2,'definite':2,'colours':2,'man.':7,'crookes':1,'vertical':1,'parental':10,'style':1,'dome':1,'rapidly':1,'cities':1,'vaporous':1,'many':15,'contract':1,'disappointment':1,'equatorials':1,'expression':2,'radio-activity':3,'bricks':1,'colony':1,'ants':2,'60':1,'air-breathing':2,'straws.':1,'learning':3,'67':1,'extinct':2,'technicalities':1,'one-celled':2,'mars':10,'reflex':2,'500':2,'observers':1,'external':1,'attentive':1,'diffuse':1,'those':9,'sound':1,'specialised':1,'these':71,'danger.':1,'life.':5,'mound':1,'trackless':1,'sudden':1,'ferns':1,'rock-cod':1,'helium':2,'everyday':1,'movements':1,'different':15,'lava':1,'shifts':2,'speech':1,'intermediary':1,'noble':1,'oil':6,'arctic':2,'insects.':1,'persons':1,'fruit':2,'delicate':1,'waves.':1,'implements':1,'fixing':1,'bodies':2,'summer':1,'being':8,'slime':1,'actions':1,'violent':3,'touch':1,'water-basins':1,'death':3,'thinking':4,'rose':1,'geological':1,'clay.':1,'4':3,'grip':1,'around':1,'larva':1,'crustaceans':1,'dark':3,'quickness':1,'using':1,'meaning':1,'acute':1,'fossils':2,'heat-waves':1,'heredity':2,'lightning':1,'donations':1,'coal--a':1,'chronology':1,'racial':3,'ascent':2,'self-effacement':1,'semotilus':2,'critical':1,'expressing':1,'transmutation':2,'measuring':1,'iron-forming':1,'wheat':2,'scientific':3,'uneasy':1,'sixty':2,'stone':2,'beavers':1,'chamberlin':2,'mutually':1,'corals':1,'or':3,'cambridge':2,'goethe':1,'communication':3,'electricity.':1,'wave-movements':1,'your':1,'mental':2,'her':8,'camouflaging':1,'dispersion':1,'low':1,'stars':16,'energy':35,'continents':1,'wits':1,'mammals':9,'water-vapour':1,'practically':1,'grass':1,'taste':2,'certain':5,'deep':1,'general':2,'as':1,'lichen':1,'associating':1,'planets':1,'retiring':1,'meteorites--pieces':1,'deviation':1,'separate':1,'teeth':2,'fresh':1,'rainbow-colour':1,'building':3,'condensation':2,'remote':1,'bilateral':1,'dislodgment':1,'starting':1,'all':34,'suns':1,'worms':2,'seals':1,'zinc':4,'reasoning':1,'careful':1,'red-hot':2,'meteorites--a':1,'wyoming':1,'postglacial':1,'devonian':1,'very':6,'combustible':1,'fat':1,'coloured':2,'trillions':5,'interpreting':2,'instinct.':1,'condition':1,'elusiveness.':1,'prolonged':2,'large':4,'dinosaur':1,'sand':2,'small':10,'mount':2,'rats':1,'methodical':1,'past':2,'invention':2,'1904-5':1,'further':1,'creatures':2,'babylonia':1,'what':25,'sun':1,'emotions':1,'thickness':1,'public':1,'movement':7,'condensed':1,'escaping':1,'malaria':1,'answers':1,'behaviour':14,'1843':1,'compliance':2,'experimenting':3,'miniature':2,'social':2,'action':2,'matter--but':1,'sticking':1,'family':3,'transit':1,'africa':1,'inorganic':2,'eye':1,'discriminative':1,'distinct':1,'petroleum':1,'two':7,'comparing':1,'promoting':2,'minor':1,'more':5,'horses':2,'substances':2,'chimpanzee':2,'particular':2,'stampings':1,'weathering':1,'science':29,'nine':1,'spontaneous':1,'beautiful':1,'messages':1,'stinging':3,'niagara':3,'sharp':1,'flint':1,'offspring':2,'terrestrial':6,'viviparity':1,'glowing':7,'civilisation':2,'germinal':1,'blood':1,'waves':10,'prospecting':1,'a':310,'life-forms':1,'pithecanthropus':8,'sun-spots':2,'renewing':1,'shore':1,'tentacles':2,'cases.':1,'perception':2,'healthfulness':1,'music.':1,'egg':2,'playing':2,'paper':3,'existence':1,'its':73,'club-mosses':1,'25':2,'26':1,'20':1,'solving':1,'gentleness.':1,'late':1,'microscopic':3,'it.':1,'good':2,'food':13,'compound':1,'association':4,'instructions':1,'mystery':1,'exquisite':1,'predatory':1,'heavy':1,'england':2,'restless':2,'nitrogenous':1,'fish':1,'hard':1,'energy.':1,'trilobites--jointed-footed':1,'neanderthal':3,'research':1,'nautiloids':2,'safety':3,'7':1,'celebes':1,'meteoric':2,'rejuvenescence':1,'bass':1,'extraordinary':2,'reason':2,'rainbow-tinted':1,'metamorphosis':1,'computers':1,'round':1,'copper':4,'limestone':1,'mimetic':1,'soapy':1,'star-clouds':1,'earthworms':1,'horse':3,'temperature':6,'twenty':2,'186':4,'gibraltar':1,'einstein.':1,'molecular':1,'aristocracy':1,'relationship':1,'1919':1,'1918':1,'part':1,'half-made':1,'sheer':2,'dissection--or':1,'egg-cells':2,'messrs.':1,'ages':7,'germ-cells--the':1,'atoms--the':2,'flaming':2,'scotland':2,'moist':1,'labour':6,'useless':2,'sea-perches':1,'eggs':7,'most':5,'achievement':1,'branching':1,'galway':1,'evolution--factors':1,'mobile':1,'seething':1,'electrons':32,'physics':6,'lying':2,'stones':1,'hoar-frost':1,'gold':6,'disturbances':2,'to-day.':1,'hereditary':3,'fine':1,'giant':2,'securing':1,'mauer':1,'nervous':2,'fishes--the':1,'less':1,'gills':1,'darwin':3,'his':27,'trees':2,'germ-cells':2,'rest':1,'instinctive':5,'silk':4,'stone.':1,'birds.':1,'common':2,'activity':2,'experiments;':1,'body':4,'art':1,'intelligence':12,'sex':1,'individual':5,'aberdeen':1,'practice':1,'gravitation':3,'pictures':2,'classes':1,'various':8,'conditions':1,'europe':3,'responses':1,'craters':1,'invisible':1,'both':2,'attainment':1,'foreign':1,'tactility':1,'amoeba':2,'experimental':1,'distress':1,'supply':1,'simple':3,'whatever':2,'whelk':2,'unicellular':1,'incandescent':1,'zeta':2,'decline':1,'damp':1,'brick':1,'meeting':1,'treatment':1,'modern':20,'flight':11,'fire':3,'gas':8,'amphibians':8,'reason.':1,'magnetised':1,'plants':4,'opportunity.':1,'solid':4,'straight':1,'ape-like':1,'lenard':1,'moth':1,'itself':2,'currents':1,'saline':1,'communal':1,'trial':2,'pecking':1,'yucca':1,'higher':5,'development':3,'brooding':1,'moving':4,'birch':1,'recent':5,'lower':2,'luminescence':1,'sight.':1,'chickens':1,'concrete':1,'body-building':1,'pigeons':2,'matter.':4,'space;':1,'atomic':1,'matter;':1,'praying':1,'letting':1,'cut':1,'internal':5,'deliberately':1,'heidelberg':3,'chess':1,'australia':7,'reptilian':1,'showing':1,'stockholm.':2,'life--a':1,'wings':1,'insect':1,'ponds':1,'individuals':1,'mathematical':2,'methods':1,'spring':1,'creation':4,'some':25,'yolk':3,'sight':3,'curious':1,'sieves':1,'pitchblende':2,'civilization':1,'300':2,'lakes':1,'tidal':2,'starlings':1,'intense':1,'analysing':1,'feigning':1,'prothyl':1,'modernity':1,'deepish':1,'chaps.':1,'naturalists':1,'chalk-forming':2,'deep-violet':1,'statistics':1,'placing':1,'long':3,'mimicry':2,'mountains':1,'inches':1,'adjusting':1,'frost':1,'fisheries':1,'atom':1,'energy--traceable':1,'migrating':1,'considerable':2,'hair':1,'skull':2,'characteristic':2,'spectroscope':1,'sifting':3,'us':3,'similar':2,'non-living':1,'flow':1,'sepia':1,'warning':2,'dragging':1,'whirligig':2,'tentative':1,'heat.':1,'endurance':1,'uranium':3,'occasional':1,'explaining':3,'elements':2,'energetic':1,'problems':1,'astronomy.':1,'allowing':1,'fishes':11,'cuttlefish':1,'structure':3,'temperament':1,'land':4,'reasoned':2,'age':1,'attaining':2,'conjugal':1,'ready-made':1,'knotted':1,'existing':1,'disintegration':1,'rufous':1,'young':2,'stable':1,'indicating':1,'breathing':1,'matter--other':1,'moribund':1,'putting':3,'intelligence--of':1,'minerals':1,'race':1,'smaller':1,'gripping':1,'rivers':2,'fermenting':1,'unavailable':1,'opaque':1,'giving':2,'slight':1,'habituation':1,'atoms--different':1,'experiment':1,'bird':1,'scenery':1,'let':2,'fifteen':1,'physiology':1,'extreme':1,'great':21,'evolution--the':1,'amphibians.':1,'haunts':1,'leaving':1,'evading':2,'stars--the':3,'opinion':2,'marmosets':1,'it--whatever':1,'tools':1,'cloud':2,'lime':2,'use':2,'from':4,'doubt':1,'contentment':1,'crab':1,'oily':1,'visibility':2,'bodily':1,'opposing':1,'animals':21,'this':81,'us.':1,'crickets':1,'reeds':2,'calculation':1,'high':3,'birnam':1,'something':4,'water.':3,'sir':7,'counting':1,'six':2,'animal':17,'hormones':2,'intelligent':4,'tension':1,'maternal':1,'them--simple':1,'sugar-bird':1,'primers':1,'tethering':1,'light':49,'lines':1,'predacious':1,'evolutionary':1,'unpalatable':1,'130':1,'agricultural':1,'ease.':1,'burning':1,'la':2,'water-weed':2,'surgeons':1,'vibration.':1,'labor':1,'instruments':1,'derivative':1,'greater':1,'material':2,'billiard':1,'rotation':2,'day':1,'worlds':2,'profound':2,'slipping':1,'truth':2,'pools':1,'lung':1,'evolution--how':1,'doing':3,'cultivated':2,'whitish':1,'books':2,'separating':2,'our':53,'sexual':1,'special':2,'gossamer':4,'time.':1,'exporting':1,'red':7,'lizzie':2,'electricity--electric':1,'mares':1,'organic':4,'behaviour.':2,'south':1,'disembodied':2,'activity.':1,'quality':2,'ancient':5,'nebulae':3,'all--the':1,'their':48,'nebular':1,'time--man':1,'mankind--notably':1,'hearing.':1,'inner':1,'x-rays':9,'negro':1,'manipulation':1,'branches':1,'july':2,'shrapnel':1,'isolation':1,'reproduction':1,'negatively':1,'steep':1,'poisons':1,'apparently':1,'food-supply':1,'gravity':2,'which':46,'unsettled':1,'soap':2,'vegetation':4,'digestive':2,'cracking':1,'preliminary':2,'sally':1,'dorsal':1,'volunteers':1,'disease':1,'mechanical':3,'mother-of-pearl':1,'fact':2,'atmosphere':1,'charles':1,'woolly':1,'seaweed':3,'utter':1,'fear':1,'trying':1,'knowledge':4,'millennia':1,'surroundings':1,'spontaneity':1,'molecules':3,'emitting':1,'thousands':6,'means':1,'perfection':2,'words':2,'crabs':1,'evolution':46,'brain':1,'numerous':1,'amphibia':1,'light--is':1,'view':8,'multiplying':3,'elusiveness':2,'powder':1,'violet':2,'humane':1,'wire':2,'genius':1,'mind.':3,'identification':1,'routine':1,'progress':2,'open-sea':2,'joy':1,'agencies':1,'pilgrims':1,'equal':2,'migration.':1,'passing':3,'preparedness':1,'stars--to':1,'sea-worms':1,'tremendous':1,'armadillos':1,'immense':1,'waste':1,'phosphorescent':1,'antlers':1,'sex--emotions':1,'environment.':1,'tactics--self-effacement':1,'an':58,'volunteer':1,'economised':1,'asexual':1,'air-tubes':1,'britain':1,'wild':2,'almost':1,'surface':1,'zoophytes':1,'perhaps':1,'forceps':1,'ante-natal':3,'habitats':1,'locomotion.':1,'neolithic':2,'lichen;':1,'cubic':1,'clouds--some':1,'colouring':1,'dust':4,'britain.':1,'whale':2,'poultry':1,'colour':8,'nebulous':2,'thought':3,'position':4,'flesh':1,'domestic':1,'radium--the':1,'sea-dust':2,'skill':2,'rapid':2,'battery':1,'slits':1,'government':1,'utah':1,'mistake.':1,'facial':1,'backboned':2,'perpetual':1,'electrons.':4,'works':1,'soft':2,'inexperienced':1,'replacement':3,'feelers.':1,'phenomena':2,'gossamer.':1,'ideals':2,'homo':1,'kinds':2,'peter':1,'recognition':1,'lead':1,'cabbages':1,'ether':3,'mutation':1,'reaching':1,'cellulose':1,'stellar':2,'pressure':2,'enregistering':1,'instinct':4,'about':8,'rare':1,'getting':5,'mendelism':1,'biscuit':1,'sea-horse':1,'swimming':1,'warranty':1,'reptile':1,'washington':1,'promise':1,'registration':2,'protozoa':2,'properties--ready':1,'mississippi':1,'spiral':2,'invisibility':5,'fundy':1,'north':2,'interest':3,'surgeons.':1,'hundreds':2,'shark-like':1,'marquis':2,'cells':3,'variations':1,'graphite':1,'penetrating':1,'rabbits':2,'universal':1,'reptiles.':1,'periods':1,'ink':1,'crystals':2,'agriculture':1,'40':1,'other':7,'branch':1,'disposing':1,'star':1,'tides':4,'astronomy':5,'coloration':1,'association--why':1,'15-20':1,'liver':1},'newts':{'and':1},'scatter':{'over':1,'them':1},'weaker':{'stocks':1},'bent':{'out':2},'reeds':{';':1,'the':1,'are':1,'143':1},'process':{'and':2,'by':1,'like':1,'for':1,'may':1,'of':22,'is':2,'had':1,'.':3,'does':2,'went':1,'has':2,'was':1,'the':1,'advanced':1},'lock':{'that':1},'slim':{'contracting':1},'purposes':{'of':1,'which':1,'.':1},'pieces':{'and':1,'because':1,'of':11,'is':1,'.':1,';':1},'high':{'and':2,'rounded':2,'authority':1,'rate':1,'frequency':1,'something':1,'speed':2,'forehead':1,'temperature':1,'there':1,'.':3,'chemical':1,';':2,'mountains':2,'degree':1,'water':5,'foreheads':1,'perfection':1,'places':1,'level':3,'grounds':1,'at':1},'slip':{'down':1,'into':1},'class.':{'a':1},'educational':{'corporation':1},'sand-grouse':{'into':1},'mutually':{'beneficial':4},'destroying':{'sheep':1},'cycads':{'and':1,'our':1,'which':1},'astronomers':{'rely':1,'regard':1,'calculate':1,'wondered':1,'that':1,'of':1,'believe':4,'who':2,'prefer':1,'we':1,'however':1,'to':2,'now':1,'have':4,'in':1,'hold':1,'.':1,'think':6},'pair':{'of':5},'animal':{'and':6,'settles':1,'often':1,'family':1,'intelligence':1,'is':10,'it':1,'accumulates':1,'one':1,'as':2,'in':2,'frequents':1,'plankton.':1,'life--story':1,'well':1,'will':1,'enters':1,'from':1,'world...':1,'world--even':1,'ways':1,'heat.':1,'except':1,'.':3,'to':2,'or':3,'which':1,'youth.':1,';':1,'has':3,'divides':1,'more':1,'kingdom':4,'play':1,'complete':1,'may':4,'about':1,'but':1,'aware':1,'behaviour':6,'heat':1,'races':1,'lives':2,'tended':1,'somewhat':1,'instinct':2,'world':1,'with':2,'population':3,'a':3,'evolution':1,'microbes':1,'of':4,'could':1,'depending':1,'life':8,'behaviour.':4,'like':6,'remains':1,'s':3,'can':1,'man':1,'trypanosome':1,'the':1,'makes':2,'called':2},'hormones':{'has':1,'or':2,'which':1},'mysteries':{'of':1,'the':1,'which':1,'.':1},'palates':{'than':1},'establishment':{'of':13},'paler':{'type':1},'yellowish':{'then':1,'tinge':1},'stow':{'them':1},'await':{'an':1},'tied':{'on':1},'purpose.':{'1.f.5':1},'permanent':{'inhabitants':1,'caterpillar':1,'as':1,'future':1,'markings':1,'in':1,'residents':2},'lines.':{'these':1,'in':1},'men--primitive':{'men--races':1},'fits':{'the':1},'cabbage':{'found':1},'hawk':{'moth':1},'solidarity':{'with':1},'varied':{'from':3,'face':1,'electrical':1,'at':1,'in':1,'stock':1},'ingersoll':{'s':2},'voracity':{'.':1},'prawns':{'and':2},'element':{'from':1,'giving':2,'is':3,'after':1,'uranium':1,'.':3,'as':1,'going':2,'can':1,'in':7,'known':1,';':1,'into':1},'allow':{'them':1,'for':1,'disclaimers':1,'chemical':1,'part':1,'the':3,';':1},'okapi':{'and':2,'is':1,'was':1},'alloy':{'that':1},'food-canals':{'to':1},'volunteers':{'and':4,'associated':1,'with':1},'moulton.':{'according':1},'counted':{'the':1,'by':1,'for':1,'.':1},'archimedes':{'.':1},'thigh':{'on':1},'produces':{'a':2,'the':2,'only':1,'tides':2,'its':1},'frontispiece.':{'illustration':1},'phalanger':{'flying':1},'peck':{'their':1,'without':1},'move':{'on':1,'about':4,'towards':1,'up':1,'to':1,'through':1,'at':1,'in':1,'the':1,'with':1,'across':1},'produced':{'a':1,'on':2,'and':1,'by':13,'in':2},'nerve-cord':{'.':1},'existence.':{'when':1,'5':1,'if':1},'triassic':{'blue':1,'reptile':2,'for':1,'mammals':1,'when':1,'period':2,'era':1,'attained':1,'precede':1},'perfect':{'weather':1,'.':1},'saturn':{'and':1,'886.0':1,'is':3,'next':1,'itself':1,'uranus':1,'in':1,'november':1,'revolve':1},'broiling':{'heat':1},'progeny':{'from':1},'surgeons':{'of':1},'equalise':{'temperatures.':1},'coral-reefs':{'where':1,'are':1},'hermit-crab':{'and':3,'which':1,'stock.':1,'fixes':1,'s':1,'passed':1,'with':2},'meantime':{'with':1},'degrees':{'a':1,'from':1,'of':2,'.':1,'below':1,'centigrade':1},'spoiling':{'the':1},'instruments':{'and':2,'multiplied':1,'great':1,'used':1,'would':1,'for':1,'have':1,'of':2,'.':2,'as':1,'cannot':1,'sec':1,'are':2,'which':1,'or':1,'can':1},'tubeful':{'of':1},'derivative':{'works':3},'forest':{'and':1,'life':1,'to':1,'tract':2,'.':2,'primeval.':1,'in':1,'was':1},'rill.':{'no':1},'piecing':{'together':1},'existences':{'such':1,'which':1},'outlined':{'it':1,'.':1},'innermost':{'region':1},'ship':{'and':1,'when':1,'without':1,'through':1,'.':1},'billiard':{'table':1,'balls':1},'snake':{'to':1,'dasypeltis':1,'with':2,'pushes':1},'rotation':{'on':1,'increased':1,'caused':1,'it':1,'.':3,'of':6,'than':1},'cage':{'professor':1,'in':1},'realize':{'the':1},'intelligent':{'and':2,'control':1,'use':1,'interest':1,'they':1,'efficiency':1,'educability':1,'way':1,'attention':1,'beings':1,'actions':2,'behaviour':4,'appreciation':2,'insect':1,'student-citizen':1,'learning':1,'activity':1,'device':1,'learning.':1,'creatures':1},'traced':{'on':1,'back':1,'its':1},'concave':{'and':1},'sufficiently':{'close':1,'generous':1,'shallow':1,'hard':1,'low':1},'vibrations':{'and':1,'of':1,'in':2,'constituting':1,'must':1},'truth':{'that':1,'of':1,'though':1,'but':1,'they':1,'in':4},'invertebrates':{'and':1},'persia':{'turkestan':1},'accompanied':{'by':2},'beneath':{'shines':1,'the':8},'stock':{'separated':1,'and':3,'of':4,'spreading':1,'took':1,'marked':1,'.':5,'to':2,'as':1,'common':1,'in':1,';':1,'has':1,'was':1,'the':4},'traces':{'of':4,'are':1,'which':1,'in':1},'enigmatic':{'objects':1},'profile':{'view':4},'salps':{'related':1},'beginner':{'s':1},'doing':{'clever':1,'damage.':1,'things':1,'work':1,'when':1,'.':1,'this':1,'apparently':1},'sidelight':{'on':1},'society':{'society':1,'the':1,'made':1},'frequency':{'of':2,';':1},'static':{'to':1},'irritation':{'may':1},'agriculture':{';':2},'wander':{'separately':1},'witness':{'a':1,'an':1},'fundamentally':{'instinctive':1},'colour-varieties':{'there':1,'which':1},'knickerbocker':{'press':1},'bad':{'debts.':1,'business':1},'venom':{'on':1},'dominated':{'by':1},'adaptive':{'to':1,'radiation.':1,'device--more':1},'architecture':{'though':2},'harvest-mouse':{'constructing':1},'shut':{'our':1,'to':1,'their':1},'thrush':{'seized':1,'s':3,'managed':1,'at':2,'which':1},'perish':{'if':1},'incalculable':{'and':1,'abundance':1,'millions':1},'decay.':{'sec':1},'body-cavity':{'fluid':1},'surely':{'a':1,'follows':1,'is':1,'have':1,'the':1,'difficult':1},'steering':{'.':1},'shortest':{'waves':2,'.':1},'things.':{'lord':1,'reliable':1,'contrast':1},'apprehend.':{'the':1},'pursuits.':{'everything':1},'could':{'just':1,'be':20,'it':2,'resist':1,'see':2,'skate':1,'exist':1,'at':1,'have':1,'measure':1,'extract':1,'use':1,'make':2,'actually':1,'survive':1,'then':1,'we':1,'run':1,'form':1,'stop':1,'discover':1,'possibly':2,'produce':2,'not':8,'believe':1,'fly':2,'photograph':2,'boast':1,'keep':1,'harness':1,'support':1},'tube-feet':{'are':1},'david':{'fife':2},'length':{'and':1,'about':1,'may':1,'of':14,'is':1,'.':6,'as':1,'7':1,'were':1,';':1,'has':1},'removing':{'any':1},'stimulate':{'organs':1},'gamekeeper':{'but':1},'granules.':{'from':1},'respond':{'to':1,'when':1},'blown':{'by':1,'to':1,'into':1,'away':2,'back':1},'scene':{'of':1,'showing':1,'with':1,'in':6},'earth':{'and':21,'receives':1,'often':1,'escapes':1,'revolves':1,'is':13,'within':1,'rotated':1,'it':4,'slowing':3,'down':1,'as':2,'259':1,'are':2,'in':4,'yet':1,'before':1,'even':1,'passes':1,'from':4,'for':3,'to':4,'giving':1,'began':1,'there':3,'when':3,'except':1,'.':36,'how':1,'does':1,'take':1,'which':5,'mars':1,'passing':2,';':3,'must':1,'was':3,'naturally':1,'circles':1,'became':1,'we':3,'turning':1,'passed':1,'that':1,'may':1,'completed':1,'were':3,'but':2,'92.9':1,'although':2,'included':1,'during':2,'on':2,'with':3,'by':1,'he':1,'a':1,'rotating':1,'has':2,'to-day':2,'would':3,'14':1,'always':1,'did':3,'of':2,'no':1,'itself':2,'against':1,'will':3,'s':24,'owing':1,'so':1,'had':2,'intercepts':1,'the':6,'pulled':1,'or':2,'turns':1,'at':3},'owner':{'and':1,'would':1,'of':3,'.':1,'s':1,'any':1},'blows':{'its':1},'scent':{'a':1,'of':1,'no':1},'interest.':{'as':1},'buoyed':{'up':1},'two.':{'illustration':1,'but':1},'light--visible':{'and':1},'fascinating':{'study':1,'tantalising':1,'spectacle':2},'behaves':{'so':1,'in':1},'system':{'and':7,'comets':1,'is':2,'as':2,'sec':1,'are':3,'in':2,'would':1,'once':1,'there':1,'.':11,'to':1,'revolving':1,'has':1,'was':2,'then':1,'we':1,'full':1,'ranged':1,'formed':1,'but':2,'with':1,'by':1,'must':1,'for':1,'of':9,'will':1,'the':5,'mean':1,'at':1},'sea-lilies':{'crustaceans':1,'water-fleas':1},'world--even':{'the':1},'opossum':{'carrying':2},'time--man':{'s':1},'king-crabs':{'.':1},'travelled':{'far':1,'at':1},'egg-layer':{'in':1},'thick.':{'the':1,'we':1},'interests':{'it':1},'accompany':{'actual':1},'stars':{'and':5,'comets':1,'enormously':1,'show':1,'being':1,'is':1,'within':1,'visible':1,'as':1,'sec':1,'are':13,'have':1,'in':4,'whose':1,'tending':1,'appear':1,'stretch':1,'circulating':1,'.':13,'to':1,'varies':1,'does':1,'which':6,'going':1,'themselves':1,'has':3,'across':1,'can':1,'we':3,'form':1,'that':1,'forming':1,'let':1,'with':1,';':2,'a':1,'pull':1,':':2,'like':1,'of':1,'into':1,'will':1,'thin':1,'were':2,'the':4,'planet':1,'or':3,'at':1},'quarry':{'.':1},'depressing':{'energy':1},'stimulation--giving':{'off':1},'prominent.':{'the':1,'5':1},'steel':{'we':1,'civilisation':1},'quietness':{'of':1},'migrating':{'of':1,'from':1},'poulton':{'s':1},'extraordinarily':{'efficient':1,'mammal-like':1,'like':2,'gaunt':1},'wicketed':{'sides':1},'negatively':{'electrified.':1,'charged':1},'steep':{'and':1,'mountain':1,'ladder':2,'cliff':1},'torrent':{'.':1},'undercharged':{'body':1},'ingenious':{'methods':2},'platypus':{'of':3},'partnership':{'commensalism':1,'is':2,'with':3,'between':2},'poisons':{'including':1,'which':1,'.':1},'gently':{'through':1,'with':1},'gentle':{'reactions':1},'affinities':{'both':1,'to':1},'clearly':{'necessary':1,'that':1,'defined':1,'of':1,'showing':1,'marked':1,'or':1,'seen':1,'visible':1,'in':2,'drawn':1,'worked':1,'outlined':1},'viewed':{'copied':1,'or':1},'food-debris':{'millennium':1},'depict':{'quite':1},'studying':{'head':1,'the':2},'possibility.':{'it':1},'mechanism':{'of':1},'decomposing':{'animal':1},'ashore':{'.':1},'photosphere':{'that':2,'there':2,'but':1,'.':2,'surrounding':1,'as':1,';':1,'beneath':1,'shows':1},'scooping':{'in':2,'out':1},'sirius':{'the':1,'8.7':1},'persistence':{'of':1},'accuracy':{'when':1,'than':1,'.':1},'worldwide':{'task':1},'brazil':{'18':1},'regard':{'them':1,'these':1,'it':1,'to':15,'as':1,'the':3},'shaped':{'as':2,'like':1,'something':1,'in':1},'seed-box':{'but':1,'.':1},'device':{'whereby':1,'for':1,'this':1,'of':1,'is':1,'to':1},'so-called':{'flying':1,'abdominal':1,'grouse':1,'chameleon':1,'sargasso':1,'rings':1,'electro-magnetic':1,'rays':1,'anvil':1},'river-mussels':{'yielded':1},'predacious':{'creatures':1},'tramps':{'the':1},'bred':{'to':1},'stronger':{'and':1,'.':1,'should':1},'curiously':{'enough':1,'wasplike':1},'face':{'a':2,'tentatively':1,'set':1,'certain':1,'is':1,'illustration':1,'.':1,'to':4,'allowing':1,'directly':1,'of':4,'166':1,'with':1,'region':2},'perceiving':{'moving':1},'kipling':{'s':1},'mechanical':{'skill':1,'energy':5,'apparatus':2,'means':1},'wounded':{'in':2},'brer':{'rabbit--who':1},'fact':{'a':1,'about':5,'led':1,'for':1,'that':35,'remains':1,'of':8,'is':16,'less':1,'means.':1,'.':2,'to':1,'so':1,'too':1,'which':1,'in':1,'emphasized':1,'was':1,'the':1},'atmosphere':{'and':4,'heavy':1,'all':1,'from':1,'of':3,'is':1,'it':1,'but':1,'.':4,'will':2,'without':1,'envelops':1,'catch':1,'absorbs':1,'the':1,'rises':1,'was':1,'or':1,'nor':1},'best-defined':{'period':1},'nest-building':{'and':1,'in':1},'woolly':{'rhinoceros':2,'opossum':2,'caterpillars':1},'bring':{'me':1,'about':3,'modern':1,'down':3,'their':1,'forth':2},'14.--the':{'moon':1},'evolutionary':{'prospect':3,'process':1,'results':1,'spiral':1,'tack':1,'steps':1,'significance':1,'method':1,'change':1},'manchester':{'used':1,'chemist':1},'lloyd':{'morgan':4},'rough':{'surfaces':1,'awns':1},'principal':{'of':1,'office':1},'trying':{'time':1,'to':7,'first':1,'it':1,'one':1},'championed':{'evolutionism':1},'jaw':{'and':1,'from':1,'of':3,'belong':1,'seems':1,'but':1,'which':1,'the':1},'jar':{'and':1,'the':1},'should':{'it':2,'see':3,'expect':2,'have':7,'go':1,'find':1,'differ':1,'there':1,'also':2,'naturally':1,'be':19,'get':2,'they':1,'not':4,'fly':1,'remember':1,'gather':1,'say':2,'experience':1,'greatly':1,'think':1,'at':1},'buttons':{'on':1,'occasionally':1},'unpalatable':{'mimicked':1,'insects':1,'things':1,'.':2,'sponge':1,'caterpillars':1,'or':1},'planted':{'in':1},'molecules':{'is':1,'deep':1,'as':1,'are':2,'have':2,'in':2,'250':1,'travel':1,'.':4,'thick.':1,'cling':1,'into':1,'then':1,'which':2,'form':1,'that':1,'cannot':1,'let':1,'by':1,'of':16,'large':1,'small':1,'at':1},'volts':{'.':1},'hope':{'to':1,'that':4,'.':1},'meant':{'a':2,'even':1,'for':1,'many':1,'to':3,'much':2,'utilising':1,'entering':1,'in':1,'the':3,'total':1,'transcending':1,'by':3,'more':1},'handle':{'there':1,'off':1,'than':1,'in':1},'means':{'over':1,'an':3,'in':1,'any':1,'power.':1,'for':3,'no':1,'.':1,'much':1,'girdling':1,'more':1,'we':1,'that':15,'half':1,'losing':1,'a':5,'mastery':1,'of':30,'foresight':1,'were':1,'making':1,'the':5,'first':1},'intellectually':{'.':1},'prohibition':{'against':1},'fronds':{'are':1},'a.c.':{'.':1},'h':{'the':1,';':1,'.':43},'molecule.':{'single':1},'taxes':{'on':1,'.':1},'summon':{'it':1},'hemispheres':{'and':1,'destined':1},'are.':{'for':1},'coco-nut':{'fibre':1,'shell':1,'palm':1},'stuff':{'from':2,'which':1,'into':1,'.':1,'they':1,';':1,'began':1,'out':1},'bayliss':{'has':1},'inter-relation':{'established':1},'memory-image':{'of':1},'tap.':{'watch':1},'strengthened':{'when':1},'frame':{'the':2},'shreds':{'as':1},'packet':{'containing':1,'no':1,'turned':1,'though':1},'elusiveness':{'there':1,'so':1},'bolivia.':{'illustration':1},'5.--diagram':{'showing':1},'once.':{'in':1},'carboniferous':{'blue':1,'flora':1,'forests':1,'period':4,'epoch':1,'eras':1,'were':1,'the':2,'.':1,'era':1},'frog-hoppers':{'while':1},'packed':{'with':1,'together':1},'ascends.':{'illustration':1},'wire':{'or':1,'that':1,'is':1,'an':1,'to':1,'so':1,'they':2,'between':1,'leaves':1,'the':2,'its':1},'growths':{'on':1},'jurassic':{'archaeopteryx':1,'is':1,'period':2,'yellow':1,'era':1,'which':1},'nuclear':{'bodies':1},'migrations':{'were':1,'are':1,'have':1,'occurred':1},'germ-cell':{'just':1},'quickest':{'to':1},'white-hot':{'metal':2,'hydrogen':1,'iron':1,'.':1},'membrane':{'and':1},'open-sea':{'or':1,'animals':4,'cetaceans':1,'crustaceans':1,'young':1,'knife-blade-like':1,'prawns':1,'bacteria':1},'self-preservative':{'fashion':1},'email':{'contact':1,'newsletter':1,'business':1},'ends':{'and':2,'on':1,'of':2,'marked':1,'lizzie':1},'explosive':{'manifesting':1,'life':1,'rush':1,'by':1},'trilobite':{'90':1,'trilobites':1,'in':1},'ancestry--are':{'branches':1},'seaweeds':{'and':2,'among':1,'are':1,'which':1,'growing':1,'the':1},'ignorance':{'of':1,'preyed':1},'wave-motions':{'of':1,'are':1,'can':1},'wingless':{'insects':1,'larval':1,'creatures':1},'hoatzin':{'inhabits':2},'reappears':{'in':1},'restrictions':{'whatsoever':2},'drum':{'to':2},'migration.':{'looking':1},'figures':{'to':1,'we':1,'with':1,'are':3,'.':1},'cinder':{'.':1},'humanoid':{'to':2,'precursors':1,'stock':4},'adjusted':{'on':2,'coloration':1,'in':1},'co':{'.':2},'conflagration':{'had':1,'that':1},'conclude':{'our':1,'that':1},'ca':{'the':1},'mid-rib':{'and':2},'vibration.':{'no':1},'sea-worms':{';':1},'cv':{'the':1},'hawkins':{'from':1},'palm-bones':{'and':1,'the':1,'cmc':1},'8.7':{'procyon':1},'trigger-pulling':{'.':1},'dazzling':{'light':1},'body-cells.':{'it':1},'poured':{'a':1,'on':1},'looting':{'and':1},'duckweed':{'usually':1},'feather':{'as':1,'which':1},'waste':{'matter':2,'energy':1,'to':1,'heat':1,'products':1,'its':1},'descent.':{'retrospect':1},'c.':{'punnett':1},'coherence':{'of':2},'mammals.':{'the':1,'now':1,'what':1,'cretaceous':1},'tycho':{'upper':1},'neighbour':{'succeed':1,'.':1},'accident':{';':1,'.':1},'forests.':{'the':1},'domestication.':{'instinctive':1},'expounded':{'with':1},'spain':{'this':1,'showing':2,'179':1,'show':1},'gradual':{'building':1,'unfolding':1,'evolution':1,'establishment':1,'alterations':1,'sifting':1,'increase':2,'migration':1,'emancipation':1,'shading':1,'assortment':1,'ascent':1,'emergence':1,'change':2},'nerve-fibre':{'branches':1,'ends':1,'s.f.':1,'from':1,'or':1},'triggers':{'of':1},'reminiscence':{'as':1},'lung-fishes':{'or':1,'that':1},'lichen':{'and':1,'where':1},'pictures':{'guesses':1,'for':1,'that':1,'of':1,'.':2,'they':1,'the':1},'deductible':{'to':1},'discoveries':{'made':2,'which':2,'that':1,'of':4,'.':1,'have':2,'in':2},'spectrum--should':{'be':1},'salmo':{'all':1},'omne':{'vivum':1},'vm':{';':1},'adventures':{'at':1},'excessively':{'small':1,'minute':3},'raison':{'d':1},'jenner':{'weir':1},'carbohydrates':{'e.g':1},'of.':{'a':1},'fashioning':{'of':1,'beautifully':1},'spends':{'the':1},'romance':{'of':5,'to':1},'concealed':{'among':1,'beneath':1},'colony.':{'within':1},'estuaries':{'and':3,'while':1,'are':1,'penetrated':1},'outbreak':{'must':1},'nebulae.':{'some':1,'illustration':1,'in':1},'unimaginable':{'energy':1},'lichen;':{'one':1},'mud-skipper':{'periophthalmus':3},'emotionally':{'excited':1},'dusk':{'of':1,'is':1,'does':1},'wisest':{'not':1},'upon':{'it.':1,'a':3,'them':1,'another':1,'marquis':1,'insects':1,'men':1,'request':1,'it':3,'one':1,'water':1,'and':1,'as':1,'itself':1,'they':1,'the':26,'an':1,'its':3,'by':2},'v.':{'experiential':1},'infinite':{'temporal':1,'space':2,'in':1,'number':1,'time':1},'britain.':{'iv':1},'identity':{'of':1},'transformation--the':{'heat':1},'genus':{'eoanthropus':1,'oncorhynchus':1,'which':1},'off':{'and':1,'the':19,'into':1,'as':2,'at':2,'another':1,'in':4,'throughout':1,'fine':1,'again':1,'rays':1,'from':8,'intruders':2,'.':3,'other':1,'crowds':1,'neolithic':1,'his':1,'intruding':1,'half':1,'such':1,'by':3,'a':4,'on':1,'natural':1,'this':1,'of':1,'electrons':1,'gigantic':1},'mention':{'briefly':1,'the':1,'one':1},'tinge':{'is':1,'.':1},'colour':{'and':9,'almost':1,'is':1,'as':1,'in':1,'affects':1,'that':1,'.':6,'also':1,'does':1,'permanently':1,'disclosed':1,'which':1,'has':1,'seen.':1,'gives':1,'be':2,'corresponding':2,'means':1,'becoming':1,'with':1,'a':1,'being':1,'yellow-brown':1,'of':8,'depends':1,'the':1,'changes':2},'polyp':{'about':1},'directly.':{'some':1},'patterns':{'.':1},'cutting':{'down':1,'off':1,'at':1},'ear-passage':{'to':1,'into':1},'drawing':{'a':1,'shows.':1,'planetesimals':1,'food':1,'flying':1,'their':2,'by':4,'shows':2},'asymmetrical':{'flat-fish':1},'reefs':{'that':1},'negligence':{'strict':1},'flesh':{'and':2,'exposed':1,'of':1,'but':1,'are':1,'or':1,'available.':1},'moments':{'at':1},'gulls':{'pick':1},'flywheel':{'a':1,'and':1,'would':1,'.':2,'or':1,'if':1},'sea-dust':{'and':1,'always':1,'which':1,'.':1},'rooms':{'but':1},'predicts':{'the':1},'years':{'and':3,'required':1,'ago--a':1,'acquired':1,'life':1,'comprised':1,'1921':1,'as':1,'are':1,'in':4,'old':2,'yet':1,'before':4,'mercury':1,'invented':1,'would':1,'till':1,'with':1,'there':1,'.':13,'to':7,';':2,'must':1,'we':1,'ago.':3,'may':2,'after':1,'reached':1,'but':2,'it':1,'sink':1,'during':1,'elapsed':1,'dr':1,'he':1,'ago':28,'for':1,'these':1,'of':4,'work':1,'dealt':1,'the':4,'or':1},'paul':{'s':1},'glue':{'probably':1},'web':{'on':1,'of':2,'is':3,'site':4,'page':1,'which':1,'has':1,'pages':1},'generous':{'to':1,'lines':1,'if':1},'bibliography':{'elmhirst':1,'the':2,'darwin':1,'arrhenius':1},'lanugo':{'which':1},'apple--out':{'of':1},'transparent':{'layers':1,'all':1,'coating':1,'arrow-worm':1,'early':2,'azure':1,'open-sea':1},'ichthyosaurs':{'plesiosaurs':1},'combine':{'and':1,'to':1},'wet':{'cloth':1,'all':1,'weather':1,'moss':1},'5':{'and':1,'what':1,'has':1,'ft':1,'limbless':1,'1909':2,'mind':1,'per':1,'.':8,'feet':2,'matter':1,'000':5,'5':1,'in':1,'the':1,'mimicry':1,'500':1,'shows':1},'practise':{'self-effacement':1,'parental':1},'increased':{'power':1,'freedom':1,'its':1,'liberation':1,'masterliness':1,'difficulties':1,'at':1,'in':1,'our':1,'the':2,'still':1,'by':1,'production':1},'government':{'or':1},'biologists':{'have':1,'that':1},'new--a':{'restless':1},'smithsonian':{'report':10},'mathura':{'on':1},'increases':{'our':1,'.':1,'in':1},'five':{'digits':1,'hundred':3,'minutes':1,'of':1,'million':1,'times':3,'feet':1,'to':1,'straws':1,'she':2,'in':1,'--and':1,'vertebrae':1,'years':1,'.':1,'or':3,'millions':1},'belgium':{'the':1},'tick':{'a':1,'for':1,'one':1},'descendant':{'of':2},'backboned':{'race':1,'animals':9,'animals.':1},'onion':{'round':1},'258':{'the':1,'electrons':1},'parasite':{'and':1,'to':1,'from':1,'like':1},'glass-eels':{'about':1},'two-thousandths':{'of':1},'ductless':{'glands':2},'nerves':{'and':1,'of':1,'which':1,'.':1},'inexperienced':{'enemies':1},'replacement':{'of':1,'copy':2,'or':3},'gaining':{'a':1,'strength':2},'indications':{'even':1},'habitat':{'and':1,'penetrate':1,'or':1},'underwent':{'great':1,'an':1},'gossamer.':{'on':1},'daylight':{'.':1},'choosing':{'times':1},'paving-stones':{'green':1},'restlessness.':{'they':1},'transport':{'as':1},'avoid':{'a':1,'the':2,'reading':1},'dago':{'dagoes':1},'mars.':{'but':1},'does':{'we':1,'no':1,'this':4,'energy':1,'comparatively':1,'it':2,'but':1,'.':3,'much':1,'so':4,'at':2,'cannot':1,'in':1,'not':35,'the':1,'its':1},'passion':{'plunged':1},'cylindrical.':{'5':1},'mammoth.':{'the':1},'biology':{'of':1,'in':1},'blowing':{'upon':1},'predispositions':{'to':1,'of':1},'selecting':{'individual':1,'out':1},'tenability':{'of':1},'performances.':{'a':1},'pressure':{'and':2,'would':1,'inside':1,'so':1,'in':2,'the':2,'etc.':1,'currents':1},'enregistering':{'these':1,'the':1,'within':1},'century.':{'during':1,'illustration':2},'abdominal':{'ribs':1},'germination':{'and':1},'r':{'and':1,'.':14},'cribb.':{'boiling':1,'transformation':1},'hiding':{'them':1},'gained':{'most':1,'racial':1,'considerable':1,'proof':1},'mammoths':{'.':1},'asks':{'at':1,'why':1,'that':1},'seeds':{'and':1,'because':1,'for':1,'of':3,'.':1,'can':1,'become':1,'themselves':1,'with':1},'bounded':{'by':1},'swimming':{'and':2,'gently.':1,'experience':1,'ostrich':1,'persons':1,'near':1,'in':5,'diving':1,'across':1},'letters':{'of':2,'in':1},'elephants.':{'the':1},'hermit-crabs':{'hide':1,'place':1,'it':1,'have':1},'lung':{'and':1,'the':1,'.':1},'tiny':{'knob':1,'bags':1,'freshwater':1,'rill.':1,'irregular':1,'shift':1,'molecules':1,'fragments':1,'drops':1,'whirlpool':1},'cultivated':{'plants':6,'the':1,'wheat':1,'ear.':1,'in':1},'protozoa':{'and':2,'to-day':1,'which':1,'is':1,'should':1,'to':1,'as':1,'are':1,'sponges':1,'in':2,'animals':1,':':1,'like':1},'offices.':{'sec':1},'swimmers':{'and':2,'include':1,'nekton':1},'charities':{'and':1},'mere':{'density':1,'molluscs':1,'bulk':1,'visible':1,'cooling':1,'specks':1,'position':1,'association':1},'parentage':{'of':2},'67000':{'inch':1},'larvae':{'hanging':1,'or':1,'which':3,'in':1},'slow-worm':{'is':1},'half-monkeys':{'or':1},'larval':{'state':1,'stages':2,'salmon':1,'period':1,'stage':1},'spots':{'and':1,'on':2,'like':1,'of':1,'or':1,'increase':1,'are':1,'which':1,'the':2,'where':1,';':1,'must':1},'scanty':{'remains':2,'and':1,'fossil':1,'plankton':1},'recognised':{'and':1,'for':1,'as':1,'in':2,'moreover':1,'by':2},'hundred-millionth':{'of':1},'place.':{'illustration':1,'one':1},'specimens':{'of':1,'in':1,'were':1},'naturally':{'prolific':1,'give':1,'trails':1,'finds':1,'expect':1,'came':1,'appears':1,'opens':1,'he':1},'function':{'of':1,'in':1},'funnel':{'through':1},'cosmopolitan':{'in':1},'surgeons.':{'every':1},'washerwoman':{'and':1},'construction':{'underwent':1,'from':1,'of':2},'convergence':{'the':1},'basin':{'of':1},'contraction.':{'uranium':1},'count':{'them':1,'the':1,'for':3},'marquis':{'wheat':4,'.':1},'evident':{'in':1},'shrunk':{'by':1},'gravitational':{'pull':2,'influence':2,'theory':1,'attraction':2},'official':{'project':1,'observatory':1,'version':1,'page':1},'smooth':{'continuance':1,'carapaces':1,'formation':1,'atoms':1},'triumphant':{'flight':1},'excitement':{'though':1,'.':1},'placed':{'a':1,'on':3,'them':2,'for':1,'exactly':1,'an':1,'to':1,'at':1,'in':2},'frugivorous':{'stock':1},'convince':{'us':1},'monument':{'of':1},'problem':{'no':1,'of':10,'could':1,'.':2,'as':1,'surely':1,'the':1,'is':2},'profusion':{'.':1},'bearing':{'protrusible':1,'on':1,'batteries':1,'this':1,'the':1},'irish':{'elk':1},'ferocious.':{'embryological':1},'recognize':{'water':1},'nearness':{'to':1,'of':2},'rubble':{'innumerable':1},'faintness':{'.':1},'slowing':{'down':8,'down--the':1},'arms.':{'this':1},'beach.':{'but':1},'leptocephalus.':{'2':1},'aristotle':{'observed':1,'s':1,'or':1},'ink':{'in':1},'www.gutenberg.org':{'this':1,'title':1,'you':1,'2':1,'1.e.2':1},'effected':{'a':2,'within':1,'by':3,'in':1},'planting':{'it':1},'expensiveness':{'of':1},'readjustments':{'of':1},'radiolarians':{'and':1,'of':1,'with':1},'variety':{'and':1,'of':16,'is':1,'after':1,'surpassed':1,'.':2,'has':1,'with':1},'tenth':{'printing':1},'eastern':{'baltic':1},'forests':{'and':2,'a':1,'from':1,'which':1,'that':1,'of':4,'there':1,'.':1,'roamed':1,'in':1,'the':2,'he':1},'slumbers':{'in':1},'reach.':{'animal':1},'details':{'of':2,'is':1,'revealed':1},'behold':{'a':1},'thickness--a':{'sea':1},'outlines':{'of':1,'at':1,'spectroscopy':1},'repeat':{'all':1,'gives':1,'that':1},'again.':{'moreover':1,'illustration':2,'that':1},'in:':{'http:':1},'tides':{'and':3,'we':1,'which':2,'than':1,'of':1,'had':1,'it':1,'but':1,'.':6,'will':1,'to':1,'ranked':1,'are':4,'have':1,'act':1,'at':1,';':1,':':1,'the':1,'290':1,'must':1},'casque':{'is':1},'subtlest':{'of':1},'again:':{'the':1},'in.':{'with':1},'13.--saturn':{'november':1},'ideals':{'which':1,'in':2},'shattering':{'itself':1},'veil':{'of':1},'coloration':{'and':1,':':2,'is':1,'when':1,'serves':1,'coloured':1,'will':1,'the':1,'.':1,'or':3},'exposure':{'to':1,'of':1},'draperies':{'gliding':1},'bivalve':{'mollusc':1,'shell.':1},'lasted':{'beyond':1,'or':1,'for':1},'rule':{'and':1,'feed':1,'we':1,'that':1,'is':1,'two':1,'exist':1,'in':1,';':1,'out':1},'eddies':{'of':1,'rising':1},'pitt':{'offered':1},'gardens':{'in':1},'practicability':{'of':1},'three-toed':{'horse':2},'surrounding':{'stimuli.':1,'space':2,'colour':1,'flesh':1,'them--are':1,'sky--this':1,'world':1,'the':2,'gravel':1,'conditions':1,'ether':1,'bodies':1},'magnetic':{'force':1,'storm':1,'circuits':1,'phenomena':1,'sense':1,'storms':2,'effect':1,'deflection':2,'field':7,'circuit':2,'field--which':1,'action':1},'saves':{'their':1},'desirable':{'for':1},'rapid':{'and':3,'abbreviation':1,'precisely':1,'often':1,'power':1,'striking':1,'colour-change':3,'series':1,'that':2,'passage':1,'motion':1,'as':1,'way':1,'waves--the':1,'elimination':1,'succession':1,'changes':1,'than':1,'change':1,'movement':1},'nursery':{'for':1},'controversial':{'stage':1},'crete':{'greece':1},'oldest':{'known':3,'of':1,'rocks':1,'stars':1,'egyptian':1},'worked':{'flints':1,'up':1,'itself':1,'steadily':1,'the':1,'by':1,'out.':1,'out':8},'1915.':{'a':1,'magnetic':1,'electrons':1,'geological':1},'ceases':{'to':1,'.':1},'physiological':{'life':1,'expensiveness':1,'point':1,'equilibrium':1,'partnership':1,'evidence':1,'characters.':1,'inequilibrium':1,'action':2,'difference':2,'types':1,'proof':1},'ventral':{'lungs':2,'scales':1},'centrosome':{'introduced':1},'neighbours':{'of':1,'.':1},'microscopist':{'named':1},'mckready':{'a':1},'diverted':{'into':1},'worth':{'remembering':1,'dwelling':1,'having':1,'.':1},'alternating':{'current':1,'occurrence':1,'yellow':2},'them--which':{'give':1},'aurora':{'borealis':4,'is':1},'waters--the':{'dry':1},'impinged':{'on':1},'coal-measures':{'the':2,'were':1},'alevins':{'which':1},'slowed':{'down--sometimes':1},'exaggerate':{'the':1},'pinch':{'of':2},'cmc':{';':1},'globule':{'about':1},'nondescript':{'not':1},'jungle-fowl':{'of':1},'290':{'photo':1,'the':1},'291':{'photo':1},'dwindled':{'away':1,'vestiges':1},'speck':{'of':2,'against':1},'tree-kangaroos':{'tree-sloths':1},'labyrinthodonts':{'some':1},'surmounting':{'the':1},'overlying--the':{'photosphere':1},'seas.':{'perhaps':1,'evolution':1,'like':1,'recent':1},'microscopists':{'and':1},'------':{'------':2,'866400':1,'2163':1},'others.':{'1.d':1},'them--are':{'of':1},'alsatian':{'wolf-dog':2},'neap':{'tides':1},'580':{'000':1},'calcium':{'vapour':1},'gatepost':{'208':1,'the':1},'lizard':{'which':2,'is':1,'they':1,'chlamydosaurus':1,'draco':1,'called':1},'consequent':{'changes':1,'aridity':1},'lampreys':{'petromyzon':2},'glands':{'notably':1,'such':1,'of':1,'on':1},'salt-accumulation':{'is':1},'reconstruction':{'of':2,'by':2},'toll':{'to':1},'suppose':{'for':1,'that':8,'it':1,'at':1,'each':1,'the':2},'consisting':{'of':2},'told':{'edited':1,'in':1,'author':1,'us':1,'that':1},'crunch':{'with':1},'machine.':{'a':1},'simultaneously':{'.':1},'sinks':{'down':1,'again':1,'and':1,'into':1},'lithosphere':{'is':1},'human':{'and':1,'embryo':7,'development.':1,'ingenuity':1,'being':2,'sense':1,'mind':2,'society':1,'beings':2,'thought.':2,'in':3,'knowledge.':1,'use':1,'eye':2,'ovum':1,'remains':2,'.':1,'tail':1,'civilisation.':1,'progress':5,'type':1,'body':3,'progress.':1,'kind':1,'gestures':1,'races':1,'blood':3,'characters':1,'ear':2,'mind.':1,'evolution':1,'branches':1,'evolution--factors':1,'skull':4,'brain':4,'was':2,'ascent.':1,'face':1,'race':3,'limit':1,'qualities':1,'teeth':1,'life.':1,'institutions':1},'kindred':{'and':1,'on':1,'animals':1,'especially':1,'.':1},'residual':{'gases':1},'out-flowing':{'lobes':1,'processes':1},'protection':{'for':1,'of':2,'possessed':1,'.':1,'also--protection':1,'implied':1,'every':1,'before':1},'pursuit':{'and':1},'ploughed':{'field':1},'promiseful':{'life':1},'obtained':{'our':1,'by':1,'would':1,'.':1},'aerial.':{'the':1},'daughter':{'colonies':1},'items':{'and':1,'among':1,'are':1,'tend':1},'frog-hopper':{'becomes':1,'makes':1},'anchor':{'.':1},'smoke':{'a':1,'no':1,'in':1,'that':1},'browsing':{'by':1},'bettered':{'surroundings':1},'otters':{'and':1,'it':1,'foxes':1},'glittering':{'points':1},'diameter':{'and':1,'for':1,'of':7,'is':2,'there':1,'number':1,'.':4,'lifts':1,'are':1,';':2,'one':1,'whereas':1},'secure':{'a':1,'and':1,'that':1,'survival':1,'evidence.':1,'position':1,'the':4,'floating':1},'discontinuous':{'variation':1},'-cell':{'with':2},'highly':{'probable':8,'endowed':1,'interesting':1,'magnified.':1,'developed':3,'probably':1,'intelligent':1,'specialized':2,'perfected':1},'lafayette.':{'the':1},'opportunities':{'to':1,'animals':1,'for':1,'.':1},'glance':{'at':1},'total':{'loss':1,'or':1,'of':2,'energy':1,'number':1,'thickness':2,'amount':1,'solar':2,'emancipation':1,'length':1,'age':1,'as':1,'quantity':1},'experimentation':{'in':1},'plot':{'at':1},'answers-back':{'that':1},'alligator':{'yawning':2},'grounds':{'of':1,'.':1},'negative':{'and':1,'electricity':10,'electricity.':1,'taken':1,'pole':2,'are':1,'units':1,'the':1},'reid.':{'sir':1,'common':1},'crocodilian':{'various':1},'mightiest':{'elevators':1},'knoll':{'and':1},'girdling':{'the':2},'thorndike':{'s':1,'says':1,'hits':1,'is':1},'recuperate':{'by':1},'separated':{'from':2,'freshwater':1,'off':4,'by':1,'.':2},'traceable':{'back':1},'ascribe':{'it':1},'aware':{'of':7,'that':1},'separates':{'the':1,'monkeys':1,'it':1},'continual':{'sinking':1,'motion':1,'motion.':1,'occurrence':1},'allies':{';':1,'in':1},'dando.':{'orang-utan':1,'young':1,'chimpanzee':1},'society.':{'professor':2},'twenty-one':{'miles--in':1},'antenna-bearing':{'segmented':1},'crest':{'to':4,'.':1,'so':1,'or':1,'of':1},'books.':{'each':1},'work':{'and':7,'associated':2,'is':6,'within':1,'as':1,'in':8,'any':1,'electronically':2,'out':2,';':2,'from':1,'recorded':1,'.':10,'to':2,'offers':1,'which':1,'under':1,'you':2,'if':1,'badly':1,'that':1,'may':1,'with':1,'by':1,'on':3,'b':1,'of':6,'well':2,'against':1,'without':2,'can':1,'the':3,'or':8},'eclipse':{'may':2,'of':7},'worm':{'invasion':1,'the':1,'on':1,'.':1},'worn':{'down':1,'and':1},'theories':{'may':1,'of':5,'to':1,'have':1,'dispense':1,'put':1},'mammalian':{'heart':1,'evolution':1,'mother':1,'golden':1},'eighteen':{'to':1},'era':{'and':2,'what':1,'there':1,'miocene':1,'jurassic':1,'of':2,'silurian':1,'when':1,'corresponds':1,'.':6,'in':3,'after':1},'transparency':{'or':1},'already':{'a':2,'existed':1,'we':1,'learnt':1,'likened':1,'spoken':1,'use':1,'dead':1,'and':1,'known':1,'been':1,'have':1,'mentioned':1,'seen':1,'the':1,'referred':2,'at':1},'ascetic':{'non-growing':1},'radiance':{'from':2},'indicated':{'to':1,'by':3,'in':1},'cited':{'as':1},'india':{'146':1,'and':1,'into':1,'it':1,'malay':1,'persia':1,'.':1},'indicates':{'a':3,'the':2},'fanciful':{'imaginings':1},'present-day':{'and':1,'forms':1,'animals':1,'science':1,'theories':1,'survivors':1,'mud-fishes':1},'immemorial.':{'in':1},'aerated':{'and':1},'handiness.':{'the':1},'inhabitants':{'of':2,'is':1},'finger-post':{'on':1},'crumbs':{'from':3},'egyptian':{'tombs':1},'nuts':{'these':1,'it':1,'193':1,'for':1},'makes':{'a':4,'and':1,'for.':1,'for':1,'no':2,'this':1,'adjusting':1,'some':1,'it':5,'us':1,'an':1,'against':1,'the':9,'tree-stems':1,'its':3,'more':1},'far':{'and':1,'less':1,'over':3,'back':1,'as':9,'at':1,'in':1,'south.':1,'beyond':1,'out':1,'given':1,'end':1,'for':1,'away':2,'since':1,'exceeding':1,'been':1,'.':2,'behind':1,'too':4,'above':2,'surpasses':1,'east':3,'more':5,'north':3,'greater':1,'that':1,'from':6,'transcending':1,'advanced':1,'on':1,'off':1,'ahead':1,'up':2,'below':2,'swing':1,'the':3,'south':1},'aerates':{'the':1,'them':1},'ordinary':{'fish':1,'tissues':1,'flower-vase':1,'single':1,'questions':1,'education':1,'tadpoles':1,'temperature':1,'chemical':1,'way':2,'mammals':1,'conditions':1,'protozoon':1,'life':2,'star':1,'wheats':1,'big':1,'routine':1,'pressure':1,'routine--not':1,'bony':1,'cells':2,'standards':1,'matter':3,'familiar':1,'mammal':1,'acceptation':1},'beach':{'which':1,'.':1},'gamble':{'writes':1,'continues':1},'discoveries.':{'already':1},'guanin':{'.':1},'fever':{'and':1},'transforming':{'the':1},'ladder':{'of':3},'after':{'and':1,'all':2,'they':3,'generation':1,'some':1,'it':1,'an':1,'satisfaction':1,'itself':1,'well-being':1,'lull':2,'another':7,'our':1,'repeated':1,'its':2,'what':1,'death':1,'fuller':1,'her':1,'cache':1,'hour':1,'by':1,'their':2,'millennium':1,'which':1,'marsh':2,'sojourning':1,'he':2,'head':1,'his':2,'branch':1,'undergoing':1,'that':2,'max':2,'william':2,'fritz':1,'five':1,'nearly':1,'birth':2,'new':1,'fifteen':1,'themselves':1,'man':1,'a':10,'spawning':2,'exposing':1,'being':1,'this':1,'floods':1,'professor':2,'prolonged':1,'element':1,'planet':1,'race':1,'t':2,'mr':1,'the':14,'marsh.':2,'wandering':1,'age':2,'lloyd':1},'movable':{'tongue':1,'.':1},'customs':{'point':1},'lay':{'their':2,'eggs':1,'there':1,'them':1,'emphasis':1},'outbursts':{'of':2,'have':1},'maxim:':{'it':1},'law':{'of':3,'.':1,'in':1,'but':1,'that':1},'meaningful':{'situation':1},'nipped':{'in':1},'elusive':{'and':1,'.':1},'cools':{'to':1},'appreciate':{'water':1,'a':1,'the':1},'greek':{'helios':1,'logos':1,'word':1,'tortoise':1,'eagle':1,'alphabet':1,'philosophers':1,'meaning':1,'thinkers':1},'verb':{'to':1},'green':{'chlorophyll':1,'yellow':1,'in':3,'plants.':1,'blue':2,'flagellates--the':1,'surroundings':1,'variety':1,'tree-snake':1,'frog':1,'hydra':2,'herbage':1,'plants':2,'ball':1,'seaweeds':1,'pigment':2,'ones':1,'phase':1,'box':1,'on':1,'grains':1,'of':1,'leaves':2,'lizard':1,'alga':1,'or':2},'parish':{'to':1},'coral-snake':{'can':1},'order':{'and':2,'than':1,'that':1,'diverging':2,'of':12,'is':1,'.':1,'to':4,'in':1,'the':1,'monkeys':1},'sandstones':{'and':2,'mudstones':1},'office':{'is':2},'borealis':{'the':1,'is':1,'would':1,'coloured':1},'satisfied':{'with':1},'pascal':{'s':1},'ancients':{'seem':1,'were':1},'japan':{'to':1},'bubbles':{'which':1},'breeding-place':{'represents':1,'corresponds':1},'yellow-crowned':{'penguin':2},'sheaf':{'of':2},'production':{'of':3,'as':1,'promotion':1},'precipitate':{'when':1,'which':1,'.':2},'split':{'so':1,'off':1,'up':5,'longitudinally.':1},'then':{'there':5,'rubs':1,'they':2,'able':1,'is':3,'violet':1,'it':8,'are':2,'have':2,'another--to':1,'consists':1,'follow':1,'intact':1,'find':1,'waited':1,'for':1,'may':1,'since':2,'uranium':1,'to':4,'another':1,'has':1,'sent':1,'supposed':1,'be':3,'we':3,'partly':1,'that':2,'our':1,'pecked':1,'took':1,'drew':1,'sprinkle':1,'imperfectly':1,'visits':1,'although':1,'endure':1,'dives--':1,'diminish':1,'unless':1,'he':2,'illustration':1,'perceived':1,'necessary':1,'succeeded':1,'wafts':1,'follows':1,'inhabiting':1,'departs':2,'a':2,'so':1,'red':1,'the':7,'round':1,'comes':1,'arose':1},'them':{'and':9,'the':3,'penetrating':1,'on':2,'insulators':1,'stream':1,'show':2,'is':2,'fall':1,'an':1,'down':1,'against':1,'as':3,'116':1,'including':1,'are':7,'have':4,'in':9,'protecting':1,'32':1,'before':2,'even':1,'sir':1,'he':1,'astronomy':1,'from':2,'would':1,'no':1,'perhaps':1,'deeply':1,'away':1,'there':1,'when':2,'off':1,'.':19,'up':2,'to':8,'call':1,'which':1,'black':1,';':2,'sluggish.':1,'was':1,'until':1,'more':1,'weigh':2,'that':2,'may':1,'after':1,'bipeds--we':1,'illustration':1,'were':1,'jumping':1,'if':1,'know':1,'they':1,'coming':1,'such':1,'now':1,'with':2,'by':2,'apart':1,'a':2,'both':1,'about':1,'give':1,'for':2,'indifferent.':1,'face':1,'always':1,'into':1,'but':1,'namely':1,'together':1,'grows':1,'though':1,'electrically':1,'conquer':1,'gigantic':1,'requires':1},'affected':{'by':4},'babies':{'born':1},'fragment':{'of':2},'locusts':{'and':1,';':1},'safe':{'and':1,'among':1,'both':1,'situations':1,'to':5,'as':1,'cradle':2,'in':2},'fabre.':{'a':1,'the':1},'young.':{'our':1,'the':1,'sec':1},'band':{'of':1,'across':1},'giraffe':{'the':1,'s':1,'coloured':1},'reconverted':{'in':1},'sack':{'of':1},'they':{'represent':2,'all':2,'show':4,'move':1,'soon':1,'go':2,'find':1,'seemed':1,'derive':1,'also':3,'swam':2,'had':5,'send':1,'actually':1,'only':1,'persist':1,'practise':1,'happened':1,'grip':1,'eventually':1,'return':1,'get':2,'propelled':1,'cannot':3,'please.':1,'affect':1,'now':1,'possess':3,'perceived':1,'showed':1,'called':1,'did':3,'die':2,'seldom':1,'hunt':1,'settle':1,'found':2,'require':1,'enjoy':1,'successively':1,'often':1,'began':3,'resist':1,'imply':1,'decided':1,'are':130,'pass':4,'differ':2,'what':1,'said':1,'stood':1,'appear':2,'served':1,'tend':1,'attracted':1,'experiment':1,'radiated':1,'got':1,'learned':1,'ever':1,'correct':1,'can':13,'crunch':1,'obey':1,'never':1,'analysed':1,'disappeared':2,'were':27,'succeed':1,'let':1,'sink':1,'become':3,'put':2,'wanted':1,'come':1,'tenant':1,'receive':1,'could':4,'keep':1,'turn':1,'range':1,'act':2,'usually':1,'think':1,'feed':3,'emerge':1,'secure':1,'render':1,'point':1,'walk':1,'fast':1,'sow':1,'beheld':1,'reached':1,'illustrate':3,'use':1,'would':9,'create':1,'breed':1,'vibrate':1,'mark':1,'swarm':1,'call':1,'too':2,'then':1,'strike':1,'inflate':1,'tell':1,'therefore':1,'manufacture':1,'enable':1,'form':4,'fall':1,'corresponded':1,'must':5,'count':1,'account':1,'include':1,'look':3,'consist':2,'wish':1,'mount':1,'originate':1,'see':1,'will':5,'remain':1,'supposed':1,'learn':1,'meet':1,'emit':1,'and':1,'sometimes':2,'proved':1,'do':9,'likewise':1,'escape':2,'say':1,'have':33,'need':3,'seem':4,'made':6,'cool':1,'occur':1,'fill':1,'lie':1,'squat':1,'migrated':1,'built':1,'deserve':1,'travel':2,'generally':1,'extracted':1,'split':1,'test':1,'roll':1,'begin':2,'may':12,'absorb':1,'knew':1,'reach':5,'gradually':2,'reflect':1,'produce':2,'develop':1,'grow':1,'died':1,'varied':1,'cause':3,'give':4,'remember':1,'resemble':2,'nevertheless':1,'register':1,'appreciate':1,'correspond':1,'walked':1,'directly':1,'justify':1,'make':3,'came':1,'left':1},'molecules.':{'there':1,'illustration':1},'lifelong':{'study':1,'external':1},'bank':{'and':3,'or':1,'.':1},'bread':{'of':1},'1.00':{'7918':1},'rocky':{'shore-pool':1,'peninsula':1,'slopes':1},'oxygen':{'and':1,'available':1,'form':2,'of':1,'.':3,'to':1,'dissolved':1,'at':1,'which':1,'in':1,'taken':1,'than':1},'respiration.':{'illustration':1},'reasonably':{'that':1,'interpreted':1},'classified':{'.':1},'backgrounds':{'such':1},'l':{'bearing':1,'.':3},'rocks':{'and':4,'on':1,'since':1,'like':1,'may':1,'of':1,'is':2,'there':1,'according':1,'but':1,'.':1,'to':1,'were':1,'so':1,'are':1,'have':1,'which':1},'--':{'fig':1,'moon':1},'reasonable':{'objection':1,'to':1,'compass':1,'fee':1,'view':1},'heaved':{'off':1},'feeds':{'on':1,'are':1,'.':1},'associative':{'cell':1,'or':2,'learning.':1},'lifted':{'into':1,'off':1},'shows.':{'sec':1},'voyages':{'discovering':1},'prawn':{'hippolyte':1,'s':1,'takes':1,'.':1},'12.--jupiter':{'showing':1},'webbed':{'fingers':1},'pigments':{'enable':1,'compounded':1},'network':{'of':4},'forty':{'seconds':1,'inches.':1,'minutes':1,'inches':1},'fellows':{'can':1},'strangers':{'it':1},'vulgalis':{'1':1},'moisture':{'and':1,'heat':1,'about':1,'in':1},'medicine':{'but':1},'forth':{'and':1,'on':1,'.':1,'their':1,'in':8,';':1,'its':2,'the':1},'swamped':{'by':1},'disputed':{'whether':1,'and':1,'that':1},'nowadays':{'called':1,'an':1},'built.':{'illustration':1},'tops':{'of':1},'monkeys--activity':{'both':1,'for':1},'sunning':{'her':2},'admits':{'of':1},'forcibly':{'ejected':1},'detecting':{'a':2,'this':1,'the':1,'by':1,'its':1},'nebulae':{'and':1,'we':1,'from':1,'like':1,'would':1,'may':1,'is':1,'there':1,'it':1,'.':1,'as':1,'promise':1,'fig':1,'besides':1,'such':1,'are':5},'rarity':{'of':3},'created':{'to':1,'from':2,'or':2,'nor':1,'in':1},'appendages':{'and':1,'the':1},'shunted':{'.':1},'creates':{'a':1},'baltic':{'to':1,'.':1,'must':1},'clouding':{'after':1},'18.--a':{'diagram':1},'render':{'the':1},'synonymous':{'with':1},'another':{'remarkable':1,'feature':1,'aspect':1,'cuts':1,'glimpse':1,'source':1,'factor':1,'save':1,'very':1,'specimen':1,'they':1,'sowing':1,'lost':1,'solution':1,'truth':1,'works':1,'side':3,'fascinating':1,'series':1,'mighty':1,'are':1,'flower':1,'plays':1,'for':1,'though':1,'expressed':1,'experiment':1,'new':1,';':1,'method':2,'note--that':1,'fourteen':1,'on':1,'of':2,'distinguished':2,'thing':1,'s':1,'tack':1,'place':2,'consequence':1,'or':1,'inducing':1,'ring':1,'quality':1,'from':2,'one--of':1,'there':2,'.':10,'way':6,'was':1,'that':1,'four-toed':1,'but':1,'part':4,'solar':1,'with':1,'flightless':2,'kind':2,'has':1,'word':1,'example':2,'acquisition':2,'and':8,'is':1,'modern':1,'it':1,'deep':1,'high':1,'as':1,'in':2,'turn':1,'possibility.':1,'till':2,'amoeba':1,'star':3,'trundles':1,'molecule':1,'effect':1,'offshoot':1,'important':1,'interval':1,'portion':1,'time':2,'the':1,'having':1,'lying':1},'twig-like':{'angle':1},'thick':{'for':1,'as':1,'but':1,'.':1,'enough':1,'treacly':1,'in':1,'mist':1,'or':1,'vapours':1},'tangle':{'of':1},'electronic':{'constitution':1,'cyclones':1,'work':11,'works.':1,'activity':1,'works':15},'illustrate':{'a':1,'evolution':1,'natural':1,'we':1,'.':1,'the':6},'power.':{'the':1},'approximately':{'and':1,'equally':1,'22':1,'calculated':1,'twenty-seven':1,'to':3,'278':1},'youthfulness':{'a':1},'colossal':{'expenditure':1,'family':1,'reservoir':1},'accretion':{'may':1,'of':1},'compromise':{'is':1},'observations':{'bearing':1,'showing':1,'he':1,'furnish':1,'of':1},'inflate':{'their':1},'john':{'and':1,'dalton':1,'the':1,'murray':3,'dewey':1},'dogs':{'are':1,'do':1,'for':1,'have':1,'elephants':1},'kiwi':{'another':2},'intestine':{'with':1},'happily':{'included':1},'diversified':{'ooze':1},'rejected':{';':1},'nurse-frog':{'alytes':1},'scorpions':{'and':2},'cereal':{'.':2},'corresponded':{'to':1},'flightless':{'and':1,'toothed':2,'bird':2,'wings':1},'greater.':{'and':1},'guile':{'illustration':1},'magnet':{'and':1,'a':1,'is':4,'there':1,'.':4,'to':1,'62':1,'279':1,'the':2,'282':1,'lifting':1},'air.':{'the':1,'iv':1},'preformed':{'weak':1,'bandage':1},'damage.':{'1.f.3':1,'it':1},'unmistakably':{'to':1},'iron':{'and':2,'copper':2,'last.':1,'an':1,'are':1,'in':1,'further':1,'blue':1,'for':1,'behaves':1,'should':1,'to':1,'which':1,'you':1,'has':1,'until':1,'filings':2,'but':1,'would':1,'age':1,'will':1,'or':2,'attracting':1},'tackled':{'a':1},'contrasted':{'with':3},'powers':{'156':1,'of':1,'is':1,'.':1,'note':1,'hitherto':1},'encumbered':{'with':1,'by':1},'regulus':{'98.8':1},'respecting':{'the':1},'lull':{'and':2,'organic':1,'calls':1,'to':1,'s':1,'describes':1,'the':1,'r':1,'points':1},'vigorous':{'and':2,'palaeolithic':1,'as':1,'but':1,'race--many':1,'race':1,'animal':1,'the':1},'contents':{'introduction':1,'is':1},'forced':{'to':1,'the':1,'molten':1},'strength':{'and':1,'enormous':1,'prompted':1,'unabated':1,'of':1,'able':1,'to':1,'in':1,'the':1},'prehensile':{'suckers':1,'tail':2},'convenient':{'to':1,'unit':1},'latter':{'will':1,'is':2,'there':1,'we':1,'part':2},'half-brutish':{'prehistoric':1},'little.':{'illustration':1},'foam-bells':{'on':1},'subjects':{'with':1},'forces':{'of':7,'animals':1},'transmit':{'vibrations.':1},'swims':{'on':1,'about':1,'right':1,'well':1,'actively':1,'in':1,'with':1},'explanation':{'even':1,'we':1,'that':1,'of':3,'what':1,'.':1,'to':1,'offers':1,'once':1},'circles':{'without':1,'round':3},'benefactress':{'while':1},'ebook':{'outline':2,'for':1,'of':2,'is':2,'complying':1,'20417':1,'or':2},'anatomy':{'physiology':1,'.':1},'extending':{'below':1},'echoes':{'of':1},'phase':{'amid':1,'adapted':1,'of':1},'nutritive':{'reproductive':1,'chains':3,'material':2,'yolk':1,'sea-dust':1,'contributions':1},'grave':{'difficulties':1,'error':1},'nostrils':{'very':1,'on':1},'calculated':{'and':1,'to':1,'that':3,'using':1,'.':1},'inferred':{'from':3},'swamp':{'and':2,'our':1,'.':1},'accounted':{'for':3,'for--may':1},'deeply':{'saturating':1,'being':1,'into':4,'here':1,'buried':1,'with':1},'eel.':{'illustration':1},'notion':{'of':3},'fitted':{'a':1,'to':1},'reserve':{'.':1},'spectroscopic':{'point':1},'eminent':{'astronomers':3,'physicists':1},'sea-anemone':{'a':1,'may':1,'is':2,'gripped':1,'s':1,'72':1,'which':1,'sixty':1,'with':1,'can':1},'subtle':{'processes':1,'that':1,'inter-relations':2,'chemical':1,'cleaver':1,'inter-relations--the':1},'enjoyed':{'about':1},'sharks':{'the':1},'resemblance':{'142':1,'to':7,'being':1,'of':1,'is':2,'in':2,'camouflage':1,'lies':1,'so':1,'between':3,';':1,'hawk':1,'tells':1},'vaporised':{'by':1},'guidance':{'of':1},'appended':{'to':1},'entities--matter':{'ether':1},'geologist':{'utilises':1,'is':1},'deepest':{'sense.':1},'clefts':{'openings':1,'are':1},'pursuing':{'food':1,'what':1},'adequate':{'idea':1,'for':1,'lasting':1},'dynamo--magnetism--ether':{'and':1},'position--it':{'is':1},'fathoms':{'and':1,'though':1,'it':1,'five':1,'have':1,'so':1,';':1},'predecessor':{'.':1},'do':{'and':2,'nothing':2,'in':3,'.':5,'copyright':1,'when':2,'actually':1,'stories':1,'we':7,'that':1,'very':2,'they':2,'not':56,'with':9,'man':1,'occur.':1,'keeping':1,'practically':1,'this':4,'still.':1,'so':2,'the':2,'or':1,'otherwise':1},'leisure':{'to':1,'time--wherein':1,';':1},'yielded':{'to':1,'two':1},'space--ether':{'pervades':1},'watson':{'showed':1},'haunted':{'the':1},'roundabout':{'road':1},'conservator':{'of':1},'vividly':{'what':1,'interprets':1},'du':{'temps':1},'dr':{'.':18},'runs':{'through':1,'totteringly':1,'so':1,'for':1,'in':1},'tantalising':{'dream':1},'sky.':{'the':1},'web-footed':{'bird':1},'irregularities':{'of':1},'iron--and':{'is':1},'rung':{'on':1,'or':1},'voice--surely':{'one':1},'analytical':{'work':1},'freshwater':{'animals':5,'snail':1,'basins':2,'mammals':1,'fish':1,'polyp':1,'mussels.':1,'but':1,'.':1,'hydra':2,'race':1,'floods':1,'mussel':2},'steam':{'and':2,'or':2,'which':1},'captures':{'its':1},'venatici':{'is':1},'observer':{'the':1,'through':1},'condensed':{'and':2,'matter':1,'the':1,'to':1,'in':1},'observed':{'that':4,'phenomena':2,'had':1,'however':1,'one':1,'through':1,'in':1,'the':1,'.':1,'with':1,'by':1,'more':1},'tree-sloth':{'of':1},'arthropods':{'and':1,'such':1,'like':1,'which':1},'donations.':{'to':1},'torrents':{'of':1},'cattle':{';':1,'the':1},'miserable':{'specimen':1},'disappear.':{'illustration':1},'draws':{'for':1},'1917.':{'a':1,'this':1,'glass':1},'away':{'and':2,'the':3,'into':2,'back':1,'an':2,'down':1,'in':5,'from':10,'beneath':1,'when':2,'.':8,'chewing':1,'under':1,'is':1,'trillions':1,'altogether':1,'immediately':1,'by':3,'e.g':1,'many':1,'leaving':1,'entirely':1,'or':3},'sites':{'of':1},'unable':{'to':3},'drawn':{'on':2,'across':1,'into':3,'approximately':3,'.':1,'to':1,'in':4,'engraved':2,'by':2,'out':1},'previous':{'chapter':4,'energy':1,'experience':1,'one--the':1,'article':1,'line':1,'page':1,'day--a':1},'encounters':{'occur':1},'hatching.':{'reflex':1},'co.':{'harpy-eagle':1,'penguins':1},'circle--which':{'means':1},'we':{'forget':1,'soon':1,'discovered':1,'not':1,'go':3,'follow':1,'find':18,'discern':1,'had':2,'should':18,'to':2,'include':1,'might':3,'hope':2,'then':2,'get':18,'read':1,'watch':2,'cannot':29,'know':50,'presume':1,'mentioned.':1,'judge':1,'now':6,'dare':2,'arrange':1,'easily':1,'ever':1,'conceive':1,'leave':1,'continue':1,'lose':1,'found':2,'hasten':1,'mean':6,'often':1,'ascend':1,'briefly':1,'see':36,'are':47,'pass':2,'fail':1,'penetrated':1,'will':5,'detect':1,'confess':1,'may':41,'state':1,'learned':1,'approach':1,'exercise':1,'refer':1,'notice':1,'knew':1,'learn':1,'ascribed':1,'here':1,'imagine':1,'put':2,'come':3,'obtained':1,'received':1,'study':2,'owe':6,'agree':1,'turn':4,'usually':2,'think':6,'already':1,'can':39,'feel':1,'lengthen':1,'actually':1,'miss':2,'speak':6,'stare':1,'use':3,'described':1,'spoke':1,'would':3,'next':1,'start':1,'live':1,'call':26,'breathe':1,'wish':1,'understand':2,'gain':1,'believe':4,'must':42,'count':1,'look':4,'recall':1,'handle.':1,'aim':1,'suppose':1,'ought':1,'were':3,'could':13,'expect':1,'control':1,'compare':1,'have':124,'do':24,'almost':1,'describe':1,'moved':1,'consider':4,'say':6,'want':1,'need':4,'seem':3,'saw':13,'thought':1,'no':1,'belong':1,'take':4,'behold':1,'picture':1,'draw':2,'repeat':1,'connect':1,'utilise':1,'shall':23,'confined':1,'stop':1,'await':1,'reach':4,'reflect':2,'admire':1,'lay':1,'recognise':1,'remember':1,'emphasise':1,'reproduce':1,'allow':2,'hear':1},'rudimentary':{'gills':1},'terms':{'imposed':1,'of':21,'will':1,'experimenting':1,'from':1,'than':1},'discussion.':{'some':1},'wm':{'.':1},'bipeds--we':{'must':1},'enters':{'a':1,'the':3},'travellers':{'which':1},'clues':{'which':1,'in':1},'caledonia':{'which':1},'stricter':{'sense':1},'linkage':{'of':1,'between':1},'kitchen':{'.':1},'received':{'opinion':1,'the':4,'from':1,'written':1,'less':1},'climate':{'and':4,'a':1,'calls':1,'for':1,'of':2,'is':1,'became':1,'has':2},'pelomyxa':{'sometimes':1},'cox':{'arrangement':1},'ill':{'all':1,'suited':1},'nordics':{'afghans':1},'germinates':{'after':1},'cod':{'feeding':1,'family':1},'receives':{'a':1,'160':1},'unsunned':{'.':1},'disappears':{'before':1,'from':2,'in':1},'collecting':{'into':1,'centre':1,'centres':1},'tough':{'living':1},'soap':{'made':1,'bubble':4,'which':1},'ganymede':{'a':1},'engulfs':{'its':1,'it':1},'tons':{'on':2,'.':1,'in':1,'to':1,'of':6},'866400':{'--':1},'eventful':{'life-history':1,'thing':1,'day':1,'retention':1},'merchantibility':{'or':1},'speak':{'of':12,'the':1,'picturesquely':1,'unpacked':1,'got':1},'broadening':{'still':1},'sperm-cells.':{'the':1},'engines':{'.':1},'flexible':{'mounting':1},'thrice':{'the':1},'leech':{'called':1},'spermatozoon':{'has':1,'fertilises':1,'or':1},'repelled':{'by':1},'families':{'genera':1,'like':2},'innocent':{'seaweed':1,'creatures':1},'plebeian':{'crab-apple':1},'attacked':{'by':1,'however':1},'concerning':{'life':1,'tax':1,'the':1},'overtax':{'the':1},'millionth':{'of':2},'coherent':{'vane':1,'.':1},'them--a':{'common':1},'elvers':{'come':1,'snuggle':1,'.':1},'applied':{'to':7,'the':2,'however':1},'has':{'migrated':1,'enormously':1,'just':1,'developed':1,'over':1,'discovered':2,'ceased':2,'its':10,'captured':2,'certainly':1,'much':2,'torn':1,'had':3,'laid':1,'destroyed':1,'to':14,'only':2,'suffered':1,'guided':1,'happened':1,'meant':2,'his':1,'far':1,'attained.':1,'begun.':1,'five':1,'got':1,'not':8,'sorted':1,'now':3,'continued':1,'learned':2,'four':2,'annihilated':1,'lost':2,'always':2,'solved':1,'mastered':1,'become':14,'cooled':1,'declared':1,'often':3,'ten':1,'some':1,'somehow':1,'calculated':1,'gnawed':1,'begun':1,'led':2,'penetrated':2,'even':1,'shown':3,'said':2,'for':1,'frond-like':1,'yet':1,'written':2,'various':1,'moons':1,'probably':1,';':2,'ever':3,'claws':1,'attended':1,'recently':2,'risen':1,'however':1,'disappeared':1,'broken':1,'found':2,'put':1,'dissipated':1,'come':5,'thrown':2,'received':1,'great':1,'mingled':1,'language':1,'of':3,'changed':3,'conquered':2,'consequently':1,'raised':1,'already':1,'followed':1,'slipped':2,'instruments':1,'transit':1,'two':3,'brought':2,'agreed':1,'been':136,'reached':2,'precisely':1,'spawned':1,'given':5,'from':1,'fallen':1,'harnessed':1,'remained':1,'three':1,'long':1,'screened':1,'2':1,'wonderfully':1,'therefore':1,'passed':1,'taken':5,'slowly':1,'entered':2,'.':1,'more':2,'suggested':1,'himself':1,'thus':1,'completed':1,'occurred':1,'but':1,'known':1,'worked':1,'gills':1,'arisen':1,'carried':1,'made':3,'this':1,'shrunk':1,'moulted':1,'nine':1,'many':1,'tackled':1,'called':1,'gone':5,'proved':1,'played':1,'almost':4,'likewise':1,'turned':1,'an':4,'helped':1,'in':3,'affinities':1,'occupied':1,'shown.':1,'grown':1,'influenced':1,'built':1,'no':3,'divided':3,'also':1,'absorbed':1,'adapted':1,'degenerated':1,'effected':1,'added':2,'gradually':1,'eight':1,'plenty':1,'a':20,'succeeded':3,'endeavoured':1,'moved':1,'upset':1,'implied':2,'so':3,'very':1,'the':8,'realised':1,'left':1},'conviction':{'the':1,'that':1},'comprehension.':{'illustration':1},'air':{'and':4,'all':1,'there':3,'just':2,'is':6,'reaches':1,'as':1,'through':1,'at':3,'in':3,'from':1,'acts':2,'when':1,'.':13,'to':1,'which':3,'6':1,';':2,'has':4,'was':1,'into':1,'be':1,'we':1,'over':1,'goes':1,'on':1,'but':1,'underneath':1,'262':1,'struggle':1,'waves':1,'with':2,'by':3,'must':1,'a':3,'water':5,'of':1,'35':1,'loses':1,'will':1,'the':2,'or':1},'aim':{'of':2,'at':1},'voluminous':{';':1},'abrupt':{'and':1},'applies':{'also':1,'the':1,'whatever':1,'to':3},'aid':{'of':1,'.':1},'voice':{'we':1,'rose':1,'is':1,'broadened':1,'due':1,'but':1,'.':1,'became':1,'expresses':1,'the':1,'was':2,'becoming':1},'amphibians--the':{'reptilian':1},'cavern':{'of':3,'the':2,'179':1},'cylinder':{'of':1},'plover':{'has':1,'from':1},'have':{'planetary':2,'followed.':1,'quoted':1,'migrated':1,'scattered':1,'discovered':4,'sunk':2,'mentioned':2,'its':1,'just':9,'regarded':1,'had':2,'to':14,'only':4,'spread':2,'meant':2,'then':1,'good':1,'returned':1,'very':3,'furnaces':1,'words':1,'shared':1,'not':12,'now':1,'illustrated':3,'failed':1,'lost':1,'ceased':1,'always':1,'traced':1,'prolonged':1,'watched':1,'mastered':1,'dealt':1,'served':1,'cooled':3,'dwindled':1,'tenanted':1,'often':1,'burst':1,'acquired':1,'some':2,'direct':1,'identified':1,'carefully':1,'taught':2,'safeguarded':1,'further':1,'living':1,'shown':4,'said':9,'discovered--pulling':1,'missed':1,'apparatus':1,'definite':1,'behind':1,'won':1,'emerged':1,'moons':1,'rotted':1,'got':4,'learned':1,'ever':1,'told':1,'we':1,'full':1,'originated':1,'peculiarly':1,'sprung':1,'here':1,'reason':2,'will':1,'found':7,'put':3,'proceeded':1,'come':4,'gained':2,'on':2,'great':1,'reared':1,'journeyed':1,'of':4,'changed':1,'greatly':1,'conquered':1,'fallen':1,'already':5,'gone':3,'appeared':1,'delighted':1,'visible':1,'maintained':1,'another':2,'reached':1,'risen.':1,'given':2,'described':1,'become':8,'exposed':1,'three':1,'been':88,'their':7,'recognised':1,'combined':1,'passed':1,'resulted':1,'travelled':1,'closed':1,'thrown':1,'from':1,'lived':2,'lungs':1,'both':1,'moved':1,'differences':1,'occurred':1,'but':1,'taken':2,'heat':1,'races':1,'protections':1,'known':1,'probably':1,'worked':1,'removed':1,'entered':3,'arisen':4,'partially':1,'made':6,'succeeded':2,'this':1,'neap':1,'considered':1,'evolved':2,'many':2,'more':1,'called':1,'at':1,'admired':1,'seven':1,'chlorophyll':1,'proved':4,'remained':2,'is':1,'thus':1,'an':3,'astonished':1,'heard':2,'as':1,'something':1,'planets':1,'in':9,'seen':18,'apparently':1,'any':1,'grown':1,'varied':2,'inborn':1,'no':14,'rather':1,'lit':1,'also':2,'stimulated':1,'read':1,'several':1,'used':1,'what':2,'most':1,'discredited':1,'plenty':1,'nothing':1,'such':1,'yielded':1,'revealed':1,'a':25,'profited':1,'scarcely':1,'to-day':3,'bilateral':2,'stupendous':1,'nevertheless':1,'thought':1,'implied':1,'so':1,'lamented':1,'mechanical':1,'the':5,'counted':1,'bodies':1,'left':2},'crowning':{'instance':1,'examples':1,'advantage':1},'exceptionally':{'smooth':1},'sting':{'the':1,'which':1,'.':1},'trilobites':{'crustaceans':1,'illustration':1,'were':1},'brake':{'on':1,'.':1},'blame.':{'after':1},'comparative':{'anatomy':1,'distances':1,'nearness':1,'psychology':1,'sizes':3},'undulatory':{'movement':1},'brilliantly':{'luminous':1},'m.c.':{'.':1},'descent':{'of':6,'that':1,'from':1,'to':1},'conclusions.':{'the':1},'patent':{'and':1},'demonstration':{'of':1},'centre.':{'as':1},'punctuation':{'of':1},'varies':{'as':1,'.':1,'greatly':1,'periodically':1},'parasitism':{'it':1},'diplodocus':{'as':1},'sheltered':{'may':1,'life':1},'accumulating':{'a':1,'and':1,'age':1,'.':1},'monarch':{'of':1},'lithium':{'three':1},'crevices':{'among':1},'wheel':{'be':1,'rapidly':1,'that':1,'when':1,'is':1,'turned':1,'will':1,'as':3,'animalcule':1,'was':1},'independent':{'methods--one':1,'of':1,'orbits':1,'stellar':1,'lives':1,'existence':1},'86500':{'9':1},'hang':{'on':1},'evil':{'associations':1},'hand':{'feed':1,'and':8,'holds':1,'is':1,'some':1,'gregariousness':1,'as':2,'in':2,'miss':1,'from':1,'there':1,'when':3,'.':1,'till':1,';':1,'was':2,'thus':1,'it':1,'with':1,'made':1,'of':8,'sometimes':1,'so':1,'the':2,'where':1},'kinnaman':{'taught':1},'patagonia':{'there':1,'.':1},'nip':{';':1},'centred':{'in':1},'kept':{'lizzie':1,'from':2,'by':1,'for':1},'whereby':{'new':1,'the':1,'distinctively':1,'energy':1},'likes--and':{'the':1},'engrained':{'instinctive':1,'enregistered.':1},'wisps':{'of':1},'contact':{'information':1,'sy':2,'links':1,'information:':1,'.':1,'the':1,'with':2},'elongated':{'and':1,'palm-bones':1,'mobile':1,'outermost':3,'oval':1,'bodies':1},'furneaux':{'life':1},'centres':{'of':7,'drawing':1},'the':{'limited':1,'practicability':1,'psycho-analyst':1,'magnetic':5,'comparatively':1,'dynamic':1,'four':3,'chameleons':1,'aegir':4,'controversial':1,'oldest':6,'muzzle':1,'brackish':1,'physiological':3,'similarity':2,'sunlit':1,'fine-grained':1,'thinnest':2,'under':3,'humerus':1,'risk':5,'arboreal':5,'aurora':5,'oceans':1,'pigment':1,'smack':1,'coal-measures':1,'gratification':1,'east.':1,'fingers.':1,'conception':2,'bringing':1,'monkeys':2,'vast':9,'internally':1,'prize':1,'parrot':1,'present.':1,'correct':1,'danger-signal':1,'succession':2,'jumna':1,'jungle-fowl':1,'breast-bone':3,'cave-lion':1,'achievements':2,'force':3,'monotonous':1,'faintest':1,'excited':1,'feathers':6,'seas.':2,'nail':2,'surrounding':9,'second':18,'street':2,'infiltration':1,'inanimate':1,'blue':6,'change.':1,'unborn':3,'beaten':1,'consequent':1,'rest.':1,'reconstruction':2,'chromosphere':4,'new':21,'net':1,'protozoon':1,'surface--the':1,'evolving':1,'lithosphere':1,'men':6,'residual':1,'atoms':26,'seven-weeks-old':1,'protection':2,'ploughed':1,'aid':1,'active':4,'evolutionist':2,'cardboard':1,'contraction':2,'dry':19,'connaissance':1,'surface-atoms':1,'frog-hopper':1,'light.':1,'credit':3,'changes':5,'skull-cap':3,'diameter':3,'stray':1,'straw':1,'highly':1,'skull-walls':1,'visible':2,'medium':5,'total':6,'unit':2,'answers-back':1,'remainder':1,'arms':6,'dog-toothed':1,'mightiest':1,'calm':1,'water-spider':2,'type':2,'pistil':1,'females':3,'lungs':1,'wary':1,'horsetail':1,'whirling':1,'glass':6,'warm':2,'adult':3,'continual':1,'organic':1,'midst':1,'circumstances':1,'abundance':3,'word':10,'mimickers':4,'accomplishment':1,'eclipse':1,'worm':3,'roof':3,'theories':2,'mammalian':1,'era':2,'appendage':1,'animal.':1,'clock-work':1,'mud-fishes':1,'phrase':7,'alternating':1,'allantois':2,'serpent':1,'climax':3,'shore.':1,'powerfulness':1,'caution':1,'oil-sheet':1,'present-day':4,'advancing':3,'absolute':2,'end':22,'thing':2,'song':1,'nuts':2,'very':19,'hot':1,'significance':3,'answer':9,'ordinary':12,'ancestor':1,'massive':2,'poker':4,'rise':2,'minority':1,'mouths':2,'ptarmigan':2,'abdomen':1,'diagram':9,'dinosaurs':1,'wrong':2,'pearl-bearing':1,'vase':1,'domed':2,'types':1,'amoeboid':1,'leplay':1,'third':11,'spout':1,'headquarters':1,'greek':7,'green':8,'ultimate':4,'things':1,'sun.':13,'order':9,'wind':9,'blind':1,'interpretation':3,'alternation':1,'sheltering':1,'orang':7,'underside':1,'fore-limbs':4,'thesis':1,'ancients':2,'spontaneous':2,'famille':1,'breeding-place':2,'fit':1,'crew':1,'better':2,'woolly-haired':1,'production':3,'hidden':1,'gateways':1,'sea-water':3,'swim-bladder':1,'combination':2,'tree-stems':1,'young.':1,'revelations':1,'giraffe':1,'effects':2,'monarch':1,'stars;':1,'bank':2,'bread':1,'shadows':1,'dingo':2,'rocks':9,'good':4,'fertilised':8,'victory':1,'arrow':2,'side':4,'associative':1,'telescope.':1,'development':10,'telescope':10,'series':2,'principles':3,'solution':4,'contracting':1,'wave-lengths':1,'laboratory':3,'dawn':9,'ring':2,'pigments':1,'gibbon':5,'quality':5,'ice-sheets':1,'method':9,'reader':6,'heavenly':2,'revolving':1,'newly':4,'size':25,'langur':1,'foundation':12,'perception':1,'carcass':1,'wave-length.':1,'eternal':1,'strata':1,'free':4,'standard':1,'sensory':3,'skin.':1,'ancient':6,'formation':5,'struggle':15,'estimate':1,'heat':11,'ultra-violet':1,'publication':1,'enormous':5,'grasses':1,'days':1,'adjustment':1,'baltic':2,'purpose':2,'arrows':1,'wasp':2,'unlit':1,'peculiarity':1,'scissors':1,'thick':1,'ditch':2,'electronic':2,'mercury':1,'pelagic':1,'top':11,'neck':4,'heights':1,'legs':2,'genesis':1,'vapoury':1,'kiwi':2,'fiery':1,'instreaming':1,'fibrous':1,'diversified':1,'sciences.':1,'bell.':1,'floor.':1,'wisdom':1,'nurse-frog':1,'glumes':1,'somewhat':2,'evil':1,'peculiar':2,'flightless':1,'distance':13,'yerkes':7,'tree':2,'atom.':1,'final':5,'project':31,'matter':7,'flame':1,'historical':2,'shore-waters':1,'feeling':1,'acquisition':1,'groaning':1,'pliocene':5,'mind':18,'spectrum':9,'raw':4,'seed':1,'manner':1,'nervures':1,'rock-pool':1,'relatively':8,'strength':1,'prehensile':1,'thoroughly':1,'latter':7,'potentialities':1,'snow':3,'sound':3,'toothed':1,'subjects':1,'doors':2,'beta-rays':1,'shallow':2,'permian':8,'multicellular':1,'king-crab':1,'centres':1,'changefulness':1,'vermiform':2,'mouth':10,'letter':2,'echoes':1,'coil':4,'nutritive':1,'refractor':2,'ultramicroscope':1,'photosphere.':1,'episode':1,'professor':1,'metal':3,'dog':5,'orderly':1,'points':2,'principle':5,'sun':188,'nineteenth':8,'notion':2,'marvel':1,'pollen':1,'spikelets':1,'insects':2,'sea-anemone':4,'attempts':1,'subtle':1,'availability':1,'lessons':1,'ear.':1,'resemblance':5,'quaint':2,'pleistocene':2,'sentence':1,'geologist':2,'fifty-foot':2,'rich':1,'gods':1,'population':3,'plate':4,'mixture':2,'above':11,'fluid':2,'foremost':1,'bat':3,'covering':1,'bay':1,'discs':1,'contrast':2,'freshwater':6,'ears':1,'lettering':1,'observer':1,'habit':5,'radium':4,'outgoing':1,'zones':1,'tree-sloth':1,'full':14,'radius':1,'result':15,'disturbing':1,'rarity':2,'best':4,'subject':4,'pebbles':1,'capacity':2,'palaeolithic':2,'rings':1,'artificial':1,'paternal':1,'mud':7,'score':2,'toad':3,'simplest':9,'approach':1,'hatching.':1,'discovery':23,'terms':12,'nature':23,'confusion':1,'weak':1,'physicist':5,'sand-crab':1,'lurching':1,'larynx':1,'aquarium':1,'extent':2,'carbon':1,'flowering':1,'debt':1,'well-lighted':1,'kitchen':1,'tyranny':3,'behaviour':16,'climate':3,'outcome':13,'sperm-producer':1,'triggers':1,'earth.':7,'heating':1,'feathering':1,'cod':2,'distinction':2,'genus':1,'fore-leg':2,'repertory':1,'discolorations':1,'inquisitive':1,'purling':1,'path':5,'grazing':1,'sperm-cells.':1,'basis':3,'union':3,'three':6,'tiny':3,'trigger':6,'interest':1,'fry':2,'exactness':1,'spermatozoon':3,'life':7,'beach.':1,'deeper':2,'plebeian':1,'eastern':1,'abyssal':1,'conifers':1,'millionth':2,'mazy':1,'child':6,'elvers':1,'centrosome':1,'ether.':1,'exception':1,'adaptations':1,'air':39,'aim':1,'neat':1,'fainter':1,'property':1,'study':6,'natives':1,'seven':3,'crowning':1,'equator':5,'photographer.':1,'player':1,'comparative':3,'undulatory':1,'mouse':1,'descent':2,'belle':1,'punctuation':1,'daughter-units':2,'siamang':1,'complex':1,'peopling':3,'belly':1,'reptilian':2,'vegetable':1,'snow-line':1,'several':1,'european':2,'wheel':7,'independent':1,'georgics':1,'milky':13,'tops':1,'rain':1,'hand':9,'characters':1,'tune':1,'tassel':3,'stimuli':1,'ocean':5,'materials':1,'greatest':13,'arrow-worms':1,'claims':1,'marsupials':1,'musical':1,'left':5,'sea-skimmers':1,'just':1,'planetesimals':1,'vaporisation':1,'sporting':1,'mending':1,'disguise':2,'neanderthalers':1,'human':25,'facts':15,'yes':1,'emergence':7,'previous':3,'thyroid':3,'terrific':1,'hills':2,'infinitely':1,'old-fashioned':1,'royal':1,'salmon--forming':1,'evidences':3,'thickening':1,'long-lost':1,'board':1,'gaboon':2,'east':1,'eocene':2,'laying':1,'elevation':1,'advances':1,'survival':1,'sussex':1,'vulture':1,'possible':3,'forester':1,'photosphere':9,'birth':2,'partridge':1,'shadow':2,'rough-and-tumble':1,'shoulder':1,'war.':2,'insurgent':1,'precise':3,'sand-hoppers':2,'autumn.':1,'x-rays.':1,'enregistered':2,'mosquito':2,'night':1,'amoebae':1,'portuguese':2,'right':12,'old':13,'people':2,'crown':2,'dead':1,'clawed':1,'winds':1,'inorganic':2,'rill':1,'intellect':1,'orchid':1,'dense':1,'rhine':1,'bottom':6,'ear':7,'opposite':5,'fox':2,'distrust':1,'ice':3,'flounder':2,'loins':1,'tertiary':1,'seals.':1,'colour-cells':2,'beating':2,'monkey-ape-man':1,'palatable':1,'energy':36,'illustration':5,'cork':1,'shifting':1,'capacious':1,'flinty-shelled':1,'blackest':1,'properties':2,'chapter':1,'skin-twitching':1,'limitation':1,'boiling':1,'cloudlets':1,'ribs':1,'o':1,'wave-length':1,'horizon':1,'herring-gull':1,'efforts':1,'ores':1,'lamprey':1,'primitive':3,'cloud-screen.':1,'dilemma':1,'variations':1,'scantier':1,'peppered':1,'son':1,'contrasts':1,'bricks.':1,'doctrine':1,'spores':1,'palaeozoic':4,'indispensable':1,'flying':9,'sunlight':7,'class':2,'conservation':1,'physicists':2,'fraction':1,'dorsal':1,'war':4,'lowest':5,'head':8,'marten':1,'form':10,'fully-formed':1,'becoming':1,'differences':2,'peninsula':1,'quiet-flowing':1,'same.':1,'solar':35,'minuteness':2,'true':5,'otter':3,'continuance':3,'reproductive':2,'ancestral':1,'bounds':1,'centipede':1,'economic':1,'bird-dropping':1,'egg-eating':1,'palm':1,'cosmos':1,'stages':1,'temper':1,'passenger':1,'juvenile':2,'strengthening':1,'hotter':1,'heidelberg':4,'seeds--and':1,'mirror':2,'palm;':1,'evidence':2,'candle':1,'ship':3,'physical':4,'mediterranean':3,'solicitation':1,'inborn':3,'floor':8,'font-de-gaume':2,'negatively-electrified':1,'tip':4,'reality':3,'successful':2,'nestling':1,'setting':2,'papers':1,'superfluous':1,'robber-crab':5,'picture':7,'ordovician':2,'palms':1,'teats':1,'braking':1,'diet':1,'genealogical':2,'irs.':1,'dullest':1,'discharge':2,'thorax':1,'immemorial':1,'stamens':2,'bullet':2,'daily':1,'collared':1,'gorilla':4,'reception':1,'time':19,'skull-cap.':1,'serious':1,'nuclei':1,'tigris':1,'breadth':1,'irrigation':1,'concept':1,'chain':1,'limbless':1,'colour-change':1,'varying':3,'brownian':4,'focus':1,'hind-legs':2,'nerve-cord.':1,'skin':14,'jointed-footed':1,'primeval':4,'retention':1,'layers':2,'inverse':1,'essentials':1,'father':5,'passage':4,'environment':4,'unpleasant':1,'reptiles':2,'walking-fish':2,'ulna':1,'division':1,'protective':2,'month.':1,'advantage':2,'rotifer--we':1,'liability':1,'aesop':3,'first-known':1,'nesting':1,'exact':2,'minute':3,'cool':1,'dim':1,'level':4,'sedimentary':3,'gum':1,'magnet':4,'crustacean':1,'backboneless':2,'speculation':1,'accumulation':1,'upper':23,'work':19,'occurrence':3,'findings':1,'full-grown':2,'piltdown':5,'hair.':1,'trent':4,'bacteria':2,'spectral':1,'leaf-butterfly':1,'constitution':4,'assistance':1,'axes':1,'stomach.':1,'current':6,'supporting':2,'coccyx':1,'honour':1,'hairs':3,'evolution-idea':4,'anvil.':1,'whiteness':1,'water':49,'guise':1,'cave-bear':1,'twentieth':1,'address':1,'dwindling':2,'teacher':1,'change':5,'pearly':8,'brilliant':1,'shift':2,'dublin':1,'trial':2,'stomachs':1,'suggestion':3,'weird':1,'copper.':1,'mimicked':4,'elect':1,'seashore':8,'littoral':2,'cuttlefishes':3,'working':2,'sake':1,'positive':2,'anatomical':2,'prey':2,'flaunting':1,'negroes':1,'australian':6,'angels':1,'fish-eating':1,'diurnal':1,'water-ouzel':1,'apparent':3,'malay':1,'minnows':2,'appendix':1,'virtue':1,'cases':1,'easiest':1,'opossums':2,'sum-total':1,'sea-anemones':2,'cat':1,'hardest':2,'jetsam':1,'mortality':1,'following':6,'making':7,'fauna':6,'coral':3,'stimulating':1,'streak':1,'heart':6,'portals':1,'wrist-bones':1,'reflector':2,'figure':5,'frogs':1,'bulkiest':1,'stroke':1,'chin':1,'octopus.':1,'rays':15,'requirements':1,'winter':5,'comb-bearers':1,'inheritance':1,'dispositions':1,'means':4,'species':3,'chemical':6,'vital':5,'candle.':1,'fourth':4,'elephant':4,'dominance':1,'economy':1,'burrowing':1,'southern':3,'date':2,'behaviour--experimenting':1,'man':6,'branches':10,'outline':9,'liquid':4,'unimportant':1,'corona':3,'darkened':1,'african':2,'basket':1,'bolometer':1,'outflowing':2,'shield':1,'gradual':6,'pointed':1,'years':1,'brain':23,'experiments':6,'statements':1,'cold':4,'insurgence':2,'birds':3,'tendency':5,'nucleus.':2,'solitary':1,'limbs':1,'ice-fields':2,'thumb':5,'rhizopods':2,'interesting':3,'presence':4,'flesh-and-blood':1,'aquitania':1,'attraction':1,'creations':1,'spacious':1,'main':28,'meridian':2,'bird.':1,'evolution':45,'records':3,'archaeozoic':1,'tails':1,'water-shrew.':1,'not':1,'widespread':1,'halo':1,'term':2,'name':4,'seaweed-growing':1,'advent':1,'gill-slits':1,'careless':1,'jellyfish':2,'rock':9,'turtle':2,'sugary':2,'square':3,'reeds':1,'torch':1,'treacherous':3,'challenger':1,'fires':1,'year':6,'monitors':1,'neighbourhood':1,'living':18,'factors':6,'amnion':2,'greeks':3,'increase':2,'miles':1,'ladder':1,'overflowing':1,'ascendant':1,'theory':14,'soap-bubble':1,'divergence':3,'possibility':12,'quite':1,'quart':2,'intruding':1,'advantages':2,'sunlight.':1,'fuller':1,'obligation':1,'marine':2,'inevitable':1,'card':2,'care':1,'advance':2,'language':1,'selections':1,'transition':5,'british':5,'ostrich':1,'motion':2,'disguises':1,'place':8,'invalidity':1,'deep-sea':4,'close-set':1,'star':6,'frequent':2,'first':71,'origin':14,'one':21,'long':15,'conifer':1,'message':6,'open':29,'millions':3,'sheep':3,'little':5,'law':3,'silent':1,'spiral.':1,'bite':1,'callous':1,'plastic':1,'stimulation':1,'plains':2,'cooling':2,'2':1,'pockets.':1,'moisture':1,'white':11,'lingering':1,'vapours':1,'gravelly':1,'eyes':8,'way':18,'starfish':1,'brains':2,'canine':1,'seat':3,'photographic':9,'splendid':1,'pterodactyls':2,'cracks':1,'effective':1,'three-spined':1,'crowded':1,'coco-palm':1,'future':11,'fertilisation':1,'cards':2,'gigantic':1,'mariner':1,'photosynthesis':1,'sublime':3,'coconut':1,'rooks':1,'spectroscope:':1,'ant':3,'spectroscope.':1,'lens-shaped':2,'buried':1,'maximum':1,'zoo':1,'snout':2,'sciences':1,'potential':1,'fracture':1,'online':2,'interior':7,'performance':2,'jungle':5,'closer':1,'sure':1,'chromosomes':1,'normal':4,'azores':1,'indelible':2,'price':1,'molecule':1,'falls':2,'visitors':1,'beta':5,'successive':5,'pair':1,'thigh-bone':1,'average':7,'freshwaters':9,'hungry':1,'bustard':1,'tooth':1,'idea.':1,'quiescent':2,'salt':1,'laws':4,'detective':1,'walking':1,'discoverer':1,'merit':1,'gill-cover.':1,'bright':3,'threshold':1,'line':7,'ground':23,'slot':2,'nemesis':2,'ratio':2,'gulf':1,'germ-cell':1,'treasure':1,'proportion':2,'only':13,'down-breaking':1,'black':5,'uppermost':1,'down-rushing':1,'lighted':1,'supra-renal':2,'bittern':1,'freezing':1,'midriff':1,'truly':1,'duckmole':4,'remoter':1,'mud-flats':1,'negative':4,'lighter':2,'primates':4,'clearest':1,'pollen-nucleus':1,'fanciful':1,'parasitic':1,'morning':2,'naked':2,'penguins':1,'sea--the':2,'london':1,'pituitary':1,'vision':1,'kernel':1,'oven':1,'seas':6,'lancelets':1,'silurian':4,'stars--or':1,'relative':4,'1921':1,'stigma':1,'concentric':1,'wonder':2,'ways':5,'subsequent':1,'sites':1,'under-skin':2,'colours':4,'outside':4,'chimpanzees':1,'moons':2,'man.':2,'volvox':1,'notice':1,'parent':10,'eye':20,'screen':7,'rapidly':1,'big-brain':4,'sea.':5,'proterozoic':1,'article':2,'cities':1,'dates':1,'successes':1,'many':1,'region':2,'sodium':1,'quiet':1,'altamira':4,'man-ape':2,'flipper':3,'wheels':1,'expression':4,'surface.':2,'moon;':1,'generalisation':1,'brightly':1,'color':1,'colony':3,'period':7,'spinthariscope':1,'learning':1,'boar':1,'constant':1,'pod':1,'skeletons':2,'sun-spots':1,'fitful':2,'late':5,'west':3,'shortening':2,'combined':1,'reflex':1,'exhaustion':1,'fiftieth':1,'direction':9,'gist':2,'circumference':2,'haunt':1,'sea-horses':1,'external':3,'infusorians':1,'careful':2,'spirit':2,'robber':1,'case':37,'breast.':1,'caucasians':1,'developing':4,'co-ordination':1,'mount':4,'prominence':1,'dints':1,'situation':2,'margin':3,'moon.':1,'coolest':2,'characteristics':2,'nautical':2,'middle':5,'regularity':1,'sudden':3,'tse-tse':1,'eras':1,'unsounded':1,'beaver':5,'jackdaw':1,'floating':6,'movements':9,'rungs':2,'helmet':1,'different':8,'alphabet':1,'same':99,'eggs--up':1,'food':10,'inquiry':2,'agitated':1,'grain':1,'status':1,'oyster-catcher':1,'oil':1,'vestigial':2,'arctic':1,'director':1,'running':1,'edges':5,'delicate':3,'equatorials':1,'changing':2,'perennial':1,'constitutional':1,'severe':2,'frontispiece':1,'bottle':1,'model':1,'otherwise':1,'bodies':1,'overcrowding':2,'summer':3,'money':1,'armour':1,'egg-cell':1,'rest':6,'down-drifting':1,'rule.':1,'potentiality':1,'differentiation':1,'speed':16,'captured':1,'death':2,'widest':3,'hint':1,'bricks':3,'golden':1,'geological':6,'meteorite':1,'hind':2,'dovecot':1,'heavier':3,'skies':1,'real':2,'bitterling':3,'spectacular':1,'rules':1,'outermost':1,'non-digitate':1,'tissues':2,'early':13,'water-measurers':1,'vacuum':1,'cavern':3,'world':46,'part':7,'left-hand':3,'sensational':1,'fossils':2,'oxygen':3,'exquisitely':1,'velocities':1,'multifarious':1,'sieves':1,'benefit':1,'downward':1,'sharp':1,'twelve':1,'night-light':1,'exposed':1,'splash':1,'cathode':1,'pacific':2,'astronomer':6,'duration':1,'pasture':1,'racial':1,'ascent':6,'extinct':3,'gross':1,'calculating':1,'prolific':2,'intricacy':1,'memories':2,'tube':11,'moon':76,'pioneer':3,'critical':2,'lunar':2,'particles':12,'others--the':1,'welcome':1,'wheat':2,'buckling':1,'power':16,'sixth':2,'nails':1,'stereotyped':2,'substratum':1,'broken':1,'alps':1,'resurrection':1,'comparison':1,'stone':1,'ear-trumpet':2,'central':9,'piety':1,'insect':9,'shrimp':1,'addition':1,'wolf':3,'act':3,'pre-human':1,'amber':1,'freeing':1,'lands':2,'fertile':2,'sea-grass':1,'burning':1,'instruments':1,'spreading':1,'surinam':1,'spinal':4,'sneering':1,'rising':1,'elementary':1,'mark':1,'shrinking':2,'shells':1,'bristles':1,'literal':1,'dispersion':1,'strict':3,'world--weighs':1,'low':1,'stars':39,'house':2,'macaques':1,'hen':1,'bubble':4,'fish':6,'continents':3,'mammals':4,'prawn':1,'manipulative':2,'strenuous':1,'elimination':1,'parasites':2,'hottest':1,'land.':1,'wild.':1,'pull':1,'largest':9,'circulation':2,'stoneless':1,'multiplicity':1,'electroscope':1,'nearest':7,'pre-cambrian':1,'grasp':1,'shell.':1,'grass':3,'mimicked.':1,'moles':2,'vedda':1,'dangerous':1,'sinking':1,'lingula':1,'deep':10,'general':23,'imagination':3,'sun--measuring':1,'at':1,'planets':19,'cathedral':1,'corresponding':3,'film':3,'tedious':1,'beds':2,'inflated':1,'shore-haunt':6,'field':4,'prism':3,'polar':8,'vocabulary':1,'bacillus':1,'shelter':2,'planet.':1,'carnegie':2,'important':5,'nucleus':12,'marshes':1,'environing':1,'queensland':1,'sun--a':1,'pool':3,'network':1,'building':1,'condensation':2,'remote':1,'difficulties':7,'mimic':2,'tree-tops':1,'ovary':1,'starting':1,'original':13,'pheasant':1,'skeleton':2,'founder':1,'peacock':1,'lack':1,'muscle-fibres':1,'milt':1,'month':9,'light-waves':1,'upkeep':1,'welfare':2,'plodding':1,'causes':1,'synthetic':2,'stored-up':1,'number':14,'remarkable':2,'inexhaustible':2,'former':1,'tail':10,'boiling-point':1,'friction':1,'safety':3,'presentation':1,'activities':1,'turnips':1,'worse':1,'devonian':8,'chameleon':2,'far':9,'coloured':5,'worm.':1,'psychologist':1,'verb':1,'fan':1,'sandstones':1,'fall':3,'difference':2,'forking':1,'accompanying':1,'stimulus':2,'ceaseless':1,'list':1,'applicable':1,'caucasian':1,'large':9,'sand':1,'three-millionth':3,'small':11,'mammal':6,'locomotive':2,'trumpeting':1,'still':2,'fringing':1,'cannonade':1,'197':1,'reins':2,'past':16,'intricate':1,'rate':10,'invention':1,'double-slide':2,'creatures':1,'lung-fishes':1,'swampy':1,'darkness':2,'consumers':1,'clock':3,'deeply':1,'crust':2,'emotions':1,'thickness':3,'public':3,'multitude':1,'movement':2,'creature.':1,'toes':1,'malaria':2,'martians':1,'compilation':1,'loose':3,'component':1,'answers':3,'hours':1,'threads':2,'trunk':1,'directions':1,'strong':2,'transformation':2,'search':2,'teeth':5,'difficulty':1,'riviera':1,'experimenting':3,'unproved':1,'amount':3,'social':3,'action':4,'slope':2,'narrow':2,'elongated':2,'cataract':1,'tides.':1,'family':1,'spawning':3,'utilisation':2,'chalk':1,'globes':2,'vertebrae':2,'extinction':1,'herring':1,'life-histories':2,'taker':1,'eye--we':1,'two':30,'almost':4,'cultivation':1,'soil':3,'mysterious':4,'jurassic.':1,'ovules':2,'minor':1,'more':18,'scotia':1,'door':2,'substances':1,'text.':3,'emission':1,'chimpanzee':5,'instrumental':1,'stick':3,'particular':9,'foundations':1,'straight-haired':1,'weathering':3,'presumed':1,'fleece':1,'primate':2,'science':3,'centrifugal':1,'moisture-laden':1,'lung-fish':1,'lamp-shell':2,'male':18,'radiations':1,'history':14,'beautiful':6,'shark':1,'nautilus':1,'brown':8,'wave.':1,'brain-mind':1,'autumn':2,'sphere':1,'sense':10,'pond':3,'dress':1,'offspring':2,'salts':3,'axis':1,'terrestrial':4,'huge':3,'upbuilding':1,'starting-point':2,'breaking':1,'milk':1,'oligocene':2,'everyday':2,'glowing':2,'friction.':1,'sacred':1,'freezing-point':3,'daughter-cells':1,'creature':17,'simplicity':1,'plant':5,'salt.':1,'paloloworm':1,'trial-and-error':1,'triumphs':2,'plane':1,'pupae':1,'adventure':1,'polynesian':1,'waves':20,'invasion':4,'inconceivable':1,'a':1,'short':4,'dispersion--that':1,'coat':1,'spectra':1,'buns':1,'coal':1,'shore':34,'tentacles':2,'fundamental':8,'egg':4,'triassic.':1,'bustle':1,'pans':1,'infant':1,'earthworm':3,'help':1,'copper':1,'winged':1,'much-disputed':1,'mission':1,'cross':2,'attitude':1,'scientist':1,'lanugo':1,'existence':5,'kinetic':1,'visceral':1,'roots':2,'thirtieth':2,'arteries':1,'thrilling':1,'systema':1,'tickings':1,'lateral':1,'conjugation':1,'actually':2,'bell-animalcules':1,'absence':4,'parts':4,'microscopic':4,'founders':1,'mammal--instinctive':1,'partitions':1,'sheaves':1,'lowell':1,'evening':1,'reappearance':1,'motley':1,'males':2,'primary':5,'framework':2,'walls':5,'iridescent':1,'foot':2,'linking':1,'adventurous':1,'association':2,'cambrian':8,'mystery':2,'slipper':3,'mathematician':3,'ashes':1,'positions':1,'neanderthalers--the':1,'cavendish':1,'physiologically':1,'heavy':3,'reactions':1,'mental':4,'weight':1,'wall-like':1,'colder':1,'hare':3,'notochord':3,'ripple':1,'balance':3,'event':1,'croaking':2,'really':1,'mottled':1,'neanderthal':12,'pigeon':3,'abysses':3,'nautiloids':1,'fountain':1,'dying':1,'issue':1,'prominences':1,'meteoric':1,'foreground':1,'belief':1,'protruding':1,'story':19,'extraordinary':4,'reason':8,'base':6,'brightest':1,'members':7,'heads':2,'earliest':7,'beginning':39,'revolutionary':1,'producers':2,'albatross':1,'american':1,'fruit':1,'circuit':2,'expedient':1,'mangrove-trees':2,'solidly':1,'knots':2,'flood':1,'reversing':1,'moorhen':2,'probability':5,'radical':1,'bullies':1,'song-thrush':2,'antiquity':2,'well-known':3,'dust':2,'scots':1,'warty':3,'soapy':1,'earthworms':2,'idea':10,'horse':10,'tadpoles':2,'temperature':16,'introduction':2,'leading':1,'light-gatherer':1,'least':5,'assumption':1,'statement':2,'scheme':1,'danger-call':1,'muscles':3,'storm':2,'glow':1,'tides--another':1,'immediate':3,'basal':1,'treasures':1,'parr':1,'rifle':1,'prodigious':1,'selenium-cell':1,'modes':1,'kind':5,'observatory':1,'tunic':1,'kindly':1,'parent--little':1,'double':2,'vocal':1,'recording':1,'contrary':1,'risks':5,'egg-cells':1,'head.':1,'playing':3,'anthropoid':10,'stickleback':3,'outstanding':1,'heaviest':3,'ages':8,'well-developed':1,'colour-resemblance':1,'elaboration':1,'egg.':3,'hare--with':1,'organs':1,'gathering':1,'mountain':5,'dancing':3,'speculative':1,'cave':1,'peculiarities':1,'majority':3,'internal':4,'lip':1,'useless':1,'day.':1,'play':3,'electric':13,'capillaries':1,'eggs':21,'measures':1,'salmon':17,'depths':5,'most':67,'alpha':2,'extremely':2,'approved':1,'head-end':1,'equatorial':2,'whalebone':1,'prolongation':2,'clear':1,'instrument':6,'transmissibility':1,'seething':1,'electrons':15,'artistic':1,'velocity':5,'notch':1,'organism':6,'stones':5,'far-flung':1,'open-minded.':1,'gold':1,'fins':1,'wayside':1,'relation':2,'heavens':18,'fine':7,'find':1,'impact':2,'giant':1,'copyright':6,'spineless':1,'nervous':1,'earth-moon':1,'experiment':3,'quadrupedal':1,'circle':1,'indifference':1,'cromagnards':1,'hip':1,'dominant':1,'gains':3,'permission':2,'adventurers':1,'sunny':1,'shore-pools':3,'germ-cells':6,'earth--as':1,'actions':1,'compass':1,'journey.':1,'eye-piece':3,'chick':1,'sleeve':1,'body.':1,'alteration':1,'underlying':1,'common':9,'liver-fluke':1,'river':6,'californian':1,'rhodesian':4,'bars':1,'estuaries':1,'intelligence':3,'touch':2,'individual':15,'migration':1,'long-fingered':1,'walking-stick':1,'close':1,'precursors':1,'arm':3,'spirited':1,'probable':1,'distinctive':1,'taming':1,'smallest':8,'various':13,'conditions':7,'aeons':1,'supposed':1,'beetling':3,'iron':5,'unconscious':2,'web':1,'sole':2,'jaws.':1,'craters':1,'spectroscopic':1,'eustachian':2,'incident':1,'invisible':7,'inertia':1,'colonisation':1,'prospects':1,'last':16,'reverse':1,'distinctively':1,'annual':1,'harpy':1,'sensitive':1,'connection':2,'amoeba':1,'picture.':1,'earth--an':1,'cloud-like':1,'whole':42,'experimental':1,'sloth':1,'point':6,'simple':7,'others':1,'proton':1,'newborn':2,'unicellular':1,'puzzle-boxes':1,'incandescent':1,'unsuccessful':1,'lamprey--a':1,'startling':1,'moon--the':1,'java':8,'miocene':3,'originators':2,'crocodiles':1,'damp':1,'vertebrate':1,'intricacies':1,'secret':6,'maintenance':1,'widening':1,'yolk-laden':1,'empty':4,'modern':25,'flight':1,'squirrel':2,'fire':2,'gas':2,'amphibians':4,'gap':1,'races':1,'formless':1,'indivisible':1,'plants':5,'top--the':1,'solid':5,'straight':1,'bill':1,'routes':1,'pace':1,'error':1,'robin':1,'underground':2,'fore-limb':3,'century':1,'moth':2,'obstacle':2,'cerebrum':1,'simian':3,'atom--the':1,'currents':1,'twofold':1,'forewing':1,'undersides':1,'beune':2,'shorter':1,'stimulated':1,'shad':1,'ray':3,'yucca':6,'composition':2,'higher':14,'unwary':1,'used':1,'optic':1,'u.s.':1,'moving':6,'user':1,'dark':9,'lower':16,'older':1,'spectrum.':1,'people.':1,'consistence':1,'obviously':1,'person':4,'edge':5,'meridian.':1,'scouring':1,'distances':4,'endeavour':1,'migratory':1,'matter.':1,'isolated':1,'shape':7,'atomic':2,'questions':1,'useful':2,'praying':2,'continent':2,'spinners':1,'profitable':3,'superficial':1,'conclusions':1,'scales':3,'humanoid':3,'source':8,'parents':3,'remaining':3,'silken':2,'overhanging':1,'forces':6,'big':11,'sensatory':1,'game':1,'necessary':1,'bit':1,'earth--making':2,'wings':11,'vapour':1,'ponds':1,'photosphere--the':1,'tail.':2,'neanderthaler':1,'shapes':1,'bootlace':1,'well-poised':1,'individuals':1,'popular':3,'disorder':1,'essential':9,'gibbon.':1,'methods':3,'course':24,'spring':3,'last.':1,'back':15,'yolk':1,'diamond.':1,'martian':1,'mighty':1,'sight':1,'steam-engine':1,'curious':1,'gradually':1,'scale':6,'microbes':1,'flux':1,'fifty-millionth':1,'bushy-tailed':1,'pounding':1,'comet':5,'egg-shell':2,'scaly':1,'life-history':3,'object':3,'universe.':3,'protrusible':1,'nasal':1,'agreement':1,'forming':1,'stem':1,'step':1,'more-pork':1,'race--there':1,'nerves':1,'tidal':1,'intense':1,'analysing':1,'web-wing':1,'tortuous':1,'ear-bones':1,'range':2,'gamma':1,'conquest':5,'appropriate':2,'chalk-forming':2,'deep-violet':1,'question':12,'gases':1,'frog':4,'mimicry':2,'mountains':4,'glamour':1,'moon--meteors':1,'atlantic':5,'legs.':1,'atom':27,'adults':1,'coldest':1,'crane':2,'dull':1,'drifters':1,'skull':5,'characteristic':2,'spectroscope':32,'sifting':4,'stalking':1,'planet':17,'exploration':1,'mature':1,'diameter.':1,'sea-urchin':1,'x-ray':1,'non-living':1,'aerial':1,'protrusive':1,'flow':5,'paving-stones':1,'influence':2,'entrance':3,'metals':1,'char':1,'problem.':1,'single':1,'diving':1,'kidney':1,'cotton':1,'rainbow':4,'intrepid':1,'puzzling':1,'prerogative':1,'uranium':2,'occasional':1,'reputation':1,'electrical':1,'amphibian':2,'milk-glands':1,'elements':4,'small-brained':1,'energetic':1,'beginnings':3,'crouching':1,'backbone':8,'problems':1,'lens':2,'meaning':9,'restoration':7,'fruit-fly':1,'fishes':8,'stoppages':1,'sides':4,'structure':8,'land':7,'age':8,'orbit':2,'unhatched':2,'big-brained':2,'once':3,'hampton':2,'saying':1,'results':9,'mantle':2,'aristocrat':1,'conservative':1,'disintegration':2,'magnifying':1,'depletion':1,'young':42,'arid':2,'cradle':5,'blaze':1,'masculine':2,'coco-palms':1,'details':2,'gravel':1,'little-brain':5,'stupefying':1,'breathing':2,'club-moss':1,'wave':1,'electron':19,'entire':7,'archaeopteryx':2,'stiff':1,'fur':1,'button':1,'anxious':1,'race':10,'verdict':1,'sedentary':3,'poles.':1,'blood-fluid':1,'elk':1,'smaller':5,'booty':1,'lightest':3,'procession':3,'euphrates':1,'rivers':9,'noise':1,'munitions':1,'sifting-out':1,'makers':1,'scientific':9,'south':10,'zest':1,'opaque':1,'waning':1,'paddle':1,'hereditary':1,'ape-man':1,'indian':3,'poles':4,'flowing':1,'bird':18,'body':50,'hypothesis':3,'degree':3,'leg':4,'kangaroo':1,'outlying':1,'youngest':2,'growing':1,'river.':1,'boot.':1,'separation':2,'frilled':1,'consideration':1,'physiology':1,'little-brained':1,'extreme':1,'stellar':4,'great':80,'northern':1,'wandering':1,'larger':5,'haunts':3,'resulting':1,'mussel':1,'guidance':1,'apple':1,'danger':1,'round-mouths':1,'wit':3,'motor':5,'oval':2,'precursor':1,'singing':1,'ape':2,'nest':13,'use':9,'fee':2,'adaptation':2,'stream':8,'remains':9,'cretaceous':3,'next':14,'few':1,'contractile':1,'crab':9,'vehicle':2,'eagles':1,'doubling':1,'simpler':2,'mammoth':2,'sort':1,'grandest':3,'clever':1,'inclined':4,'rarest':1,'bodily':2,'rabbit':1,'baby':1,'gambian':2,'harvest':2,'sea-floor':2,'animals':11,'embryos':5,'lapse':1,'recession':1,'obvious':1,'thin':1,'closing':3,'interlinked':1,'proof':1,'control':3,'weaker':1,'corpuscular':1,'process':10,'purposes':1,'pieces':1,'high':5,'electro-magnet':1,'non-radiant':1,'water.':1,'bones':2,'wonderful':7,'voice':8,'class.':1,'united':13,'varied':2,'defective':1,'shasta':1,'nearness':2,'arrangement':4,'cycads':1,'need':2,'seeds':4,'forest':7,'animal':43,'hormones':1,'mysteries':1,'intelligent':2,'stock':1,'cave-men':1,'maternal':1,'yolk-sac':1,'gill-clefts':1,'waters':7,'thunderstorm':2,'collection':2,'tack':1,'wrist':2,'trees':7,'multiplication':4,'venation':1,'famous':2,'snail':3,'light':39,'lines':6,'interrupted':1,'element':3,'chief':9,'okapi':2,'alloy':1,'locomotor':2,'mud-minnows':1,'immensity':1,'longest':7,'spider':8,'evolutionary':4,'thigh':1,'unpalatable':1,'minnow':1,'egg-laying':1,'nerve-cord':1,'earth':193,'triassic':6,'polished':1,'brittle':1,'bunch':1,'industries':1,'1':2,'outer':7,'exclusion':1,'positively-electrified':1,'coral-reefs':2,'hermit-crab':7,'meantime':1,'beginning--whatever':1,'permanent':1,'duckweed':1,'molten':1,'world.':2,'image':1,'originator':2,'epoch-making':1,'junction':1,'future.':1,'orthodox':1,'dam':1,'material':9,'innermost':1,'cock-paidle':1,'phagocytes':1,'snake':1,'hands':2,'front':6,'rotation':5,'cage':1,'day':15,'articles':1,'crumb-of-bread':1,'mastery':2,'establishment':9,'university':2,'sky.':1,'concave':1,'blazing':1,'vibrations':1,'trap':1,'truth':1,'pools':3,'cocoon':1,'paler':1,'traces':1,'erratic':1,'female':12,'tension':1,'scanty':3,'globe':6,'cultivated':1,'mollusc':1,'frequency':1,'sands':2,'irregularities':1,'special':1,'ebooks':1,'suctorial':2,'cerebral':1,'knickerbocker':1,'inch':1,'gossamer':1,'protoplasm':1,'cross-fertilisation':1,'oriental':1,'pendent':1,'adaptive':1,'cause':2,'red':9,'harvest-mouse':1,'thrush':6,'spot':2,'withering':1,'activity':3,'incalculable':1,'body-cavity':1,'usual':7,'qui':1,'primus':1,'sitting':1,'shortest':3,'young--a':1,'allies':1,'g':1,'route':1,'area':4,'times':2,'length':9,'keel':1,'modernising':1,'barriers':1,'empire.':1,'gamekeeper':1,'embryo':6,'finest':3,'baleen':1,'powerful':1,'scene':2,'bonnet':1,'improvements':1,'placental':1,'owner':4,'scent':1,'two.':1,'salient':1,'monkey':2,'system':4,'ripples':1,'nebular':8,'accretion':1,'caterpillars':2,'under-water':1,'nut':2,'inner':7,'shell':12,'x-rays':8,'explanation':4,'secretion':1,'natural':12,'waist':1,'plumage':1,'photograph':5,'glow-worm':1,'quietness':1,'isolation':1,'well-established':1,'discriminating':1,'heavens.':1,'dynamo':3,'stricter':1,'steep':2,'spurs':1,'ingenious':1,'imaginative':2,'sea':46,'lightly':1,'wood-cock':1,'partnership':1,'poisons':1,'variable':2,'mongolian':1,'throat':1,'apparently':2,'bark':1,'seed-box':2,'complete':3,'pollen-tubes':1,'eye-hole':1,'outward':1,'pectoral':1,'ungirt':1,'tree-frogs':1,'centre':8,'digestive':1,'eight':2,'roadside':1,'flat-fish':1,'emancipation':2,'cleverest':2,'food-canals':1,'profoundest':1,'ancestors':5,'so-called':6,'inexorable':1,'consequences':2,'deccan':1,'ovum-producer':1,'face':3,'animal--perhaps':1,'mechanical':1,'occasion':3,'fact':31,'impression':4,'atmosphere':9,'selection':1,'best-defined':1,'chances':1,'text':4,'woolly':1,'pinhead':1,'sabre-toothed':1,'seaweed':3,'rough':1,'darkest':1,'photograph.':1,'principal':1,'water-vapour':2,'knowledge':1,'jaw':4,'mid-europe':1,'jar':1,'surroundings':3,'insectivores':1,'molecules':17,'inherited':1,'b':1,'local':1,'hope':2,'photographs':2,'handle':2,'exceptional':1,'familiar':2,'background':3,'words':2,'striped':1,'emmer':1,'areas':1,'processes':1,'belts':1,'numerous':4,'cells':1,'taxes':1,'insectivorous':1,'coco-nut':1,'stuff':3,'inter-relation':1,'limpet':1,'making.':1,'embryonic':1,'generations':1,'view':4,'spotted':1,'interstices':1,'universe--the':2,'packet':1,'distantly':1,'intensity':3,'legacy':1,'cenozoic':3,'violet':1,'cleverer':2,'luminous':2,'carboniferous':13,'humblest':2,'nebulae':1,'wire':5,'pedigree':1,'jurassic':5,'pattern':1,'nebula':5,'genius':1,'state':5,'quickest':1,'carapace':2,'hebrides':1,'routine':3,'progress':3,'open-sea':2,'kidneys':3,'attention':3,'explosive':1,'ability':1,'rotating':1,'importance':4,'hurrying':1,'seaweeds':2,'kea':2,'efficiency':1,'wingless':1,'hoatzin':2,'acquisitions':2,'key':3,'eyes.':1,'precious':2,'swift':1,'problem':14,'sediments':1,'limits':5,'cranial':1,'minds':2,'pulp':1,'figures':1,'sexes':2,'plankton':1,'chest':2,'conflagration':1,'wall':2,'wavy-to':1,'mid-rib':2,'animalcule':1,'table':1,'zinc':4,'provinces':1,'palm-bones':1,'tremendous':1,'discrimination':2,'trademark':3,'dazzling':1,'immense':4,'reindeer':2,'squatting':1,'slowly':1,'curtain':1,'feather':1,'waste':1,'senses':3,'controlled':1,'received':1,'coherence':1,'sub-aquatic':1,'bulk':1,'environment.':1,'angler':3,'food-canal':5,'present':15,'associated':1,'crowds':1,'appearance':5,'will':1,'country':1,'wild':8,'discoveries':2,'supply':2,'comets':1,'spectrum--should':1,'food-debris':1,'streams':2,'chaotic':1,'blood':20,'bumbling':1,'surface':50,'raison':1,'bugbear':1,'greater':1,'watchful':1,'jaws':1,'pit':1,'carbohydrates':1,'richness':1,'radiation':2,'forceps':2,'fashioning':1,'romance':5,'strange':1,'exuberance':1,'flower':2,'geographical':1,'ante-natal':2,'well-grown':1,'firmament':1,'neolithic':3,'ball':1,'dusk':2,'appearances':2,'effect':6,'experimenter':1,'colouring':1,'student':2,'fierce':2,'frequently':1,'whale':3,'wonder-world':1,'colour':12,'banded':1,'larvae':1,'ear-passage':2,'english':2,'position':1,'wreckage':1,'drawing':1,'latest':2,'reefs':1,'enormously':4,'flesh':2,'wren':1,'faunal':1,'domestic':1,'flywheel':2,'satellites':1,'ermine':2,'stored':1,'distant':3,'inturned':1,'cuckoo-spit':2,'protecting':1,'glue':1,'wrens--to':1,'grappling':1,'rapid':2,'ovum':3,'work.':1,'antarctic':2,'bell':5,'sky':7,'deposits':2,'transparent':3,'reasons':3,'wet':2,'usage':1,'ought':1,'characteristically':1,'meteor':1,'fate':2,'disappearance':1,'biologists':1,'smithsonian':10,'originative':1,'prominent':2,'loss':1,'backboned':1,'like':11,'success':1,'safest':1,'parasite':2,'colonising':1,'leaves':2,'works':2,'soft':4,'radiant':1,'heel':2,'wonders':3,'glare':2,'ages--evolution':1,'thymus':1,'phenomena':4,'mosquitoes':1,'eventfulness':1,'growth':3,'warmer':1,'past.':1,'proper':2,'trammels':1,'employment':1,'mother':12,'recognition':1,'possibilities':1,'leaf':6,'broad':4,'separate':1,'ether':27,'tadpole':3,'magnitude':2,'board.':1,'fruition':1,'biology':1,'scapula':1,'butterfish':1,'decline':1,'tenability':1,'paper':4,'pressure':3,'host':5,'instinct':2,'germination':1,'brain-box':1,'dredge':1,'transformations':1,'actual':8,'extension':2,'electron--the':1,'universe':37,'certainty':1,'preen':1,'andes':1,'carrier':1,'dominion':1,'rock-record':1,'flattened':1,'tongue':3,'contending':1,'letters':1,'fresh':2,'primal':1,'chemists':1,'wearisome':1,'promise':1,'erect':3,'times.':1,'registration':1,'protozoa':3,'swimmers':1,'mere':4,'endeavours':1,'parentage':1,'sticklebacks':2,'additional':2,'zoologist':1,'slow-worm':1,'museum':2,'larval':3,'spiral':3,'spots':4,'continental':1,'much':4,'invisibility':1,'cell.':1,'biggest':2,'maze':1,'breeding':4,'mouth.':3,'function':1,'funnel':1,'north':11,'gait':1,'repeated':1,'construction':1,'highest':8,'bug':1,'bud':1,'eel':2,'tactics':2,'cohesion':1,'places':2,'volplaning':1,'gravitational':3,'official':2,'smooth':1,'triumphant':1,'poker.':1,'record':1,'projecting':1,'lynx':2,'static':1,'distribution':1,'piece':4,'stirring':1,'supreme':1,'mesozoic':7,'universal':5,'penny':2,'whelk':2,'persistent':1,'water-vole':1,'ten-millionth':1,'elaborate':1,'tide.':1,'education':1,'domesticated':1,'atom--that':1,'mutual':2,'variety':4,'deadly':1,'fore-arm':3,'forests':2,'other':65,'boom':1,'branch':3,'mass':8,'wing':5,'chemist':1,'conclusion':6,'sunshine':2,'kinds':1,'tides':17,'variation':1,'enlargement':2,'astronomy':1,'exposure':1,'ranks':2,'space':1,'pigment-cells':1,'rule':4,'forest.':1,'eighties.':1,'inset':1,'half-second':1,'meteoritic':1,'sun--the':2},'marsupials':{'insectivorous':1,'on':1,'where':1},'musical':{'genius':2},'kinship':{'would':1},'deep-red':{'light':1,'waves':1},'unified':{'by':1},'macaque':{'second':1,'genus':1},'indigo':{'and':1,'to':1,'salicylic':1,'for':1,'in':1},'kale':{'and':1},'quoted':{'tells':1},'photo':{'press':1,':':164,'press.':1},'newton':{'because':1,'for':4,'except':1,'s':1,'taught':1,'worked':1,'was':1},'wasps':{'exhibit':1,';':1,'are':1,'.':1},'cap.':{'illustration':1},'thanks':{'to':2},'victim':{'to':1,'unawares.':1,'.':1},'upturned':{'side':1},'triticum':{'hermonis':1},'electronically':{'the':1,'in':1},'thyroid':{'and':1,'the':1,'.':1},'fearful':{'crime':1},'hills':{'and':2,'the':1},'evidences':{'perhaps':1,'of':5},'passive':{'the':1,'drifters':1,'in':1},'alchemy':{'but':1},'belongs':{'to':1,'was':1,'illustrates':1},'transformed':{'for':1,'descendants':1,'into':2,'directly':1,'guise':1,'by':1,'descendant':1},'board':{'a':1,'nail':1,'ship':1,'with':1,'in':1},'marginal':{'tentacles':1},'industrious':{'but':1},'openings':{'from':1},'photographed':{'from':1,'in':2},'boxed':{'in':1},'them--as':{'a':1},'required.':{'it':1},'caps':{'may':1,'on':1},'it--for':{'several':1},'fusion':{'of':3},'god.':{'nevertheless':1},'argonauta':{'an':2},'cape':{'colony':1},'rough-and-tumble':{'conditions':2},'retreat':{'but':1,'.':1},'hairless':{'whale':1},'utilisation':{'of':2,'was':1},'insurgent':{'nature':1},'cooler':{'vapours--the':1,'than':1,'they':1},'lapsed':{'intelligence':1},'sand-hoppers':{'and':1,'when':1},'evidence.':{'experiments':1},'homing':{'pigeons':1,'pigeon':2},'night':{'and':5,'means':1,'of':1,'is':2,'between':1,'when':2,'algol':1,'.':3,'to':2,'year':1,'the':1,'with':1,'or':1},'security':{'not':1,'that':1},'amoebae':{'and':2,'in':1},'cooled':{'down':2,'and':1,'so':1,'at':1},'dentition':{'but':2},'webb':{'celestial':1},'portuguese':{'man-of-war':2,'men-of-war':1},'bricks.':{'in':1},'lashes':{'or':1},'sends':{'to':1,'on':1},'3030':{'0':1},'1909':{'showing':1,'23':1},'fully-formed':{'creature.':1,'eel.':1,'young':1},'odours':{'a':1},'minnow--the':{'mind':1},'lashed':{'cells':1},'waves--which':{'are':1},'vertebrae':{'forming':1,'of':1,'as':1,'which':1,'.':2},'rill':{'of':1},'orchid':{'perched':1},'signifying':{'particular':1},'asking':{'the':1,'an':1},'lassoes':{'on':1},'month.':{'surprising':1},'colour-cells':{'chromatophores':1,'in':1},'beating':{'seconds':1,'heart':1,'of':1},'columbus':{'voyages':1,'.':1},'states.':{'1.e':1},'view':{'and':2,'that':6,'of':17,'is':3,'primary':1,'.':1,'will':1,'their':1,'maintained':1,'does':1,'which':1,'instinctive':1},'confer':{'upon':1},'illustration':{'24':1,'and':2,'144':2,':':233,'20':1,'that':1,'may':1,'158':1,'showing':2,'indicates':1,'74':1,'168':1,'of':10,'252':1,'280':1,'92':1,'172':1,'is':3,'shows':3},'constructive':{'chemical':1,'possibilities':1},'--these':{'also':1},'six.':{'beyond':1,'it':1},'peer':{'of':1},'taker':{'of':1},'post':{'shows':1},'properties':{'and':1,'of':1,'utterly':1,'attributed':1},'takes':{'stones':1,'on':1,'in':1,'up':1,'approximately':2,'air':1,'to':4,'place':1,'a':3,'time':2,'fresh':1,'the':1,'place.':1,'its':1,'at':1},'chaff':{'separated':1},'theirs':{'certainly':1},'coral':{'and':1,'islands':2,'built':2,'have':1},'months':{'and':1,'within':1,'old':2,'of':3,'after':1,'in':2,'from':1,'the':1,'before':1,'more':1},'constituting':{'that':1},'gentler':{'hills':1},'self-preserving':{'and':1},'horizon':{'the':1},'octopus':{'attacking':2},'serviss':{'curiosities':1},'considerations':{'there':1},'dilemma':{'of':1},'scantier':{'light':1},'pays':{'an':1},'crittur':{'on':1},'float':{'idly':1,'apart':1},'bound':{'to':3,'into':1,'up':1,'by':3},'gearing':{'it':1},'loin':{'and':1},'capped':{'with':1},'magnified.':{'is':1,'the':2,'illustration':1},'formidable':{'forelegs':1,'teeth.':1},'palaeozoic':{'the':1,'nine':1,'mesozoic':1,'era':4},'tint.':{'thus':1},'strangely':{'limited':1,'regular':1},'fight':{'but':1},'conservation':{'of':1},'way':{'and':6,'rooks':1,'specially':1,'remarkable':1,'acquired':1,'into':1,'we':5,'see':1,'through':2,'are':1,'in':10,'offshore.':1,'herring-gulls':1,'from':3,'for':2,'how':1,'there':1,'.':14,'note':1,'to':7,'which':4,'14':1,'out':1,'was':1,'over':1,'gave':1,'round.':1,'begins':1,'comparable':1,'arises':1,'aspects':2,'extend':1,'that':3,'ancestral.':1,'however':1,'but':1,'it':1,'never':1,'along':1,'with':4,'by':1,'he':1,'a':1,'like':1,'of':24,'as':2,'so':1,'back':1,'each':1,'the':7},'wax':{'from':1},'editions':{'will':2,'all':1,'means':1},'dorsal':{'vertebrae':2},'was':{'all':1,'just':2,'less':2,'caused':1,'able':1,'satisfied':1,'discovered':8,'astonished':2,'taken--the':1,'stored':1,'through':1,'still':2,'nearer':1,'certainly':1,'vigorously':1,'also':3,'thinking':1,'much':1,'regarded':1,'exercising':1,'actually':1,'to':3,'finally':1,'spread':1,'bridged':1,'hidden':1,'foster-parent':1,'sent':1,'brown':1,'watching':1,'prevented':2,'replaced':1,'possible':1,'possibly':1,'five':1,'altogether':1,'not':16,'during':2,'associated':2,'now':2,'continued':2,'killed':1,'forty-five':1,'wont':1,'rotating':2,'like':2,'shaped':2,'heaved':1,'joined':1,'twice':1,'found':6,'entirely':1,'spotted':1,'the':49,'set':2,'often':1,'hinted':1,'achieved':1,'absolutely':2,'hard':1,'some':1,'somehow':1,'dead':1,'observed':1,'born':1,'semi-tropical':1,'taught':1,'enhanced':1,'further':1,'extended':1,'perfected':1,'out':1,'established':1,'ultimately':1,'said':1,'imported':1,'placed':2,'unable':1,'probably':8,'neither':1,'ever':1,'filled':1,'freed':1,'condensed':1,'felt':2,'never':2,'quite':1,'by':3,'following':1,'protection':1,'practically':1,'sixty':1,'drawn':1,'joule':1,'promptly':1,'beginning':1,'implicit':1,'suggested':1,'on':1,'about':2,'grist':1,'created':1,'of':1,'barely':1,'later':1,'accomplished':1,'conveyed':1,'unknown':1,'asked':1,'first':1,'composed':1,'raised':1,'already':1,'followed':1,'merely':1,'marked':2,'one':5,'brought':2,'soaring':1,'because':1,'done':1,'cultivated':1,'elementary':1,'proved':2,'noticed':3,'repopulation':1,'doubtless':2,'once':5,'given':3,'invented':2,'from':1,'twenty':1,'due':2,'long':1,'quickly':1,'going':1,'punished':1,'too':4,'taken':2,'formed':1,'laboriously':1,'until':1,'opposed':1,'only':3,'that':4,'happily':1,'mind':2,'offered':1,'continuous':1,'but':2,'direct':1,'repeated':1,'part':2,'known':3,'trying':1,'true':1,'travelling':1,'he':2,'applied':2,'made':4,'this':1,'crossed':1,'originally':3,'immaterial':1,'premature':1,'sometimes':1,'cast':1,'near':1,'accustomed':1,'believed':1,'making':1,'called':2,'at':3,'150':1,'discovered.':1,'constant':1,'then':2,'almost':1,'thus':1,'it':2,'slowing':1,'an':5,'something':1,'in':9,'distinguishable':1,'any':3,'constructed':1,'effected':1,'dimly':1,'no':7,'perhaps':2,'when':1,'isolated':1,'evidently':1,'shorter':1,'.':2,'ordinary':1,'first--began':1,'fairly':1,'used':1,'tried':1,'emotionally':1,'living':1,'conceived':1,'upon':1,'most':2,'moving':1,'destined':2,'propagated':1,'aware':1,'subsequently':1,'a':40,'off':1,'happening':1,'largely':1,'broadened':1,'stronger':1,'or':1,'exceedingly':1,'implied':1,'so':4,'persistently':2,'very':4,'underrated':1,'swimming':1,'sounded':1,'refused':1,'repeopled':1},'war':{'would':1,'mr':1,'museum.':4,'note':1,'to':1,'in':1,'was':1,'254':1},'lowest':{'mammals':1,'pleistocene':1,'there':1,'.':1,'tide':1,'human':1,'arm':1,'first':1},'gaseous':{'state':1,'nebula':3,'nebulae':2,'ring':1,'.':1},'wheatfields':{'were':1},'afresh':{'and':1,'to':1},'fish-eater':{';':1},'becoming':{'longer.':1,'a':2,'longer':1,'suddenly':1,'of':1,'stereotyped':1,'.':2,'almost':1,'complicated':1,'either':1,'in':2,'linking':1,'adapted':1,'more':1},'converse':{'process--a':1},'peninsula':{'of':1,'it':1},'mysterious':{'phases':1,'rays':3,'force':1,'sailing':1,'universe':1,'as':1,'manifestations':2,'forces':1,'cold':1},'quiet-flowing':{'stretches':1},'needles':{'and':1,';':1},'same.':{'a':1},'astonished':{'to':2,'euclid':1},'true':{'flier':2,'is':1,'sense':2,'multicellular':1,'as':2,'in':4,'even':1,'to':1,'ventral':2,'nature':2,'when':1,'.':4,'also':1,'water-spider':1,'circle':1,'bird.':1,'we':1,'flight':1,'that':6,'men':1,'but':1,'fishes':1,'lids':1,'of':6,'mimicry.':1,'the':1,'or':1},'absent':{'of':1,'from':1},'edition.':{'most':1},'reproductive':{'and':1,'cells':1,'organs':3},'ancestral':{'forms':2,'home':1,'stocks':1},'maximum':{'abundance':1,'as':1,'sparseness':1,'in':1,'disclaimer':1},'arc-lamp':{'is':1},'generosity':{'which':1},'emotional':{'art':1,'halo':1},'emit':{'light':2,'but':1},'hotter':{'and':1,'than':1,'.':2,'at':1,'the':1,'until':1},'frederick':{'matter':1,'soddy':1},'muscular':{'appendages':1,'arrangements':1,'system':1},'evidence':{'for':2,'e.g':1,'of':12,'is':1,'there':1,'1':1,'to':1,'that':3,'are':1,'in':2,'suggesting':1,'the':1,';':1},'guessed':{'at':1},'juice.':{'illustration':1},'promised':{'land':2},'prayer':{';':1},'20':{'of':1,'000':1,'reproduced':1,'ounces':1},'life--story':{'of':1},'archive':{'foundation':12,'foundation.':1},'physical':{'and':2,'strength':1,'laboratory.':2,'constitution':1,'basis':1,'universe':1,'environment':1,'renaissance':1,'peculiarities':1,'medium':2,'fact':1,'type':1,'laboratory':1,'conditions':1,'change':1},'curiosities':{'of':1},'dimly':{'guessed':1,'unveiled':1,'aware':1},'dying':{'a':1,'--the':1,'suns':2,'of':1,'sec':1,'sun':1},'40-inch':{'refracting':2,'refractor':2},'reality':{'even':1,'of':3,'one':1,'by':1,'.':3},'pickering':{'thinks':1,'another':1},'holding':{'a':2,'firm':1,'them':2,'her':1,'on':1,'up':1,'fast':3,'their':1},'test':{'the':1,'variations':1,'what':1},'shrink':{'amazingly':1,'into':1,'by':1,'in':1},'robber-crab':{'birgus':2,'as':1,'with':1,'which':2,'for':1},'ordovician':{'the':1,'period':3},'brothers':{'may':1,'.':1},'welcome':{'realisation':1},'convincing':{'impression':1,'enough':1,'quality':1,'though':1},'anatomist':{'sir':1},'walton':{'the':1},'scores':{'of':3},'dissipation':{'of':1},'ours.':{'sec':1},'promise.':{'each':1},'kelts':{'after':1},'interval':{'of':1},'together':{'and':5,'as':5,'result':1,'in':4,'again':2,'by':3,'make':1,'.':3,'to':2,'you':1,'ever':1,'do':1,'again.':1,'but':1,'they':1,'with':2,';':1,'a':3,'of':1,'loosely':1,'so':3,'the':1},'brocklehurst.':{'a':2,'the':2},'beds':{'of':5,'which':1,'were':1},'reception':{'that':1},'sporozoa':{'like':1},'marinus':{'120':1,'which':1},'tigris':{'and':1},'concept':{'and':1,'of':1,'man':1},'impulse':{'to':2,'or':2},'phosphorescence':{'.':1},'aptitudes--power':{'of':1},'dance':{'but':1},'fulcrum':{'for':1},'brownian':{'movement':5},'contingencies--the':{'risk':1},'dalton':{'who':1,'.':1},'tenable':{'now.':1},'layers':{'that':2,'of':4,'into':1,'envelop':1,'.':1,'below':1},'certainly':{'they':1,'scanty':1,'serve':1,'due':1,'been':1,'one':2,'deserves':1,'is--but':1,'not':1,'white':1,'an':1,'was':1,'tells':1},'zone':{'on':1,'there':1,'was':1,'between':1},'shrinkage':{'of':2,'.':1},'hump':{'would':1},'flash':{'from':1,'across':1,'lasts':1},'absorbing':{'dry':1,'matter':1,'some':1},'fog':{'as':1},'permanently':{'like':1},'rhythm':{'which':1},'division':{'of':7,'or':2},'protective':{'resemblance':9,'significance--called':1,'capacity':1,'coloration':6},'sockets':{'along':1},'diminish':{'to':1},'particles.':{'the':1,'they':1},'liability':{'to':2,'costs':1,'breach':1},'aesop':{'prawn':3},'corals.':{'the':1},'mendelism':{'and':1},'trouble':{'than':1},'maternal':{'chromosomes.':1,'call':1,'virtue':1,'care.':1,'origin.':1,'affection':1,'care':1},'brows':{'and':1},'feeble':{'and':1,'current':1,'life':1},'rotating':{'on':1,'about':1,'quicker':1,'faster':2,'very':1,'flywheel':2,'disc':4,'earth':1,'immensely':1,'with':1,'round':3},'perceived':{'the':1,'.':2,'what':1,'either':1},'respiratory':{'system':1,'surface':1},'scandinavia':{'showing':2,'138':1,'141':1},'presented':{'alternately':1,'them':1,'simultaneously':1},'altering':{'the':1},'turns':{'on':2,'always':1,'upon':1,'to':1,'the':1,'round':1},'gun':{'that':1},'gum':{'is':1},'ox':{'and':1},'p':{'.':10},'means--resides':{'in':1},'revolutionised':{'physics':1},'gut':{'is':1,'which':1},'sloths':{'and':1},'woven':{'somehow':1},'upper':{'side.':1,'atmosphere':1,'eyelid':1,'fish':1,'pliocene':1,'reaches':3,'corner':1,'arm':1,'or':2,'pleistocene':2,'cretaceous':1,'regions':1,'parts':2,'lip':3,';':1,'hand':1,'diagram':1,'part':2,'surface':4,'cambrian':1,'photograph':1,'air':1,'side':1},'revolution':{'of':1,'diameter':1,'in':3},'full-grown':{'fish':1,'salmon':1,'shore-crab':1,'individual':1,'the':1,'creature':1},'penetrates':{'the':1},'spoonbill':{'s':2},'d':{'etre':1,'.':1},'niggardly':{'for':1},'affiliation':{'to':1,'with':1},'semi-tropical':{'for':1},'cost':{'and':2,'fee':1,'when':1,'but':1},'change-provoking':{'cross-fertilisation.':1},'helpless':{'that':1},'penetrated':{'further':1,'into':3},'cargo':{'that':1},'appear':{'and':1,'a':1,'it':1,'.':1,'to':9,'as':1,'much':1,'denser':1,'prominently':1,'white':1},'assistance':{'they':1},'burrowers':{'and':1,'like':1},'uniform':{'and':2,'set':1,'temperature':9,'teeth':1},'wave-motion':{'in':1},'eight-armed':{'cuttlefish':2},'illustrations':{'facing':1,'of':2,'all':1,'are':1,'among':1},'shared':{'the':1,'with':1,'equally':1,'by':1},'flame.':{'perhaps':1},'sea-cucumbers':{'lamp-shells':1},'institutions--all':{'must':1},'alertness':{'and':1,'of':1,'along':1,'is':1},'safety.':{'we':1},'supporting':{'and':1,'axis':3},'anvil.':{'as':1},'whiteness':{'may':1,'makes':1,'.':1},'disclaim':{'all':1},'suckers':{'which':1},'sieve':{'incalculable':1},'teacher':{'and':1,'always':1,'the':1,'between':1},'change':{'whose':1,'by':1,'abundant':1,'from':1,'of':9,'into':1,'in':6,'but':1,'.':2,'produced':1,'till':1,'every':1,'they':1,'reorganisation':1,'need':1,'the':1,':':1,'its':2,';':2,'is':1},'sending':{'a':1,'out':1},'illustration.':{'such':1},'flames':{'are':1,'rose':1,'from':1,'peeping':1,'of':1},'impatiently':{'postulated':1},'precursor':{'of':1},'twenty-seven':{'of':1},'vibrating':{'or':1},'trial':{'and':5,'of':1,'the':1,'was':1},'pictorial':{'diagram':1,'representation':3},'usually':{'about':1,'formed':1,'in':3,'longer':1,'produces':1,'very':1,'regarded':2,'work':1,'credited':1,'back':1,'rank':1,'less':1,'multiplies':1,'coming':1,'got':1,'given':1,'disappears':1,'creep':1,'mean':1},'locomotion':{'and':1,'becomes':1,'it':1,'192':1,'which':2,'the':1},'432':{'times':1},'inference':{'we':1,'when':1,'but':1,'.':1,'reason':1,'in':1,'not':1,'or':1},'saunders':{'with':1,'hit':1,'so':1},'stimulus.':{'2':1},'keenness':{'of':1},'sign':{'of':2},'marked':{'a':1,'on':1,'superficial':1,'off':2,'and':1,'d.p.':1,'h':1,'differences':1,'up':1,'vm':1,'by':8,'rotting':1,'fusion':1,'5':1,'in':3,'the':2,'changes':1,'than':1,'as':1},'outfly':{'a':1},'italians':{'punics':1},'seashore':{'and':2,'animals':1,'into':1,'.':1,'sponge':1,'to':1,'through':1,'struggle':1,'in':1,'birds':1},'comets--millions':{'of':1},'capacious':{'and':1,'mouth':1},'illumination':{'is':1,'or':1,'would':1},'rarely':{'seen':1,'over':1,'hinted':1,'dying':1},'pressure--2-1':{'2':1},'stingy':{'for':1},'cuttlefishes':{'which':1,'are':1,'have':1,'in':1,'the':1,'where':1,'by':1},'terminal':{'chamber':1},'breed.':{'there':1},'stereoscopic':{'vision':1},'primrose':{'among':1},'prove':{'to':1,'the':3,'his':1,'that':2},'time-table':{'the':1},'territories':{'of':1},'live':{'a':1,'on':4,'equally':1,'for':1,'independent':1,'far':1,'is':1,'there':2,'among':1,'much':1,'in':5,'the':1,'comfortably':1},'spontaneity':{'on':1},'wonderfully':{'supplemented':1,'rapid':1,'complete':1,'energetic':1},'bluffing':{'on':1},'1.e.8.':{'1.b':1},'angels':{'crowned':1},'entrance':{'and':1,'to':2},'water-ouzel':{'or':1},'cluck':{'when':1},'regrowing':{'them':2},'envelope':{'immediately':1,'or':1,'stops':1,'of':1},'planarian':{'worms':1},'clue':{'to':2},'grilse':{'and':1,'stage':1},'envelops':{'our':1,'the':1},'clumps':{'of':1},'duck-ponds':{'or':1},'migrants':{'from':1},'haddington':{'of':1},'nature--on':{'which':1},'theory--spiral':{'nebulae--the':1},'wolf-dog':{'226':1,'an':1},'cat':{'a':1,'could':1,'has':1,'or':2},'hardest':{'solid':1,'steel':1},'gathers':{'on':1,'more':1},'can':{'control':1,'now':2,'think':1,'divide':1,'be':63,'almost':1,'move':1,'notice':1,'sting':2,'replenish':1,'outfly':1,'say':5,'harness':1,'exist':1,'expect':1,'have':1,'re-utilise':1,'go':1,'dissolve':1,'to-day':1,'discern':1,'glimpse':1,'detect':2,'from':1,'calculate':1,'no':1,'always':1,'transfer':1,'make':4,'offer':1,'help':1,'only':5,'continually':1,'also':2,'live':1,'call':2,'therefore':1,'transmit':1,'survive':5,'hardly':4,'tell':3,'hope':1,'take':2,'breathe':1,'do':4,'we':1,'trace':1,'get':2,'afford':1,'never':1,'use':1,'discover':1,'observe':1,'unfurl':1,'recognise':1,'imagine':4,'distinguish':1,'affect':1,'copy':1,'fly':1,'reveal':1,'extend':1,'in':2,'apprehend.':1,'receive':1,'ever':1,'conceive':1,'work':1,'well':1,'see':4,'retain':1,'grind':1,'credit':1,'remain':1,'succeed':1,'form':1,'confidently':1,'easily':4,'become':1,'weigh':1,'the':1,'assign':1,'travel':1},'thirty-five':{'seconds':1,'minutes':1},'metamorphosis':{'the':1,'.':1},'stimulating':{'and':1,'conditions':1,'change':1},'http:':{'www.pgdp.net':2,'www.pglaf.org.':1,'www.gutenberg.org':2,'gutenberg.org':1,'pglaf.org':4},'heart':{'a':1,'for':1,'of':5,'there':1,'it':1,'.':1,'true':1,'or':1},'pauses':{'in':1},'expanding':{'during':1,'fan':1},'apartness':{'there':1,'from':1},'heard':{'not':1,'of':2,'the':1,'felt':1,'than':1},'chin':{'and':1,'process':1,'.':3},'clothing':{'and':1,'with':1},'occur':{'and':2,'only':1,'also':1,'near':1,'in':4,':':1},'candle;':{'the':1},'infantile':{'call':1,'mortality':3},'dispositions':{'of':1},'discussion':{'of':1,'there':1},'starch':{'and':1,'molecule':1,'.':1},'sandstone':{'was':1,'or':1},'condensation.':{'spiral':1},'offspring':{'and':1,'for':1,'of':1,'is':2,'.':2,'mate':1,'at':1},'nowhere':{'do':1},'despair':{'returned':1},'candle.':{'it':1},'actual':{'photographs':1,'distance':1,'solution...':1,'constitution':1,'temperature':2,'centre':1,'photograph':1,'entity':1,'direct':1,'observations':1,'historical':1,'mechanical':1,'precipitate':1,'dimensions':1},'future.':{'4':1},'familiar':{'case':1,'hum':1,'is':1,'in':2,'type':1,'with':3,'example':1,'fact':1},'over-population':{'and':1,'in':1},'brine-shrimp':{'artemia':1},'dominance':{'of':1},'economy':{'of':2},'gonads':{'only':1},'product':{'which':1},'burrowing':{'mammals':1,'reptiles':1,'parrot':1,'amphibians':1,'birds':1},'southern':{'europe':1,'india':1,'asia':1,'hemisphere':1,'representative':1,'sea':2},'unobtrusive':{'appearance':1},'disgusted':{'next':1},'significance.':{'it':1,'they':1},'produce':{'a':3,'what':1,'very':1,'light':1,'tides':1,'seeds':1,'in':1,'our':1,'the':2,'helium':1},'flourish':{'sometimes':1,'alongside':1},'mentality':{'and':1,'cannot':1,'.':1},'lifting':{'scrap':1,'handling':1},'upbuilding':{'constructive':1},'visitors':{'and':2,'.':1,'are':1,'have':1,'threw':1},'remember':{'how':1,'the':3,'that':3,'sally':1,'their':1},'whenever':{'the':2,'there':1,'any':1},'corona':{'of':2,'is':1,'stretching':1,'which':1,'that':1},'rather':{'a':1,'we':1,'ferocious.':1,'grouselike':1,'longer':1,'that':1,'humdrum':1,'more':2,'than':9,'to':1,'far-fetched':1,'excitedly':1,'in':4,'paltry':1,'eventful':1,'nondescript':1,'simpler':1,'with':1,'the':1,'trout-like':1,'like':1},'conquests':{'of':1},'punting':{'when':1,'sculling':1},'typical':{'plants':1,'spectra':1,'craters':1,'districts':1,'expression':1,'assemblage':1},'no.':{'bred':1},'serving':{'as':1,'the':1},'iii.':{'trial-and-error':1},'indeed':{'what':2,'climate':1,'made':1,'beyond':1,'that':1,'many':1,'no':1,'we':1,'unsurpassable':1,'will':1,'.':1,'safety':1,'they':1,'always':1,'our':1,'the':1,'believe':1,'if':1},'beak':{'and':1,'is':1,'.':1,'under':1},'well-illumined':{'seaweed-growing':1},'playful':{'such':1,'creature':1},'brain':{'and':9,'weighs':1,'is':7,'as':2,'are':1,'should':1,'from':2,'.':2,'does':3,'which':4,'instead':1,';':2,'has':1,'was':2,'shows':1,'development':2,'than':1,'receiving':1,'of':3,'could':1,'inferred':1,'cast':1},'stile':{'which':1},'hairs--an':{'alga':1},'nitrogen':{'of':1},'cold':{'and':1,'on':2,'poker':1,'outer':1,'for':2,'light':1,'.':1,'water':1,'to':1,'weather':1,'iron':2,'of':3,'dark':1,'absorbs':1,'luminosity':1,'yet':1,'came':1},'still':{'and':1,'atmosphere':1,'smaller':3,'being':2,'progressing.':1,'some':1,'it':1,'probing':1,'say':1,'exist':1,'farther':1,'in':3,'further':3,'nearer':1,'bears':2,'unknown':1,'.':3,'shorter':3,'to':1,'going':1,'goes':1,'persist':1,'molten':1,'was':1,'unstereotyped':1,'more':3,'we':1,'himself':1,'very':3,'continuing':1,'plays--the':1,'but':1,'particular':1,'not':1,'with':1,'the':2,'possess':1,'a':1,'made':1,'uncertain':1,'flourished':1,'room':1,'at':1,'tower':1,'feeling':1,'soft':1,'are':1},'birds':{'and':23,'feed':1,'because':1,'often':1,'show':1,'being':1,'is':3,'191':1,'it':1,'as':2,'are':4,'sight':1,'in':1,'carry':1,'seem':1,'its':1,'little':1,'squat':1,'for':1,'how':1,'make':2,'there':1,'.':2,'to':1,'find':1,';':1,'was':1,'evolved':2,'reaching':1,'may':1,'pick':1,'illustration':1,'like':7,'bolt':1,'such':1,'than':1,'must':1,'a':1,'that':4,'of':2,'turn':1,'have':2,'learn':1,'the':1,'where':1,'came':1},'statuettes':{'representing':1},'nucleus.':{'the':1,'illustration':1},'culmination':{'of':1},'tending':{'on':1,'toward':1,'to':3},'curly':{'greens':1},'rhizopods':{'such':1,'with':1},'willow':{'fertile':1,'grouse':2},'forms':{'and':6,'e.g.':1,'almost':1,'over':1,'it':2,'are':1,'arise':1,'kinetic':1,'again':1,'from':2,'.':2,'which':1,'tends':1,';':1,'we':1,'may':1,'daughter-buds':1,'a':7,'like':2,'of':22,'possessed':1,'so':1,'the':1,'or':1},'immortality':{'of':1},'suffocate':{'.':1},'spacious':{'bountiful':1,'cranial':1},'physics--research':{'and':1},'bird.':{'experiments':1,'illustration':2},'pruned':{'off':1},'speeding':{'toward':1},'inter-relations':{'such':1,'.':2,'where':1,'between':1,'simpler':1},'introduce':{'domesticated':1,'us':1,'an':1},'archaeozoic':{'and':1,'ages':1},'tails':{'of':1,'can':1,'.':1},'half':{'a':7,'old':1,'that':1,'of':3,'days':1,'an':3,'hours':2,'to':1,'tons':1,'miles':1,'mile':1,'the':4,'years':1,'out':1},'not':{'represent':1,'all':4,'clog':1,'help':1,'limited':2,'being':1,'indeed':2,'armour':1,'fall':1,'held':1,'through':1,'go':2,'follow':3,'yet':5,'also':1,'convinced':1,'less':5,'young':1,'mathematically':1,'to':11,'only':16,'stand':1,'touched':1,'easy':1,'attained':1,'include':1,'then':2,'unfitting':1,'closed':1,'knock':1,'very':9,'void':1,'material':2,'stop':1,'possible':2,'possibly':1,'open.':1,'know':13,'altogether':1,'accumulate':1,'affect':2,'one':2,'discuss':1,'easily':3,'practise':1,'necessary':1,'like':1,'tear':1,'fully':2,'try':1,'pursue':1,'feel':1,'stopped':1,'always':3,'small':1,'become':1,'entirely':1,'fixed':1,'mean':1,'exceed':1,'related':1,'certain':1,'know.':1,'likely':1,'sure':1,'exist.':2,'functioning':1,'packed':1,'even':3,'appear':2,'for':2,'uniform':1,'liberated':1,'radiated':1,'suggesting':1,'got':2,'be':20,'we':1,'disputed':1,'intelligent.':1,'cellulose':1,'however':1,'hundreds':1,'met':1,'necessarily':3,'attend':1,'backed':1,'quite':4,'come':1,'by':5,'momentous':1,'wait':1,'suggested':1,'on':2,'essentially':1,'indivisible':2,'many':1,'emit':1,'amount':1,'sweat':1,'permit':2,'undergo':1,'think':1,'burning':1,'gone':1,'previously':1,'requiring':1,'merely':2,'bound':1,'highly':1,'visible':1,'been':3,'carry':1,'impossible':1,'want.':1,'readily':3,'given':1,'wanted':1,'from':1,'droop':1,'prove':2,'assumed':1,'there':1,'self-luminous':1,'citing':1,'long':1,'throw':1,'cooling':1,'change':1,'strong':1,'suit':1,'show':2,'survive':1,'themselves':1,'molecular':1,'depreciate':1,'too':1,'a':16,'solicit':2,'received':1,'with':2,'ascribe':1,'but':1,'taken':1,'understand':1,'dwell':1,'catch':1,'copy':1,'true':1,'save':1,'unlike':1,'solid':1,'require':3,'imply':1,'will':1,'greatly':1,'how':1,'of':2,'more':6,'agree':3,'say':1,'and':1,'claim':1,'troublesome':1,'fit.':1,'give':1,'judge':1,'salmo':1,'arise':1,'share':1,'it':1,'an':3,'involve':1,'as':4,'exist':1,'at':2,'have':5,'in':5,'seen':1,'seem':4,'occupied':1,'any':2,'instinctively':1,'terrestrial':1,'conspicuous':1,'want':1,'perhaps':1,'sprawl.':1,'travel':1,'get':1,'able':1,'till':2,'interested':1,'take':2,'cling':1,'contain':1,'wanting':1,'shirk':1,'difficult':1,'used':1,'intended':1,'see':1,'dive':1,'after':1,'charge':2,'produce':2,'moving':1,'uncommon':1,'recognise':1,'revolve':1,'unlink':1,'nipped':1,'known':2,'pure-bred':1,'lead':3,'surprising':3,'clear':1,'lose':1,'flow':1,'asked':1,'without':1,'so':10,'allow':1,'far':1,'hear':1,'the':16,'make':3,'talk':1,'nearly':3},'ritchie':{'a':1,'s':1,'well':1},'courtship':{'or':1},'now':{'and':4,'studying.':1,'who':1,'exists':1,'be':2,'is':4,'successfully':1,'it':6,'an':2,'observed':1,'known':4,'as':1,'at':1,'a':1,'in':2,'our':1,'disappear':1,'if':1,'extinct--taking':1,'what':3,'based':1,'just':1,'to':3,'much':1,'there':3,'able':1,'send':1,'.':2,'extinct.':1,'that':1,'recognised':1,'pretty':1,'mars':1,'taken':1,'announce':1,'occurs':1,'crookes':1,'do':1,'we':4,'used':1,'complete':1,'slight':1,'evolving':1,'lights':1,'regard':1,'but':1,'permanent':1,'moving':1,'know':4,'accompanied':1,'represented':1,'one':1,'between':1,'unavailable':1,'concentrated':1,'high':1,'made':1,'this':5,'going':2,'other':1,'these':1,'suppose':1,'can':1,'believed':2,'let':2,'the':9,'assume':1,'called':1},'provision':{'of':1},'left--to':{'snap':1},'nor':{'do':1,'certainty':1,'like':1,'would':1,'hibernates':1,'very':1,'indeed':1,'is':1,'knew':1,'surface':1,'destroyed':1,'to':1,'explain':1,'does':1,'in':3,'of':2,'has':1,'any':1},'nos':{'.':2},'lineage':{'for':1},'it--a':{'natural':1,'mind':1},'sea-butterflies':{'on':1},'seaweed-growing':{'shelf':2,'area':1},'drop':{'of':2,'inwards':1,'out':1},'form.':{'it':1},'cagcombe':{'co.':2},'intrigued':{'at':1},'bursts':{'through':1},'luminosity':{'a':1,'indefinitely':1,'we':1,'due':1},'cusps':{'on':1},'entirely':{'different':3,'marine.':1,'dependent':1,'absent;':1,'random':1,'fluid':1,'unsolved.':1,'electrical':1,'in':1,'new':1,'dissipated':1,'with':1,'out':1},'cliffs':{'of':1,'there':1},'last':{'and':1,'twelve':1,'ten':1,'century':1,'is':1,'haunt':1,'indefinitely.':1,'questions':1,'one':1,'for':1,'twenty':1,'doubt':1,'it':1,'glacial':1,'has':1,'two.':1,'hit':1,'period':1,'arose':3,'dwindling':1,'with':1,'great':2,'chamber':1},'side-view':{'of':5},'domain':{'and':1,'to':1,'does':1,'in':3,'print':1,'works':1,'ebooks':1},'fired':{'it':1},'advantage.':{'perhaps':1},'green-flies':{'which':1},'sugars':{'and':1},'dagoes':{'he':1},'challenger':{'expedition':1},'fires':{'of':1},'year':{'and':4,'old':1,'grouse':1,'this':1,'energy':1,'there':1,'but':1,'one':2,'to':1,'out':2,'are':1,'they':1,'in':3,'followed':1,'the':1,'.':4,'encased':1,'before':1},'happen':{'as':1,'when':1,'if':1},'avoided':{'the':1},'monitors':{'are':1},'wheat--changes':{'in':1},'shown':{'a':1,'and':1,'faint':1,'that':7,'also':1,'there':1,'an':1,'to':1,'greatly':1,'at':2,'opposite':1,'in':11,'the':1,'.':1,'arno':1,'clearly':1,'remaining':1},'rude':{'stone':1},'space':{'and':5,'on':1,'that':1,'with':1,'straight':1,'in':2,'it':1,'can':1,'.':8,'yet':1,'are':1,'above':1,'between':1,'at':1,'during':1,'the':1,'shows':1,'where':1,'by':1,'is':3,'circular':1},'amnion':{'and':1,'which':1},'furthermore':{'there':1,'they':1},'inconceivably':{'small':3,'distant':1,'greater':1},'equatorially':{';':1},'hastily':{'referred':1},'increase':{'to':1,'rather':1,'of':6,'their':1,'in':3,'our':1},'kingdom.':{'on':1,'j':1},'rational':{'device':1,'conduct':3},'receiving':{'no':1,'stimuli':1,'tidings':1,'olfactory':1,'it':1,'contributions':1},'shows':{'a':3,'the':17,'great':1,'that':6,'any':1,'many':1,'some':1,'two':1,'an':1,'how':1,'definitely':1,'certain':1,'affinities':1,'clearly':1,'positively':1},'inevitably':{'lead':1},'e.':{'rutherford':1},'eighty-eight':{'of':1},'glass--the':{'stopper':1},'divergence':{'arboreal':1,'of':3},'animals.':{'the':1,'senses':1,'sec':1},'quart':{'.':2},'intruding':{'fishes':1,'bacteria':1,'parasites':1},'directions.':{'this':1,'so':1},'advantages':{'being':1,'of':1,'.':1},'taxed':{'no':1},'animals;':{'of':1,'it':1},'marine':{'animals':3,'family':1,'organisms':1,'lampreys':2,'fish':4,'but':1,'.':1,'leech':1},'inevitable':{'stoppage':1,'processes':1},'card':{'says':1,'tea':1,'is':1,'donations.':1,'in':1,'prof':1,'was':1},'care':{'and':3,'on':1,'associated':2,'in':1,'mammals':1,'is':1,'there':1,'it':1,'.':3,'as':2,'so':1,'which':1,'of':2,'exhibited':1},'vestige':{'and':1,'of':3,'in':1},'reflect':{'the':4,'that':2},'rearrangements':{';':1},'fixed':{'paths':1,'angle':1,'like':1,'for':1,'faith':1,'to':1,'distances':1,'limits':1,'vegetation--a':1,'in':3,'stage':1},'stage.':{'the':1},'selections':{'made':1},'transition':{'to':2,'.':1,'from':2,'which':1,'stage':1},'british':{'columbia.':2,'nightjar':1,'starfish':2,'guiana':2,'salterns':1,'museum':14,'coasts':1,'sailor':1,'average':1,'association':2},'invitation':{'to':1},'lighting':{'on':2},'domed':{'and':1,'web':1,'cranial':1,'than':1},'hesperornis':{'100':1,'after':1},'suffice':{'to':1,'of':1},'sprawling':{'blotch':1},'flying':{'and':2,'phalanger':1,'fish':2,'dragons':5,'past':1,'debris':1,'bats':1,'in':1,'birds':2,'frog':2,'reptiles':1,'under':1,'bird':1,'dragons--the':1,'squirrel':2,'crouching':1,'mammals':1,'jumps':1,'tree-toad':1,'fishes':2,'squirrels':1,'creatures.':2,'dragon':4,'matter':1,'lizard':1,'reptiles.':1,'lemurs':1,'phalangers':2,'round':1},'striking':{'and':1,'confirmation':1,'resemblance':2,'novelties':1,'of':1,'is':1,'illustration':1,'.':1,'instances':1,'as':1,'fact':1,'devices':1,'are':2,'feature.':1,'the':3,'difference':1,'coloration':1,'proof':1},'omitted':{'the':2},'comprised':{'only':1,'in':1},'brain.':{'the':1},'directly':{'and':1,'towards':1,'into':1,'important':1,'between':3,'pitted':1,'the':1,'or':3,'apart':1},'comprises':{'a':1,'the':1},'impossible':{'even':1,'on':1,'we':2,'because':1,'for':1,'but':1,'.':3,'to':7,'in':1},'ring':{'and':2,'a':1,'getting':1,'of':3,'into':1,'up':1,'.':1,'which':1},'drove':{'our':1},'size':{'and':6,'is':1,'it':1,'shape':1,'are':1,'in':1,'compared':1,'from':1,'possible.':1,'except':1,'.':4,'only':1,'has':1,'though':1,'after':1,'but':1,'101':1,'with':2,'covering':1,'of':22,'as':2,'mass':1,'the':1},'sheep':{'horses':1,'contrasted':1,'.':3,'in':1,'tearing':1,'or':1},'cerebration':{'at':1},'sheer':{'dexterity':2,'intelligence.':1,'quickness':1},'air-sacs':{'in':1},'checked':{'in':1},'silent':{'laboratories':1,'monotonous':1},'apple.':{'of':1},'caught':{'and':2,'a':1,'its':1,'on':1},'breed':{'.':1},'callous':{'rough-and-tumble':1},'longitudinally.':{'the':1},'wing-span':{'of':1},'flint':{'and':1,'implements':1,'implement.':1},'joseph':{'evolution':1},'melanocetus':{'indicus':1,'murrayi':1},'friend':{'the':1,'or':1},'nutrition':{'and':1},'x.':{'this':1},'rock-dove':{'just':1},'mostly':{'confined':1,'on':1,'caught':1,'white':1,'in':1},'that':{'all':14,'spiders':1,'go':2,'causes':1,'physiological':1,'suits':2,'to':2,'reptiles':1,'under':1,'degeneration':1,'case':1,'coloured':1,'every':10,'fall':1,'affect':1,'monkeys':1,'minute':1,'did':2,'herbert':1,'small':1,'round':1,'full-grown':1,'crop':1,'further':1,'creatures':1,'even':4,'pale-white':1,'apparatus':1,'assisted':1,'asia':2,'goes':2,'new':1,'body':1,'sinks':1,'climbs':3,'here':1,'atoms':1,'along':1,'change':1,'convert':1,'substance':2,'ichneumon':1,'wherever':1,'experience':1,'electricity':1,'locomotion':1,'makes':2,'followed':1,'trained':1,'bloweth':1,'from':1,'would':2,'prove':2,'remains':2,'live':3,'therefore':1,'mysterious':1,'substances':1,'marks':1,'particular':1,'90':1,'93':1,'must':1,'account':1,'animals':4,'this':20,'science':2,'piltdown':1,'can':5,'meet':1,'indicated':1,'frogs':2,'allowed':1,'high':1,'arise':1,'evidently':1,'viviparity':1,'end':1,'damage':1,'seeds':2,'movements':1,'intelligent':1,'swayed':1,'may':3,'after':3,'curiosity':1,'man':16,'a':32,'light':6,'sun-spots':1,'life':2,'green':1,'unsteady':1,'over':1,'produced':1,'experiments':1,'during':1,'carnivores':1,'existence':1,'rewarded':2,'birds':5,'before':1,'group':1,'forms':1,'vast':1,'covered':2,'might':3,'pays.':1,'evolution':6,'they':70,'not':1,'each':2,'went':3,'energy':4,'constitute':1,'our':8,'out':1,'living':3,'percepts':1,'flowed':1,'supports':1,'given':1,'put':1,'could':3,'length':1,'throws':1,'already':2,'number':1,'one':4,'long':1,'size':1,'little':1,'toy':1,'leading':1,'system':1,'hangs':1,'their':6,'gives':1,'eyes':1,'that':1,'took':1,'part':1,'flowers':1,'distance':4,'kind':1,'require':1,'tree':1,'matter':1,'were':2,'enables':1,'and':1,'ages':1,'have':11,'wallowed':1,'any':1,'-':1,'ideas':1,'cropped':1,'build':2,'which':7,'mammals':2,'play':1,'unless':1,'though':1,'object':1,'what':1,'falls':2,'most':2,'letter':1,'device':1,'extremely':1,'manifested':1,'gather':1,'steady':1,'electrons':2,'came':1,'gold':1,'insects':1,'means--resides':1,'only':2,'molecules':2,'8':1,'inhabit':1,'he':8,'local':1,'meant':1,'his':2,'sense':1,'skims':1,'means':1,'nearly':1,'instinctive':1,'dr':1,'runs':1,'she':2,'contain':1,'where':1,'aspect':1,'intelligence':1,'radium':2,'depends':2,'individual':2,'are':7,'tender':1,'definite':1,'its':2,'halves':1,'outside':1,'various':1,'between':3,'neither':1,'we':42,'nature':1,'originated':1,'multiplies':1,'come':2,'both':4,'many':6,'s':1,'figures':1,'expended':1,'comes':1,'otherwise':1,'among':2,'point':1,'whatever':1,'height':1,'regulated':1,'ether':1,'.':2,'interest':1,'mars':1,'empty':1,'direction':1,'flight':1,'amphibians':1,'engage':1,'lives':2,'sound':1,'these':12,'will':2,'while':8,'intercepts':1,'discoveries':1,'century':1,'light.':1,'is':51,'it':73,'experts':1,'in':27,'if':11,'different':1,'develop':1,'make':4,'grows':1,'neolithic':1,'used':1,'moment':1,'necessity':1,'supposing':1,'recent':1,'dark':1,'no':5,'sound-waves':1,'the':305,'bodies':1,'left':2,'just':2,'when':13,'distant':1,'questions':1,'speed':1,'death':1,'field':1,'had':6,'has':13,'gave':1,'increased':1,'early':2,'elapses':1,'like':1,'often':1,'ascend':1,'lingers':1,'happens':1,'provided':1,'leaf':1,'for':3,'does':2,'although':2,'instinct':2,'littoral':1,'by':2,'on':3,'about':1,'central':1,'of':52,'wave-length':1,'primitive':1,'within':1,'promise':1,'spores':1,'sticklebacks':1,'her':1,'there':47,'gases':1,'was':8,'opens':1,'form':1,'some':15,'amongst':1,'atom':1,'remote':1,'with':1,'partially':1,'made':1,'flit':1,'variations':1,'planet':1,'below':1,'attaches':1,'universal':1,'body-making':1,'deep':1,'an':6,'as':7,'exist':1,'at':7,'walks':1,'again':1,'variety':1,'uranium':1,'slumbers':1,'other':1,'you':4,'star':1,'visits':1,'develops':1,'fishes':2,'implies':1,'lead':1,'age':1,'depth':1,'time':1,'once':2},'brains':{'a':1,'and':2,'about':1,'from':1,'of':2,'is':1,'.':1,'occupying':1,'more':1},'kangaroo-like':{'fashion':1},'bees.':{'sheer':1},'eliminated':{'while':1,'in':1},'flowers':{'and':5,'yet':1,'in':1},'than':{'all':2,'uranium':1,'fifty':1,'light-waves':2,'birds':1,'before':1,'25':1,'to':5,'self-fertilisation':1,'ours':1,'seen.':1,'evolution--but':1,'very':1,'five':1,'occasional':1,'they':4,'half':1,'one':3,'55':1,'twice':1,'she':1,'science':1,'seventeen':1,'violet-light':1,'are':1,'our':1,'parachuting':1,'what':1,'its':1,'across':1,'we':3,'full':1,'300':1,'men':1,'efficiency':1,'others':2,'might':1,'100':2,'by':2,'anything':1,'of':1,'himself.':1,'34':1,'bricks':1,'two':4,'decrease':1,'learning':1,'one-millionth':1,'reflective--which':1,'from':1,'her':1,'twenty':1,'support':1,'there':1,'three':3,'cats':1,'500':1,'life':1,'that':7,'understand':1,'with':1,'those':4,'women':1,'sound':1,'non-existence':1,'thirty':1,'this':3,'plain':1,'replaced':1,'many':1,'my':1,'collecting':1,'seven':1,'guesses':1,'is':9,'radial':1,'it':3,'an':7,'as':1,'itself':1,'three-chambered.':1,'at':1,'fumbling':1,'in':15,'any':4,'tentative':1,'when':2,'regions':1,'arboreal':1,'another':1,'142':1,'eighty':2,'variation':1,'eight':1,'a':23,'elusive':1,'counterbalances':1,'-200':1,'the':52},'rugged':{'.':1},'artificer':{'fashioning':1},'accordance':{'with':3},'three-spined':{'and':1,'stickleback':2},'shunting':{'waggons':1},'dawn.':{'in':1},'apples':{'and':1},'fruits':{'and':1,'the':1,'191':1},'accessed':{'displayed':1},'photosynthesis':{'carbon':1,'that':1,'.':1,'i.e':1},'sublime':{'process':2,'device':1,'indifference':1,'movement':1},'dipnoan':{'which':1},'troublesome':{'as':1},'chlorophyll':{';':1,'that':1,'or':2,'which':1,'in':1},'angel':{'in':1},'remained':{'naked':1,'flat':1,'unchanged':1,'plastic--a':1,'at':1},'caterpillars.':{'of':1},'interpretation':{'of':6,'is':1},'lens-shaped':{'middle':1,'portion':1,'formation':1,'system':1},'anger':{'and':1},'wallowed':{'in':1},'recover':{'itself':1},'slab':{'of':1},'lumps':{'of':1},'erectus.':{'3':1},'overcoming':{'the':1},'shark':{'and':1,'his':1},'snout':{'the':1,'was':1,'region':1},'equipment':{'is':1,'including':1,'especially':1,'.':2},'mr.':{'waterhouse':1},'repeatedly':{'pruned':1,'changed':1,'shot':1,'against':1},'online':{'distributed':2,'at':3,'payments':1},'mediterraneans':{'semites':1},'hornbill':{'s':2},'begin':{'to':10,'with':6,'at':1,'afresh':1},'price':{'essence':1,'paid':1},'evaporate':{'altogether':1},'ultramicroscope':{'have':1},'men--conspicuous':{'amongst':1},'america':{'and':3,'a':1,'introductory':1,'africa':1,'.':2,'the':2,'by':1,'is':1},'greyish':{'jelly':1,'zone':1},'forever':{'unseen':1},'music.':{'illustration':1},'dream':{'that':1,'.':1},'freshwaters':{'and':1,'afforded':1,'form':1,'is':1,'.':2,'including':1,'4':1,'the':1},'steady':{'flow':1,'rhythmical':1,'renewal':1},'tooth':{'and':3,'is':1,'catches':1},'sunset':{'mean':1},'hurled':{'against':1,'out':1},'pattern':{'to':1,'is':1,'of':1,'.':1},'dust--that':{'it':1},'honour.':{'what':1},'discoverer':{'of':2},'fifty':{'thousandths':1,'eggs':1,'years':3,'feet':1,'miles':4,'fathoms':1},'discovered':{'and':3,'a':2,'about':1,'or':1,'star':1,'that':2,'it':1,'whatever':1,'an':1,'near':1,'until':1,'then':1,'in':12,'new':2,'the':4,'.':5,'by':2},'227':{'photo':1,'from':1},'226':{'photo':1},'fifth':{'printing':1},'crashing':{'along':1},'gnaw':{'the':1,'through':1},'ratio':{'of':1,'for':2,'to':1},'darwinism.':{'iii':1},'title':{':':1},'proportion':{'shown':1,'that':1,'of':1,'to':2,'as':1,'at':1},'jolt':{'that':1},'only':{'and':1,'exposed':1,'certain':1,'is':1,'coming':1,'competition':1,'one':13,'beginning':1,'as':3,'animals':1,'are':1,'planets':1,'in':4,'globes':1,'happen':1,'large':1,'differ':1,'from':2,'for':2,'shifts':1,'twenty':1,'make':1,'though':1,'when':2,'two':1,'been':1,'inferred':1,'to':6,'that':3,'without':1,'extravagant':1,'4':1,'way':1,'gradually':1,'mean':1,'profiting':1,'infer':1,'plants':1,'return':1,'206':1,'pours':1,'liberated':1,'apparent':1,'dimly':1,'but':1,'possible':2,'approaches':1,'a':28,'waves':1,'method.':1,'during':2,'shadow':1,'an':3,'with':1,'by':3,'minute':1,'fly':1,'on':1,'about':1,'luminescence':1,'backboned':1,'working':1,'thirty':1,'be':1,'of':4,'supporting':1,'required':2,'half':1,'different':1,'travels':1,'matter':1,'maintain':1,'were':1,'found':1,'the':5,'say':1,'or':1,'meaning':1,'once':4},'self-forgetful':{'and':1},'essence':{'of':1},'thompson':{'silvanus':1},'orthoptera':{'have':1},'220':{'the':1},'seen.':{'the':1,'illustration':1},'continuance':{'of':5},'shepherding':{';':1},'15.--mars':{'1':1},'warm-blooded':{'.':1,'creature':1},'cannot':{'and':1,'all':1,'give':2,'indeed':1,'in':1,'discover':1,'replace':1,'go':3,'see':1,'expect':1,'have':2,'enumerate':1,'fail':1,'follow':1,'even':1,'guess':1,'make':1,'continue':2,'survive':1,'tell':1,'swim':1,'be':26,'shut':1,'dispense':1,'however':1,'here':1,'possibly':1,'succeed':1,'put':1,'now':1,'come':1,'positively':2,'of':1,'conceive':1,'say':4,'evade':1,'think':2,'leave':2,'settle':1,'avoid':2,'travel':1},'genealogy':{'which':1},'appreciatively':{'in':1},'exactitude':{'and':1},'seldom':{'coincides':1,'spends':1,'if':1},'girdled':{'about':1},'baits':{'of':1},'prevents':{'bleeding':1},'sea--the':{'fresh':1,'shallow':1,'open':1,'deep':1},'girdles':{'of':1},'pituitary':{'and':1},'burst':{'into':2},'physically':{'far':1},'lancelets':{'and':1},'famine':{'or':1},'namely':{'portions':1,'that':1,'air':1,'in':1,'the':6,'sexual':1,'experimental':1},'actively':{'and':1,'hunts':1,'from':1},'sticklebacks.':{'after':1},'successive':{'ages--the':1,'series':1,'rings':1,'strata':2,'steps':1,'periods':1,'sets':1,'stages':1,'conquests':1,'incarnations':2},'sport':{'and':1,'for':1},'key--a':{'way':1},'concern':{'the':1,'for':1},'sprawl.':{'they':1},'justifies':{'itself':1},'colours':{'and':4,'then':1,'from':2,'which':2,'apart':1,'sometimes':1,'correspond':1,'.':11,'observed':1,'will':2,'are':1,'produced':1,'in':1,'alone':1,'283':1,'coloured':1,'with':1,'the':2,'red':1,'gives':1},'3':{'and':4,'below.':1,'1908':2,'educational':1,'rapid':1,'from':1,'hillock':1,'.':11,'3':1,'4':1,'we':1,'inches':1,'000':1,'letter':1,'variable':1,'now':1,'with':1,'by':1,'man':1,'evolution':1,'i':1,'of':2,'making':1,'the':11,'minutes':1,'drawing':1},'between':{'stones':1,'summer':1,'ten':1,'intelligence':1,'modern':1,'mind':1,'worms':1,'one':1,'tide':1,'our':1,'its':1,'tide-marks':1,'different':1,'flowers':2,'two':5,'physiology':1,'certain':1,'raising':1,'stars':1,'mars':1,'red':2,'a':3,'them':5,'that':1,'atoms':1,'it':1,'members':1,'shadow':1,'water-weeds':1,'fifteen':1,'day':1,'minute':1,'man':3,'plants':2,'loss':1,'one-seventh':1,'this':2,'hungry':1,'us':4,'these':3,'those':1,'common':2,'mother':2,'the':32,'male':1},'kneads':{'it':1},'justified':{'his':1,'by':1},'whipped':{'egg':1},'notice':{'what':1,'that':5,'this':1,'of':2,'is':2,'in':5,'how':1,'therefore':1,'another':1,'certain':1,'the':6,':':1,';':1,'indicating':1},'article':{'on':2,'is':1,'dealing':1},'profitless':{'stimuli':1},'stages':{'still':1,'e.g':1,'of':5,'when':1,'it':1,'through':1,'at':1,'which':1,'in':9,':':1,'until':1},'strides':{'associated':1},'cycad':{'flora':1},'systema':{'naturae':2},'altamira':{'cave':4},'enabling':{'the':1},'sparseness':{'in':1},'comet':{'and':1,'october':1,'for':1,'that':1,'september':1,'of':1,'is':1,'s':1,'.':1,'fig.':1,'approaches':1,'the':1,'dashes':1},'wheels':{'go':1},'already.':{'among':1},'comes':{'a':3,'and':1,'about':1,'from':1,'into':1,'within':2,'back':1,'.':1,'to':3,'through':1,'directly':1,'close':1,'the':1,'out':2},'mites':{'many':1},'passenger':{'pigeon':1},'jeans':{'says':1},'juvenile':{'stages':2},'learning':{'a':1,'by':7,'from':1,'intelligently.':1,'to':5,'thinking':1,'tricks':1,'there':1,'but':1,'.':1,'trial':1,'at':1,'the':1,'or':1},'moreover':{'even':1,'climate':1,'that':3,'meteorites':1,'there':2,'their':1,'as':2,'every':1,'they':1,'the':2,'if':1},'actually':{'standing':1,'do':2,'fly.':1,'longer':1,'dividing':1,'consort':1,'settled':1,'caught':1,'observed':2,'implied':1,'lives':1,'stuffed':1,'in':1,'observing':1},'sun-spots':{'appear':1,'that':1,'is':2,'rise':1,'it':1,'.':1,'are':1,'where':1},'oliver':{'lodge':2,'electrons':1},'cares':{'.':1},'mimicry--the':{'subject':1},'markedly':{'contrasted':1,'from':1,'in':1},'jerks':{'a':1,'itself':1,'its':1},'punished':{'by':1},'rotting':{'or':1,'.':1},'dangers':{'.':1,'e.g':1},'exhaustion':{'of':1},'gill-breathing':{'and':1},'angles--that':{'is':1},'observers':{'who':1,'that':1},'stephen':{'cribb.':2},'textbook':{'organic':1},'rubs':{'it':1},'stems':{'of':1,'gave':1},'suspected':{'that':1,'.':1},'water-animals':{'.':1},'realities':{'in':1,'.':1},'prehistoric':{'skulls':1,'brothers':1,'human':2,'metallurgists':1},'developing':{'organs':1,'eggs':1,'egg':1,'human':1},'these':{'flaming':1,'partial':1,'planetesimals':1,'magnetic':1,'forests':1,'four':1,'not':1,'motions':1,'facts':2,'tropisms':1,'its':1,'before':2,'layers':1,'middlemen':1,'giant':1,'daughter-buds':1,'infinitely':1,'quaint':2,'greeks':1,'masses':1,'show':1,'young':1,'forms':2,'to':1,'twig-insects':1,'spirals':1,'clusters':1,'include':1,'moorhens':1,'rodents':1,'exalted':2,'questions':2,'dark':1,'gloomy':1,'effects':2,'words':2,'radio-active':1,'instinctive':1,'fragments':2,'vast':1,'vapour':1,'shallow-water':1,'variable':1,'sources':1,'large':1,'small':1,'works':1,'embryonic':1,'mean':1,'methods':1,'are':16,'instances':1,'concern':1,'gill-slits':1,'three':4,'palaeolithic':1,'organisms':1,'self-effacing':1,'shallow':1,'particles':4,'various':2,'moons':1,'open-sea':1,'illustrate':1,'encounters':1,'red':2,'mercury':1,'we':1,'men':1,'agencies':1,'atoms':2,'wingless':1,'threads':1,'represented':1,'tidal':1,'craters':1,'great':1,'last':1,'flames':1,'brilliant':1,'could':1,'haunts':1,'strange':2,'extremes':1,'streams':1,'dents':1,'efforts':1,'wonders':1,'considerations':1,'reasons':1,'instruments':3,'marvels':1,'spiral':2,'invisible':1,'gases':1,'protozoa':1,'ether':1,'technically':1,'ring-formations':1,'little':2,'ancient':1,'from':1,'entities':1,'outbreaks':1,'there':4,'two':9,'spots':1,'.':1,'stuck':1,'observations':1,'fiery':1,'reflex':1,'manufacture':1,'enable':1,'vigorous':1,'stars':2,'form':1,'that':1,'formed':1,'minute':1,'cases':1,'sleeping':1,'with':2,'must':1,'portions':1,'was':1,'cells':1,'variations':1,'will':1,'regions':1,'replaced':1,'thin':1,'were':4,'coral':1,'and':1,'seven':2,'planets':1,'is':3,'it':1,'days':1,'pieces':1,'have':5,'in':2,'need':1,'x-rays':1,'pages.':1,'paths':1,'rays':2,'requirements':1,'inborn':2,'perhaps':1,'things':3,'cave':1,'struggles':1,'astronomers':1,'sciences':1,'amazing':1,'other':1,'details':1,'which':1,'papers':1,'units':1,'green':2,'several':2,'higher':1,'play':1,'elements':1,'vestigial':2,'may':1,'long':1,'eight':1,'delicate':1,'half-brutish':1,'waves':3,'fishes':2,'types':2,'so-called':1,'enregistrations':1,'spectra':1,'lines':3,'lasted':1,'substances':2,'chemical':3,'points':2,'electrons':7,'bodies':1,'allow':1,'tentatives':1,'the':2,'molluscs':1},'danger.':{'illustration':1},'handicapped':{'by':1},'biped':{'and':1,'202':1,'when':1},'care.':{'but':1,'illustration':1},'coolest':{'and':1,'places':1},'ein':{'or':1},'ocean-basins.':{'beginnings':1},'soil':{'of':1,'the':3,'by':1,'.':1},'startling':{'results.':1,'in':1,'effect':1,'rapidity':1,'.':1},'100th':{'of':1},'eras':{'marked':1,'.':2,'eighteen':1,'passed':1,'in':1,'with':1},'beaver':{'will':1,'not':1,'the':2,'shore-frequenting':1,'220':1},'property':{'infringement':1,'of':4,'trademark':1,'common':1,'which':1},'helium':{'and':1,'from':1,'could':1,'gas':1,'by':1},'thrills':{'the':1},'generously':{'.':1},'cromagnon':{'man':2},'develop':{'and':2,'into':2,'without':1,'inside':1,'in':2},'inquire':{'how':3,'into':1,'however':1,'what':2},'intelligently':{'appreciate':1,'.':1},'epoch':{'now':1,'in':1},'inquiry':{'into':1,'was':1,'is':2,'called':1},'streams':{'and':1,'of':4,'.':1,'bring':2,'in':1,'encounter':1,'out':1},'gorging':{'itself':1},'noble':{'giants.':1,'qualities':2,'in':1},'investigated':{'to':1,'.':1},'centuries':{'astronomers':1,'to':2,'unavailable':1},'arctic':{'plants':1,'fox':2,'foxes':1,'ocean':1,'forms':1,'terns':1},'foam':{'beneath':1,'it':1},'unconvincing':{'.':1},'fruit':{'to':1,'it':1,'but':1,'.':1},'attributes':{'as':1},'solicitation':{'requirements':1},'passing':{'on':1,'from':2,'two':1,'quickly':1,'down':1,'to':1,'through':5,'stars':1,'in':1,'an':1,'cloud':1,'before':1},'traps':{'and':1},'framework':{'of':1,'in':1},'charges':{'and':1,'of':3,'within':1,'carried':1,'.':1},'constitutional':{'sometimes':1,'changes':1,'rhythm':1},'breezy':{'morning':1},'severe':{'processes':1,'winter':2,'for':1,'interglacial':1,'in':1,'cold':2,'conditions':1},'luminous':{'body':1,'and':1,'interpretation':1,'body.':1,'envelope':1,'after':1,'spot':1,'.':1,'to':1,'cloud-like':1,';':1,'organs':1,'the':1,'fact':1},'laboratories':{'of':2},'charged':{'particles':1,'with':1,'nucleus':1},'heaps':{'them':1},'three-chambered':{'heart':2},'last.':{'the':1,'there':1},'aeration':{'is':1},'transmitting':{'waves':1},'cromagnards':{'probably':1,'in':1,'.':1},'dancers':{'in':1},'valuable':{'food-plant':1,'practically':1},'electrification':{'like':1},'accumulate':{'on':1,'any':1,'.':1},'rule.':{'getting':1},'ounces':{';':1,'at':1},'touch':{'of':3,'the':1,'is':1,'came':1,'.':1},'speed':{'a':1,'we':2,'that':1,'of':15,'is':1,'though':1,'given':1,'.':3,'to':1,'as':1,'increases':1,'which':1,'in':1,'has':1,'with':1,'or':2,'round':1},'death':{'and':2,'a':2,'of':3,'is':3,'there':2,'when':1,'but':1,'.':3,'as':1,'sec':1,'are':1,'208':1,'the':1,'should':1,'similar':1,'becoming':1},'legitimately':{'inquire':1},'thinking':{'about':1,'of':3,'is':1,'.':2,';':1,'feeling':2},'darkness--an':{'eternal':1},'starlings':{'in':1},'improvement':{'where':1,'e.g':1},'journey.':{'we':1},'treatment':{'and':1,'of':1},'versa':{'some':1},'dovecot':{'to':1},'struck':{'only':1,'in':1},'real':{'wealth':1,'nature':2,'food':1,'men':1,'seeds':1,'sense':1,'progress':1},'spectacular':{'display':2,'element':1},'larva':{'about':1,'e.g':1,'called':1,'transparent':1,'that':1},'rules':{'is':1,'set':1},'outermost':{'finger':3,'moons':1},'stung':{'by':1},'epoch-making':{'step':1,'experimental':1},'discontinue':{'all':1},'absorptive':{'wall':1},'early':{'embryo':1,'summer':1,'atmosphere':1,'instruments':1,'pliocene':2,'chapters':1,'years':1,'triassic':1,'in':1,'stage.':1,'instrument':1,'reptiles':1,'ripening':1,'stage':2,'vegetation':1,'life-history':2,'neolithic':1,'waters':1,'men':1,'community':1,'man':1,'stone':2,'forking':1,'days':2,'youth':1,'greek':1,'victorian':1,'offshoot':2,'or':1},'quickness':{'of':1,'correlated':1,'.':1},'broader.':{'other':1},'decipher.':{'another':1},'using':{'a':2,'up.':1,'them':1,'and':1,'these':1,'or':1,'their':2,'electricity':1,'the':3,'any':1},'lady':{'came':1},'ruled':{'by':1},'inevitableness':{'of':1},'learnedly':{'called':1},'heat-waves':{'and':1,'.':1},'nerve-endings':{'on':1},'pounds':{'and':3,'of':4,'.':1},'smell':{'and':1,'less':1,'of':1,'that':1,'.':1,'in':2,'detecting':1,'or':1},'velocities':{'and':1,'with':1,'from':1},'streamers':{'which':1},'system.':{'the':3,'several':1,'what':1,'illustration':1,'in':1},'benefit':{'is':1,'in':1},'t':{'our':1,'.':3,'of':1},'fully':{'formed':1,'into':1,'explained':1,'appreciate':1,'aware':1,'absorbed':1,'in':1,'.':1},'downward':{'current':1,'currents':1},'twelve':{'hours':1,'different':1},'exposed':{'on':1,'it':1,'rocks':1,'to':3,'at':1,'the':1},'coal--a':{'chemical':1},'cathode':{'gave':1},'chronology':{'do':1},'astronomer':{'simon':1,'takes':1,'calls':2,'means':1,'h':1,'seldom':1,'.':1,'offers':1,'said':1,'has':1,'despairing':1},'shore-pool':{'and':1},'1859':{'made':1,'.':1},'salicylic':{'acid':1},'unlocked':{'.':1},'1850':{'.':1},'recorded':{'.':1,'in':1},'1856':{'in':1},'conservative':{'and':1,'animals':1,'type':1,'anatomist':1},'clear-cut':{'perceptual':1,'ideas':1,'.':1},'iron-forming':{'bacteria':1},'wheat':{'and':3,'a':1,'in':2,'which':1,'on':1,'of':1,'is':2,'that':1,'it':1,'1919':1,'emerged':1,'were':1,'harvest':1,'with':1,'called':1,'before':1},'business':{'office':1,'that':1,'of':1,'.':1,'pglaf.org':1,'in':1},'sixth':{'printing':1,'day':1,'month':1},'equivalent':{'to':1},'uneasy':{'and':1,'restlessness':1},'sixty':{'millions.':1,'miles':2,'years':1},'exciting':{'chapter':1,'race':1},'throw':{'off':1,'light':1,'it':1,'much':1,'dust':1,'prickly':1},'comparison':{'of':1,'the':1,'.':1,'with':3,'should':1},'ear-trumpet':{'or':1,'man':1},'central':{'and':1,'body':2,'stomach':1,'sun':1,'region':1,'java.':1,'europe':1,'fire.':1,'portion':1,'part':1,'nucleus':2,'africa':1,'biological':1,'lens-shaped':2,'mass':1,'fact':1},'piety':{'of':1},'tentatives':{'have':1,'.':1},'wolf':{'a':1,'the':1,'.':2},'greatly':{'increased.':1,'and':1,'economised':1,'from':1,'increased':2,'for':1,'restricted':1,'enlarged':1,'according':1,'by':1,'misjudge':1,'increases':1,'magnified.':2,'in':1,'affect':1,'reduced':1,'elongated':1,'encouraged':1},'bright-green':{'hue':1},'predatory':{'creatures':1,'animal':1,'cuttlefishes':1},'freeing':{'of':1},'outlook':{'on':1},'whole.':{'geologists':1},'kapp':{'gisbert':1},'goethe':{'s':1},'skunks':{'magpies':1},'rolling':{'stone':1},'heated':{'.':1},'elementary':{'exposition':1,'can':1,'fact':1},'shrinking':{'the':1,'mass':1},'your':{'poker':1,'possession.':1,'written':1,'country':1,'equipment.':1,'use':1,'applicable':1,'pocket':1,'state':1,'periodic':1,'nerves':1,'cold':1,'hand':1,'efforts':1},'stare':{'at':1},'risen.':{'one':1},'fast':{'and':1,'line--are':1,'that':2,'bound':1,'.':1,'to':1},'log':{'ready':1},'prepare':{'or':1,'your':1},'area':{'and':2,'of':5,'varies':1,'.':1,'as':1,'are':1,'which':2,'by':1},'stoppage':{'of':1},'start':{'a':2,'of':1,'at':1,'the':1,':':1,'with':1},'cats':{'and':2},'low':{'and':2,'flat':1,'temperatures':1,'temperature':1,'form':1,'level':3,'nest-building':1,'grounds':1,'when':1,'forests':1,'gap':1,'chemical':1,'to':1,'quiet-looking':1,'retreating':1,'psychical':1,'the':1,'on':1,'type':1,'order':1,'degree':1},'lot':{'of':2},'colder':{'water':1,'.':1},'jones':{'has':1},'philosophers':{'but':1},'posterior':{'claspers':1},'manipulative':{'intelligence':1,'skill':1,'expertness':1},'1871--a':{'book':1},'body-cells':{';':1},'two-thirds':{'of':2},'water-vapour':{'gathers':1,'which':1,'in':1},'hottest':{'.':1},'playsomest':{'crittur':1},'sea-level':{'.':1},'circulation':{'of':2},'species.':{'sec':1,'it':1},'star.':{'this':1},'phosphorescent':{'things':1,'animals;':1,'at':1},'waltzing':{'mouse':1},'embedded':{'in':2},'waste-product':{'called':1},'beliefs':{'concerning':1},'euplectella':{'a':2},'vedda':{'of':1},'600':{'a':2,'miles':1,'000':1},'describe':{'this':1,'even':1,'the':1,'it':1,'as':1},'moved':{'slightly':1,'still':1,'slowly':1,'forwards':1,'weigh':1},'sheath':{'which':1},'moves':{'and':1,'only':1},'extinct--taking':{'us':1},'innings':{'.':1},'plants--the':{'first':2},'alligator-like':{'forms':1},'thither':{'rather':1,'somewhat':1},'you':{'already':1,'give':1,'within':1,'distribute':1,'share':1,'begin':2,'press':1,'are':4,'have':6,'in':1,'carefully':1,'follow':1,'will':1,'derive':1,'from':1,'for':2,'provide':3,'pay':1,'indicate':1,'charge':1,'take':1,'do':4,'notice':1,'cause.':1,'may':9,'beat':1,'as-is':1,'pick':1,'paid':3,'discover':1,'produce':1,'put':2,'hold':1,'with':1,'comply':2,'must':6,'a':1,'received':3,'prepare':1,'receive':1,'wish':1,'like':1,'cannot':1,'can':9,'learn':1,'agree':4},'forcing':{'us':1},'poor':{'.':1,'endowment':1,'in':2},'polar':{'bear':5,'ocean':1,'cap.':1,'snow-caps':1,'caps':2,'areas':1},'466':{'sirius':1},'bacillus':{'of':1},'drift':{'across':1,'but':1,'which':1},'carpenter':{'who':1},'flattened':{'shape':1,'tips':1,'sacs':1},'suited':{'to':3,'for':9,'certain':1},'queensland':{'one':1,'mudfish':1},'pool':{'on':1,'almost':1,'of':1,'is':1,'.':1,'swamp':1,'in':1},'ramsay':{'discovered':1,'and':1},'building':{'of':2,'material':1,'up':7},'bulk':{'of':4,'under':1},'condensation':{'of':1,'would':1,'they':1,'.':1},'sperm-cells':{'distinct':2,'.':1},'controlled':{'and':2,'activities':1,'life':1,'then':1,'movements':1,'more':1},'profits':{'you':1,'by':1},'doubted':{'even':1},'signalling':{'to':1},'strings':{'round':1},'since':{'lessons':1,'then':1,'we':2,'sheep-ranches':1,'many':2,'noon':1,'there':1,'it':4,'rain':1,'matter':1,'disappeared.':1,'all':1,'man':1,'the':8,'darwin':1,'extinct':2,'if':1},'contemporaneously':{'with':2},'skeleton':{'and':1,'remains':1,'musculature':1,'of':4,'tend':1,'in':1,'or':2},'pointing':{'out':1},'breadth':{'of':1},'splitting':{'the':1,'into':1,'up':2},'month':{'and':2,'because':1,'old':1,'increased':1,'of':2,'began':1,'but':1,'.':1,'became':1},'ceased':{'to':5,'it':1},'thoughtful':{'men.':1},'re-utilise':{'.':1},'revealed':{'down':1,'to':1,'themselves':1,'itself':1},'asterias':{'forreri':2},'carpet':{'of':2},'keith':{'and':1,'pithecanthropus':1,'pictures':1,'arthur':1,';':1,'m.d':2,'says:':1},'referring':{'it':1},'cliff':{'.':1},'unenforceability':{'of':1},'wyoming':{'u.s.a.':1},'talkativeness':{'.':1},'deep-rooted':{'corresponding':1},'boiling-point':{'of':1,'while':1},'solicit':{'donations':1,'contributions':1},'sustain':{'it':1},'thomson.':{'i':1},'divisions':{'of':1},'very':{'precise':1,'permeable':1,'hooky':1,'remarkable':5,'distant':1,'carefully':1,'tough':1,'uniform':1,'fine':4,'profitable':1,'rapid':2,'rapidly':1,'educable':2,'interesting':11,'young':2,'peculiar':1,'passive':1,'deep-rooted':1,'masculine':1,'inconspicuous':4,'good':2,'dust':1,'far':4,'discrepant':1,'early':1,'nearly':1,'closely':1,'vividly':1,'highly':1,'feeble':1,'minute':2,'brightly':1,'dim':1,'like':4,'profound':1,'numerous':3,'imperious':1,'large':4,'common':3,'liable':1,'quick':1,'antique':1,'dilute':1,'old':1,'often':3,'innocent':1,'unprofitable':1,'changeful':1,'likely':1,'convincingly':1,'miserable':1,'heavy':1,'gradually':1,'dense':1,'prolific':2,'poisonous':2,'definite':1,'near':1,'conservative':1,'simplest':1,'crude':1,'sluggish':1,'palatable':1,'intimate':1,'notable':1,'weak':1,'voracious':1,'small':9,'completely':1,'slow':2,'active':3,'eventful':1,'strong':3,'beginning':2,'momentous':1,'great':3,'instant':1,'reverse':1,'many':1,'distinctively':1,'inexpensive':1,'practical':1,'sensitive':4,'greatly':2,'slightly':1,'hearty--we':1,'puny':1,'first':1,'favoured':1,'primitive':1,'useful':3,'striking':4,'simple':4,'image':1,'powerful':1,'apt':1,'obscure--sometimes':1,'forcibly':1,'finely':1,'complex':2,'readily':2,'sensible':1,'little':4,'ancient':2,'basis':1,'distinct':1,'own.':1,'faint':2,'markedly':1,'long':6,'plastic':1,'marked.':1,'literal':1,'much':9,'slowly':2,'low':5,'perfectly':1,'protuberant':1,'easy':2,'successful':3,'shallow':1,'feminine':1,'representative':2,'considerable':1,'gradually.':1,'uncertain':2,'instructive':2,'characteristic':1,'largely':1,'intimately':1,'suggestive':1,'obvious':2,'thin':1,'promising':1,'beautiful':3,'heart':1,'aerial':1,'compact':1,'violently':1,'slim':1,'few':1,'high':2,'effectively':1,'variable':2,'close':1,'tranquil':1,'different':9,'keen':2,'unsuitable':1,'eloquent':1,'utilitarian':1,'hot':4,'vital':1,'grand':1,'unpromising':1,'ordinary':1,'difficult':4,'fairly':1,'opposite':1,'convincing':1,'alert':1,'important':7,'sagacious':1,'fierce':1,'frequently':1,'conspicuous':1,'dark':1,'short':2,'advantageous':1,'effective':1,'crowded':1,'mobile':1,'vigorously':1,'well':2,'severe':1,'serious':2,'incomplete':1},'indubitable':{'multicellular':1,'dynamical':1,'.':1},'bombarded':{'by':2},'coloured':{'and':1,'on':1,'reproductive':1,'lights':1,'illustration':13,'cloth':1,'flowers--attractive':1,'discs':1,'objects':1,'tree-frogs':1,'cardboard':1,'disc':1,'frontispiece':1},'oncorhynchus':{'not':1},'balancing':{'and':1,'on':2,'themselves':1,'not':1,'the':1},'minded':{'of':1},'decide':{'upon':1},'10.--solar':{'prominences':1},'cross-striped':{'quickly':1},'generalised':{'not':1,'percept':1,'humanoid':2,'members':1},'obvious':{'limitation':1,'advantage':1,'that':1,'when':1,'.':1,'advantages':1,'therefore':1,'factor':1,'fact':1},'deficient':{'in':1},'louis':{'agassiz':1,'robinson':1},'ceaseless':{'sifting.':1,'process':1},'elusiveness.':{'v':1},'retrogressions':{'in':1},'mile':{'a':1,'all':2,'towards':1,'would':1,'away':1,'per':1,'.':1,'high.':1},'plain':{'and':1,'story':2,'that':4,'is':1,'account':1,'enough':1,'vanilla':2},'locomotive':{'publishing':2},'trumpeting':{'with':1},'brittle-star':{'and':1},'salterns':{'has':1},'torpedo-net.':{'they':1},'disintegration.':{'there':1},'4557':{'melan':1},'casual':{'and':1},'bass':{'which':1},'inspire.':{'subsequent':1},'darkness':{'and':1,'of':2,'.':1,'was':1,'in':2},'consumers':{'.':1},'witnessed':{'.':1},'emotions':{'ideas':1,'but':1,'.':1,'in':1,'such':1,'beyond':1},'thickness':{'would':1,'of':8,'is':2,'.':1,';':1,'he':1},'him.':{'instantaneously':1,'illustration':1},'argyroneta':{'natans':1},'learned':{'for':2,'to':9,'that':2,'.':1,'their':1,'in':2,';':1,'its':1},'elsewhere.':{'the':1,'as':1},'edited':{'by':1},'loose':{'and':4,'spiral.':1,'sort':1,'behind.':1,'network':1},'answers':{'back':2,'.':1,'to':1,'are':1,'the':1,'must':1,'come':1,'first':1},'elmhirst':{'r':1},'11.86':{'86500':1},'trunk':{'till':1,'it':1},'lull.':{'1':1,'what':1},'i.e':{'.':14},'strong':{'desire':1,'pectoral':1,'vigorous':1,'shoulders.':1,'power':1,'that':1,'reasons':1,'jaws':1,'magnetic':1,'radiation':1,'tendency':2,'evidence':2,'feet':1,'enough':2,'artistic':2,'currents':1,'the':1,'.':2,'carapace':1,'man':1},'interposed':{'a':1},'creeps':{'close':1},'ahead':{'of':1,'in':1,'.':1},'disclaimers':{'of':1},'vegetarian':{'the':1,'scooping':1,'or':1,'triassic':2},'whine':{'about':1},'experimenting':{'and':3,'mood':1,'of':1,'.':1,'as':1,'which':1,'in':1,'rises':1,'with':3,'or':1,'more':1},'unproved':{'hypothesis':1},'soldier':{'wounded':2},'amount':{'generation':1,'of':18,'.':1,'to':2,'which':1,'proportional':1},'successors':{'whatsoever':1,'would':1},'helps':{'to':4,'the':1,'us':1},'tides.':{'illustration':1},'family':{'and':2,'spawn':1,'cares':1,'of':4,'is':1,'perceive':1,'relations':1,'.':2,'124':1,'are':1,'life.':1,'one':1,'affection':1,'swimming':1},'requiring':{'to':1,'no':1},'ask':{'the':1,'.':1},'trained':{'police':1,'animals':1,'to':1},'globes':{'and':1,'of':2,'in':2},'spawned':{'or':1},'conventional':{'modes':1},'ash':{'by':1},'flaws':{'in':1},'discriminative':{'absorption':1},'0':{'earth':1,'venus':1,'4':1},'revelation':{'of':1},'eye--we':{'have':1},'contains':{'about':1,'several':1,'an':1,'no':1,'billions':1,'.001':1,'.':1,'as':1,'ingested':1},'bask':{'on':1},'almost':{'all':5,'constant':1,'suddenly':1,'certain':3,'universal':1,'bound':1,'noisy':1,'confined':1,'see':1,'grazing':1,'at':1,'invisible.':1,'impossible':1,'wholly':1,'uncatchable':1,'as':3,'incredible':1,'cylindrical.':1,'exclusively':1,'surpassed':1,'to':1,'black':1,'girdling':1,'automatic.':1,'circular':1,'complete':1,'any':1,'formed':1,'completely':1,'sagacious':1,'nothing':1,'unique':2,'hairless':1,'a':2,'perfectly':1,'wise':1,'instantaneously':2,'perceptible':1,'no':3,'equal':1,'daily':1,'conquered':1,'ready-made':1,'invisible':2,'squirrel-like':1,'say':1},'unpleasant':{'expressions':1},'vi':{'evolution':1,'.':3},'taken':{'a':1,'by':5,'from':1,'generously':1,'for':1,'that':1,'into':2,'as':1,'.':1,'to':3,'charge':1,'at':7,'in':5,'the':2,'more':1,'any':1,'nearly':1,'out':1},'injury':{'or':1},'temps':{'would':1},'polyps':{'whose':1,'each':2},'stock--an':{'anthropoid':1},'lichens':{'and':1,'on':1},'globe.':{'for':1},'ejected':{'in':1},'site':{'and':1,'www.gutenberg.org':1,'of':2,'includes':1,'which':1,'often':1},'instrumental':{'music':2},'tapeworm':{'certainly':1},'moistened':{'finger-tip':1},'broke':{'up':1},'mounted':{'on':1,'equatorially':1,'batteries':1,'that':1},'producing':{'a':1,'visible':1,'x-rays':1,'an':1},'weathering':{'of':2,'now':1,'have':1},'cremated':{'every':1},'helped':{'by':2,'success':1,'us':1},'rotifer--we':{'are':1},'wafts':{'into':1},'sweeps':{'this':1},'egg-shell':{'and':1,'just':1},'moisture-laden':{'air':1},'nine':{'and':2,'thousand':1,'months':2,'to':1,'moons':1,'cases':1,'hundred':2},'propounded':{'to':1},'spontaneous':{'generation':1,'breaking':1,'above':1,'change':1},'history':{'an':1,'for':1,'no':1,'of':25,'museum':4,'museum.':2,'back':1,'behind':2,'which':1,'in':1,'.':13,'called':1},'f3':{'.':1},'pushes':{'itself':1},'gas.':{'but':1,'illustration':1},'stinging':{'animals':1,'cells':2,'tentacles':1,'lassoes':1},'eclipsed.':{'illustration':1},'pushed':{'will':1,'along':1,'it':1,'out':1},'sun-spot':{'of':2,'is':1},'phrase':{'and':1,'project':4,'has':1,'.':1},'lacks':{'both':1},'species':{'and':1,'1859':2,'use':2,'waddle':1,'off':1,'descent':1,'e.g':1,'perhaps':2,'of':4,'is':1,'there':1,'discover':1,'.':2,'in':1,'represented':1,'what':1,';':2,'hitherto':1,'the':2},'firmly':{'and':1,'established':1,'on':1,'that':1,'.':1,'to':1},'viviparity':{'is':1,'.':1,'the':1,'naturally':1},'starting-point':{'of':1,'the':1,'they':1},'lithographic':{'stones':1},'surpassed':{'only':1,'expectations':1},'friction.':{'but':1},'freezing-point':{'of':1,'or':1,'.':2},'surpasses':{'that':1,'in':1},'daughter-cells':{'into':1},'millikan':{'s':2},'ft':{'.':2},'tried':{'a':1,'and':1,'for':1,'one':1,'to':1,'as':1},'fv':{'contains':1},'communicating':{'cells':1,'nerve-cell':1},'derived':{'energy':1,'from':3,'infinitely':2},'sneak':{'upon':2},'gestation':{'is':1},'triumphs':{'of':5},'consequence':{'of':2,'the':1,'has':1,'enormously':1},'tries':{'to':2},'invasion':{'of':3,'was':1,'due':2,'which':2},'horizontal':{'bar':1,'except':1},'inconceivable':{'distances':1,'ages':1,'.':1,'to':1,'numbers':2,'velocity':1},'a':{'limited':1,'hampton':1,'code':1,'partial':1,'skeleton':2,'remarkable':9,'defenceless':1,'magnetic':7,'varying':1,'focus':2,'month':1,'sequoia':1,'mild':3,'mile':4,'higher':12,'zinc':1,'sweep':1,'dish':1,'golf':2,'conservative':1,'carpet':2,'compact':1,'glimpse':5,'preformed':2,'chain':2,'physiological':3,'pouch':3,'young':4,'passage':1,'granular':1,'tail':2,'cradle':1,'microscopist':1,'stable':1,'fountain':1,'friendly':1,'trilobite':2,'descendant--the':1,'brown':4,'string':1,'deeper':1,'chameleon':4,'very':59,'sun-spot':1,'wave':2,'soapy':1,'smack':1,'graphic':1,'fan':1,'leisurely':1,'microbe':1,'tank':1,'difference':2,'continued':1,'feeble':1,'minute':4,'cool':1,'generalised':3,'sea-anemone':3,'speed':5,'respiratory':1,'beginning':1,'parrot':1,'naturalist':1,'stimulus':1,'skeletal':1,'shock':1,'list':3,'gun':1,'cloudy':1,'large':32,'farthing--contains':1,'swirling':1,'starlit':1,'key--a':1,'succession':1,'small':24,'lever':1,'perceptual':1,'pool':1,'pterodactyl':2,'veritable':3,'bull-terrier':1,'force':1,'meadow':1,'full-grown':2,'trend':2,'crow':2,'sea-squirt':1,'sensation':3,'crop':1,'milligram':1,'past':1,'widened':1,'second':27,'burrower':1,'subtle':1,'further':2,'estimated':1,'port':1,'theory':3,'blue':4,'cargo':1,'stately':1,'clock':1,'waning':1,'fine':7,'section':1,'gatepost':2,'crust':1,'lizard':1,'thickness':2,'cell':2,'reconstruction':2,'new':31,'falling':3,'row':1,'method':2,'multitude':4,'body':19,'condensed':1,'full':3,'trypanosome':1,'degree':3,'compilation':1,'loose':2,'birthplace':1,'fifteenth':1,'drawing':2,'plant-like':2,'protection':1,'tangent':2,'free':4,'separate':6,'tremor':1,'strong':8,'four-chambered':1,'teacher':1,'light-year':1,'sensory':2,'great':39,'substance':4,'survivor':1,'brilliant':3,'study':2,'larger':4,'slave':1,'second--more':1,'soldier':2,'simultaneous':1,'survey':3,'suggestion':4,'social':2,'real':1,'narrow':5,'pathological':1,'steady':1,'diameter':4,'showing':1,'land-crab':1,'useful':4,'secure':1,'halfpenny':1,'stimulus.':1,'discontinuous':1,'fauna--the':1,'loose-limbed':1,'layer':1,'marked':1,'decrease':1,'motor':1,'limb':1,'glance':1,'total':3,'unit':1,'fee':3,'lens':5,'vivid':1,'distinct':3,'revelation':1,'faint':1,'visit':1,'charge':2,'frog':7,'distributing':1,'few':40,'sample':1,'saucerful':1,'centre':1,'knoll':1,'diving-bell':1,'stage':2,'type':3,'more':14,'sort':15,'flat':1,'clever':1,'door':1,'rich':2,'conductor':1,'successful':1,'whirling':1,'screen.':1,'chimpanzee':1,'bodily':1,'fan-like':1,'moistened':1,'surface':1,'rabbit':1,'particular':6,'baby':1,'coyote':1,'hole':2,'hold':1,'rivalry':1,'fly':2,'rebounding':1,'frequently':1,'flora':1,'word':1,'primate':1,'needle':1,'work':2,'stroke':1,'cat':3,'mammalian':1,'suggestive':1,'sudden':3,'thin':1,'universe':1,'chin':2,'fauna':2,'male':2,'history':2,'decorative':1,'continuity':1,'reflector':1,'stream':6,'process':5,'climax':3,'share':1,'parachute':3,'beautiful':3,'minimum':2,'caution':2,'sense':5,'pond':3,'story':1,'hydrogen':1,'species':1,'masterly':1,'terrestrial':2,'huge':8,'united':1,'winter':3,'defective':1,'keen':1,'rather':3,'finger-post':1,'discussion':1,'coot':1,'copious':1,'solidifying':1,'far':1,'hot':1,'pair':2,'forest':2,'fourth':4,'widespread':1,'native':1,'civilisation':1,'stock':3,'mould':1,'yellowish':1,'plant':1,'dull-red':1,'maternal':1,'scion':1,'candle;':1,'thickened':1,'tse-tse':2,'spot':1,'movable':1,'collection':1,'narrow-beaked':1,'diagram':3,'deep-sea':1,'lot':2,'lattice-work':2,'bird-dropping':3,'horizontal':1,'coloured':1,'spiral':7,'man':8,'a':1,'free-swimming':1,'short':9,'natural':2,'liquid':5,'conscious':1,'light':1,'projecting':1,'complexity':1,'green':4,'skilful':1,'deterioration':1,'basket':1,'diary':1,'coral-snake':1,'dream':1,'wing':1,'hen-pigeon':1,'wine':1,'plaice':1,'sperm-cell':1,'shield':1,'feather-wing':1,'double-breather':1,'gradual':6,'minnow':2,'billion':2,'cross':1,'brain':2,'stile':1,'paper':2,'thinning':1,'cold':1,'still':1,'tendency':4,'bunch':3,'chemical':6,'some':2,'group':4,'fit':1,'positively-electrified':1,'glowing':1,'roving':1,'better':2,'window':1,'permanent':1,'microscopic':1,'vast':6,'tubeful':1,'precipitate':1,'main':1,'puzzle':1,'finer':1,'non':1,'good':19,'return':1,'greater':6,'fragment':2,'safe':1,'hunter':1,'number':19,'band':2,'caterpillar':2,'billiard':1,'flint':1,'snake':1,'stout':1,'half':9,'foot':5,'lifelong':1,'day':2,'bank':1,'successor':1,'bony':2,'rocky':2,'profound':1,'mastery':4,'degree.':1,'male-producing':1,'potassium':1,'lifetime':1,'seashore.':1,'hundredth':1,'jellyfish':3,'promise':1,'creature':4,'meal':1,'predatory':1,'turtle':2,'week':3,'molecule.':1,'mental':1,'beginner':1,'map':1,'scanty':1,'garment':6,'fish':6,'hard':1,'spider':7,'related':1,'solution':1,'ball':1,'year':5,'laboratory':1,'first-class':1,'special':2,'magnet':7,'flower':2,'lobster':1,'truly':1,'pigeon':3,'day.':1,'time.':1,'race':2,'flattening':1,'portentous':1,'wide':2,'mammal':1,'brilliantly':1,'sluggish':1,'red':6,'common':12,'foundation':2,'fly.':1,'thrush':1,'belief':2,'many-celled':1,'zoological':1,'southern':1,'million':13,'little':31,'possibility':2,'quite':1,'paralysing':1,'backboneless':2,'reason':1,'lump':1,'hollowed-out':1,'plague':1,'region':2,'cough':1,'marine':3,'wall':3,'monkey':6,'vestige':3,'unique':3,'fixed':2,'yard':1,'hostile':1,'rule':4,'perceptible':1,'moment':6,'british':2,'thing':1,'length':1,'keel':1,'place':2,'nebula':7,'tempting':1,'consequence':1,'weakling':1,'user':2,'blind':3,'copper':3,'sheep-driving':1,'limestone':2,'surviving':1,'striking':7,'spoken':1,'wasp':1,'prehistoric':2,'powerful':4,'scene':2,'sack':1,'system':3,'well-known':1,'fertilised':1,'light-brown':1,'lighter.':1,'spanish':1,'twig-like':1,'ring':2,'tangle':1,'cogged':1,'romance':1,'hood':1,'speck':1,'sheep':1,'city':1,'given':1,'fuller':1,'temperature':1,'swarm':2,'leading':1,'brisker':1,'wing-span':1,'colossal':1,'nebular':1,'wonderful':6,'ton':3,'too':1,'storm':1,'periwinkle':1,'white':7,'compartment':1,'final':1,'friend':2,'low':7,'sex-call':2,'million.':1,'shell':4,'vigorous':1,'fraction':1,'starfish':2,'that':1,'tool':2,'shallow':1,'japanese':3,'crevice':1,'vegetarian':2,'reflecting':1,'zeppelin':1,'somewhat':1,'rifle':4,'prodigious':3,'copy':4,'photographic':3,'peculiar':5,'positively':1,'population':1,'distance':6,'bodyguard':1,'hundred':13,'third':6,'body.':1,'double':1,'tree':7,'rate':2,'medley':1,'bee':2,'youth':1,'matter':9,'legacy':1,'treasure-house':1,'recapitulation':2,'gigantic':4,'steep':1,'distinguished':1,'sublime':1,'collecting':1,'brittle-star':1,'withered':1,'modern':4,'defect':2,'glass':4,'direct':1,'rat':1,'ramifying':1,'sharp':1,'manner':2,'uganda':1,'gaseous':3,'breezy':1,'slab':1,'dozen':4,'conspicuous':1,'female--first':1,'convenient':1,'speculative':1,'shore':1,'soap-bubble':1,'silvery':3,'walk':1,'fish-eater':1,'high':8,'useless':1,'satisfactory':1,'long-drawn-out':1,'soap':4,'propitious':1,'butterfly':1,'memory':1,'continuous':2,'multiple':1,'normal':1,'coconut':1,'leaf.':1,'molecule':5,'boiling':1,'reef-building':2,'regular':1,'connected':1,'non-protrusive':1,'device':1,'coin':1,'hide-and-seek':1,'model':5,'wind.':1,'refractor':1,'known':1,'so-called':1,'piping':1,'thigh-bone':1,'surprising':1,'washerwoman':1,'mobile':2,'heartening':1,'clear':4,'later':6,'metal':1,'dog':6,'wasp-like':2,'tooth':1,'pipe':1,'short-lived':1,'reputation':2,'mammoth':2,'principle':1,'foster-mother':1,'distinctive':2,'velocity':3,'typical':1,'salt':1,'moon':1,'night.':1,'quantity':1,'refund':5,'selected':1,'particularly':1,'sparrow':3,'visitor':1,'manifestation':3,'skin-wing':1,'rotating':2,'bright':1,'shore-pool.':1,'seaweed':1,'constituent':1,'velvety':1,'corner':2,'pill-like':1,'uniform':4,'feat':1,'hustler':1,'staff':1,'current':4,'giant':4,'longer':1,'latent':1,'knowledge':1,'copyright':2,'series':6,'nervous':2,'less':2,'proportion':1,'jolt':1,'fluid':1,'considerable':12,'fox-terrier':1,'winged':1,'bush':1,'going':1,'black':1,'meteorite':1,'pretty':1,'spice':1,'female-producing':1,'ball-room':1,'plate':2,'single-chambered':1,'loss':2,'well-advanced':1,'means':5,'solution.':1,'familiar':1,'vascular':1,'sunny':1,'kind':8,'warm-blooded':1,'pocket':1,'whistle':1,'b':1,'roundabout':1,'measured':2,'silk':1,'spur':1,'live-and-let-live':1,'target':1,'flywheel':1,'bar':1,'progressive':2,'covering':1,'cry':1,'median':2,'violent':4,'doubled':1,'bird':11,'microscope':1,'groove':1,'bison':2,'troop':1,'memory-image':1,'freshwater':2,'web-wing':1,'human':5,'fascinating':1,'habit':1,'flash.':1,'nut':1,'globe':1,'canine':1,'richer':1,'relative':1,'computer':1,'result':2,'frog-like':1,'close':2,'luminous':3,'nocturnal':1,'wonder':1,'peanut':1,'shower':3,'crown':1,'wire':2,'capacity':3,'probable':1,'crooked':1,'subsequent':1,'century':1,'monstrous':1,'definite':6,'seventieth':1,'case':3,'state':10,'proof':1,'hiss':1,'promised':2,'progress':1,'mouthful':1,'perfectly':1,'lethargic':1,'crookes':2,'measurable':2,'notice':1,'recently':1,'cauliflower':1,'parental':1,'fold':1,'screen':3,'weak':2,'dome':1,'veil':1,'rapid':3,'conflagration':1,'waste-product':1,'flowering':1,'swift':2,'problem':2,'colonisation':1,'deep-water':1,'drum':2,'cliff.':1,'country':4,'pre-material':1,'strange':2,'waterfall':2,'quadruped':1,'sensitive':1,'connection':1,'grain':4,'mane':1,'retrograde':1,'lash':1,'comet':4,'passing':1,'whole':8,'humanoid':2,'photograph':9,'stony':1,'cooling':1,'dago':1,'point':3,'simple':9,'continuation':2,'colony':3,'donkey':1,'tapeworm':1,'height':8,'newborn':1,'moot':1,'written':1,'learning':2,'path':2,'greenish':1,'sea-cucumber':2,'hermit-crab':1,'grazing':2,'millimetre':2,'dwindling':3,'deep':1,'basis':2,'tremendous':3,'prelude':1,'damp':1,'tiny':5,'legend':1,'protozoon':1,'reduction':1,'much':5,'newt':1,'certain':18,'reflective':1,'feather':1,'reflex':3,'board':1,'firm':2,'box':2,'direction':1,'penny':2,'corresponding':1,'squirrel':1,'wood-snail':1,'brush':1,'thousand':15,'gas':4,'search':1,'spectrum':1,'coherent':1,'representative':2,'child':3,'laying':1,'careful':3,'land':1,'sound':3,'specialised':1,'novel':3,'conception':1,'remote':1,'solid':4,'plain':3,'straight':3,'prominence':1,'reminiscence':1,'form-resemblance.':1,'technical':1,'while':3,'teaspoonful':1,'biped':3,'voice':2,'cock':1,'guide':1,'mistake':2,'key':2,'food-signal':1,'pound':3,'project':5,'crowning':1,'moth':1,'it':1,'bipedal':1,'quiet':1,'tell-tale':1,'brake':1,'in':1,'twig':2,'simian':6,'property':1,'receptacle':1,'floating':1,'helmet':1,'different':5,'shooting':1,'descent':1,'trial':1,'domesticated':3,'roman':1,'check':1,'member':2,'motley':1,'unity':3,'complex':2,'diplodocus':1,'widely':1,'grand':1,'heavier':1,'web':1,'relatively':5,'yucca':1,'specimen':1,'difficult':2,'wheel':3,'satellite':1,'current.':1,'temporary':2,'cubic':3,'nest':8,'collie':1,'hand':2,'running':1,'dynamo.':1,'moving':1,'delicate':2,'climbing':1,'whale':4,'railway':1,'single':15,'destruction':1,'lower':7,'suitable':1,'stupendous':1,'flattish':1,'weapon':1,'disembodied':1,'tentacle':1,'skull-cap':1,'spoonful':1,'glorious':1,'partner':1,'position':3,'the':1,'reward':1,'musical':1,'left':1,'summer':2,'manifold':2,'kettle':4,'canal':1,'bristle':1,'being':1,'sporting':1,'newton':1,'morsel':1,'loaf':1,'three-chambered':2,'disguise':1,'steamer':1,'victim':1,'touch':1,'jackal':1,'rushing':1,'previous':6,'blow':1,'tailless':1,'disturbance':1,'wedge-shaped':1,'hint':2,'general':5,'bell':2,'master-key':1,'pitcher-plant':1,'silver':1,'straw':1,'spread':2,'transformed':2,'galloping':2,'ray':7,'5':1,'room--pour':1,'transformation':2,'finder':1,'kingdom':1,'puzzle-box':1,'nightjar':1,'fire':2,'format':1,'big':11,'couple':1,'knife-blade-like':1,'period':8,'dark':2,'cromagnon':2,'fusion':2,'royalty':1,'god.':1,'background':1,'vacuum':8,'text-book':1,'world':1,'part':1,'crusher':1,'vague':1,'name':1,'desire':1,'satisfaction':1,'necessary':1,'dislodged':1,'particle':2,'cock-pigeon':1,'signal':2,'performing':1,'sound--':1,'diffraction':1,'specific':2,'soup-plate':1,'vortex':1,'cotton-reel':2,'security':2,'soft':2,'replacement':3,'mathematical':1,'reaches':1,'right':2,'trained':1,'people':1,'prolonged':1,'process--a':1,'plausible':1,'wattle':1,'fully-formed':1,'library':3,'muscle-fibre':1,'sponge':1,'pack':1,'mighty':4,'second.':4,'mirror':4,'diving':1,'battalion':1,'bigger':1,'transparent':1,'saucer':1,'savage':1,'lung.':1,'dense':1,'calculating':1,'prolific':1,'curious':3,'broad':1,'tube':4,'footing':1,'fox':1,'nook':1,'favourite':1,'critical':2,'mutation':1,'changeful':1,'starch':1,'repeopling':1,'transmutation':1,'trap':1,'beetle':1,'knitting-needle':1,'thunderstorm':1,'reasonable':2,'power':2,'slight':3,'notable':4,'pupil':1,'cork':1,'life-or-death':1,'step':1,'caricature':1,'chick':1,'peer':1,'tidal':1,'revolution':3,'chapter':2,'plastic':1,'stone':5,'quarter':4,'central':1,'cigarette':1,'heat-measuring':1,'of':1,'biscuit':1,'bit':3,'slender':1,'greatly':1,'nucleus':5,'bright-green':1,'basin':1,'provisional':1,'pre-human':1,'swimming':1,'heavy':1,'primitive':2,'whole.':1,'cell-wall':1,'predominance':1,'colour':2,'variable':1,'wrack':1,'lung':2,'lively':1,'female':4,'cultivated':1,'pivot':3,'.':16,'telescope':3,'strangely':1,'minute.':1,'weight':2,'well-developed':1,'wonder-horse':1,'grave':1,'tennis':1,'question':1,'reindeer':1,'long':27,'fight':1,'continental':1,'standstill':1,'sea-spider':1,'double-armed':1,'hundred-millionth':1,'house':2,'bubble':2,'hare':1,'bud':1,'greyish':1,'medium':3,'relic':1,'complete':2,'form':2,'voracious':1,'magnificent':1,'registered':2,'converse':1,'neanderthal':1,'triangular':1,'mysterious':1,'cloud':1,'billion.':1,'game':2,'dead':7,'boon':1,'sprinkling':1,'line':9,'true':5,'dull':5,'versatile':1,'luxuriant':1,'continuance':1,'minnow--the':1,'rush':1,'partitioned':1,'genealogy':1,'flood':1,'characteristic':4,'spectroscope':1,'purpose':1,'maximum':3,'supple':1,'planet':2,'crystal':1,'growth':2,'limit':1,'centenarian':1,'mature':2,'monument':1,'soldering':1,'water-bag':1,'distribution':1,'piece':15,'similar':3,'leaf':7,'strongly':1,'stock--an':1,'constant':3,'flow':5,'universal':2,'measure':1,'brightly':1,'whelk':2,'sticky':1,'scientific':1,'diamond':4,'well-defined':1,'leptocephalus.':1,'home':5,'sheath':1,'ship':1,'horse':5,'living.':2,'curtain':1,'film':2,'physical':2,'water-filled':1,'brick':1,'variety':5,'glacier':1,'way':6,'there':1,'prerogative':1,'fruit-laden':1,'portion':1,'reality':2,'neolithic':1,'field':3,'prism':2,'setting':2,'stagnant':1,'branch':5,'most':6,'puppy':1,'superfluous':1,'sufficient':2,'10':1,'polar':1,'quintillion':1,'star':10,'phoenix':1,'living':3,'shelter':1,'flinty':1,'preceding':1,'planet.':1,'drift':1,'prepared':1,'choice':1,'scale':1,'recent':5,'fresh':2,'rolling':1,'yorkshire':1,'hair':1,'score':1,'sneeze':1,'concatenation':1,'source':2,'tree.':1,'vaseline':1,'meteor':1,'bivalve':2,'lead':1,'bullet':2,'dogma':1,'deep-seated':1,'movement-controlling':1,'yacht':1,'jelly':1,'drifting':1,'gorilla':2,'depth':1,'train':1,'mass':5,'fact':2,'time':17,'big-brained':1,'stick':1},'pithecanthropus':{'erectus':1,'erectus.':1,'.':1,'the':8,'was':1,'seem':1},'spectra':{'of':2,'six':1,'.':1,'corresponds':1,'36':1},'bugs':{'ever':1},'renewing':{'the':1},'deterioration':{'of':1,'the':1},'healthfulness':{'and':1},'egg':{'and':1,'a':1,'shed':1,'just':1,'for':1,'of':2,'is':1,'-cell':1,'should':1,'to':1,'which':1,'in':1,'depository':5,'signalling':1,'has':1},'chicks':{'peck':1,'had':1},'earthworm':{'is':1,'.':1,'1':1,'76':1,'s':2,'72':1,'half':1,'fragments':1,'or':1,'earthworms':1},'help':{'preserve':1,'them':1,'of':1,'flotation':1,'it':1,'to':2,'see':1,'produce':1,'in':2,'the':1},'reservoir':{'of':3},'hierarchy':{'of':1},'soon':{'a':1,'picked':1,'began':1,'it':1,'to':1,'as':1,'became':1,'realise':1,'learn':2,'learned':1,'has':1,'was':1,'appears':1,'partially':1},'indistinguishable':{'but':1},'held':{'closely':1,'to':1,'back':1,'together':2,'up':1,'their':1,'above':1,'by':1},'committed':{'to':1},'three-horned':{'skull':1},'kinetic':{'and':1,'energy':3},'liquefies':{'gases':1},'positively-electrified':{'body':1,'atoms':2},'tickings':{'of':1},'lateral':{'line':2},'solving':{'the':1},'teeming':{'.':1},'gentleness.':{'illustration':1},'absence':{'of':7,'or':1},'disclosed':{'by':1},'founders':{'of':1},'peanuts':{'which':1},'mammal--instinctive':{'aptitudes--power':1},'finer':{'world':1,'form':1},'evening':{'work':1,'star':1,'primrose':1},'food':{'and':10,'accentuated':1,'danger':1,'requiring':1,'into':1,'within':1,'it':1,'are':1,'in':3,'consists':1,'crisis':1,'note':1,'vacuole':1,'from':3,'for':2,'there':2,'.':2,'particles':2,'outside':1,'going':1,'was':1,'is':2,'on':1,'shelter':1,'but':1,'227':1,'with':1,'by':1,'enemy':1,'like':1,'largely':1,'many':1,'inside':1,'near':1,'without':1,'the':1,'or':3},'theory--the':{'structure':1},'pglaf':{'owns':1},'floating':{'plants':2,'and':1,'log':1,'sea-meadows':4,'dead':1,'buns':1,'seaweed':1,'in':1,'dust':1,'bacteria':1,'out':1},'anticipated':{'forty-one':1},'permissible':{'to':1},'foot':{'and':2,'flat':2,'of':2,'but':1,'high':2,'became':1,'long':1,'in':2},'feet':{'and':2,'four':2,'from':3,'just':1,'of':1,'whereas':1,'long':2,'.':5,'high':2,'deep':1,'7':1,'in':2,'or':1,'are':2},'stopper':{'of':1},'finite':{'or':1},'dulled':{'by':1},'occasions':{'we':1},'male-producing':{'egg':1},'enlarged':{'pectoral':1,'illustration':1,'in':1},'infer':{'this':1},'flowers--attractive':{'to':1},'stopped':{'until':1},'radial':{';':1,'animals':1,'canals':1},'neanderthalers--the':{'general':1},'dominating':{'the':1},'referred':{'to':3,'to.':1},'heavy':{'great':1,'blankets':1,'gas':1,'brain':2,'as':2,'complicated':1,'with':1,'ape':1},'transcribe':{'and':1},'matthew.':{'diagram':1,'1':1},'restless':{'inquisitiveness':2,'experimenting':1},'jaws':{'and':1,'shaped':1,'of':2,'.':1,'engulfing':1,'which':1,';':1},'down--the':{'day':1},'sulked':{'for':1},'energy.':{'sec':1},'ball':{'revealing':2,'and':1,'of':4,'found':1,'the':2,'or':1},'punitive':{'or':1},'trilobites--jointed-footed':{'antenna-bearing':1},'beyond':{'a':1,'even':1,'that':2,'this':1,'radium':1,'science.':1,'possibility':1,'its':1,'these':1,'which':1,'our':4,'the':6,'playing':1,'ordinary':1},'event':{'when':1,'seems':1,'than':1,'which':1},'oviparous':{';':1},'unsurpassed':{'gifts':1},'percepts':{'and':1},'crustacean':{'s':1},'surrounded':{'by':3},'abysses':{'and':1,'from':1,'of':1,'took':1,'.':1,'so':1,'are':1,'the':1},'america.':{'3':1,'2':1,'4':1,'6':1},'coincidences':{'.':1},'safety':{'on':1,'for':1,'of':3,'is':2,'within':1,'.':1,'until':1,'or':1,'first':1},'7':{'and':1,'palaeolithic':1,'inches':1,'why':1,'.':3,'000':1,'918':1,'1871':1,'250':1,'with':1,'the':2,'250000':1},'brownish':{'caterpillars':1},'sharp-eyed':{'enemies':1},'house-flies':{'and':1},'issue':{'of':2},'meteoric':{'matter':3},'metchnikoff':{'the':1},'drink':{'from':1},'inert':{'matter':2,'just':1,'in':1},'protruding':{'bag':1},'lights':{'as':1,'the':2},'schwalbe':{'has':1},'backboneless':{'stocks':1,'animals':3,'or':1,'animal':2},'reason':{'for':6,'to':9,'being':1,'of':2,'is':4,'in':1,'but':1,'.':1,'how':1,'--an':1,'i.e':1,'quite':1,'why':2},'base':{'and':1,'of':5,'an':1},'jaw.':{'illustration':1},'brightest':{'star':1},'put':{'a':2,'on':6,'her':1,'into':1,'out':2,'some':1,'it':3,'together':3,'two':1,'to':2,'together.':1,'zinc':1,'in':2,'forward':1,'our':1,'the':5,'themselves':1,'safely':1,'your':1,'evenly':1},'earliest':{'known':3,'remains':1,'inhabitants':1,'metal':1,'representatives':1},'algae':{'and':2,'symbiosis':1,'.':1},'revolutionary':{'changes':1},'capacities.':{'body':1},'perceptible':{'to':1,'impression':1},'persuading':{'some':1},'tortoises':{'to':1,'from':2},'fifty-four':{'muscles':1},'american':{'killdeer':1,'monkey':1,'forests':1,'monkeys':1,'.':1,'minnows':1,'astronomer':1,'tree-frogs':1,'continent':1},'conquered.':{'it':1},'daisy':{'are':1},'undergo':{'disintegration.':1},'zoophyte':{'called':2,'.':2},'assign':{'no':1},'most...':{'.':1},'partnerships':{'between':1},'knots':{'subsequently':1,'or':1,'smoke':1,'for':1},'probability':{'is':4,'that':1,'the':1,'in':1},'encoding':{':':1},'knocking':{'off':1},'reflected':{'rays':1,'from':3,'back':1,'to':1,'depends':1,'through':1},'antiquity':{'and':1,'of':3,'the':1,'with':1},'moorings':{'.':1},'elder':{'brothers':1},'unexpected':{'manoeuvres':1},'incubated':{'in':1},'warty':{'chameleon':3,'creature':1},'1871':{'when':1},'mist':{'that':1},'miss':{'gertrude':1,'the':1,'part':1,'frances':1},'ninth':{'printing':1},'foraminifera':{'and':1,';':1,'each':2},'utters':{'instinctively':1},'horse':{'and':7,'eohippus':1,'use':1,'merychippus':1,'orohippus':1,'of':2,'showing':2,'pliohippus':1,'running':1,'.':1,'shunting':1,'will':1,'s':1,'mesohippus':1,'a':1,'have':1,'which':1,'has':1,'beginning':2,'or':1,'is':1},'pelagica':{'this':1,'125':1},'findings':{'of':1},'interwoven':{'with':1,'that':1},'obedience':{'to':1},'483.3':{'11.86':1},'wonderful':{'instruments':1,'modern':1,'cluster':1,'devices':1,'colour-scheme':1,'fabric':1,'to':1,'system':1,'.':1,'instrument':3,'new':1,'elements':1,'intellectually':1,'revelations':1,'photograph':1,'corona':1,'manifestations':1,'mass':1,'source':1,'piece':1,'changes':1,'discoveries':1,'x-ray':2,'result':1},'gibraltar':{'professor':1,'so':1},'einstein.':{'illustration':1},'scheme':{'represents':1,'of':1},'danger-call':{'of':1},'passed':{'and':5,'perhaps':1,'down':1,'to':1,'as':1,'through':3,'the':2,'by':1,'before':2},'pure-bred':{'wheat':1},'measurable':{'.':1,'quantity':2},'basal':{'appetites':1},'1918':{'flew':1,'upwards':1},'blindly':{'and':1},'1911':{'showing':1,'23':1},'half-made':{'wing':1},'1912':{'.':1,'in':1},'1914':{'this':1,'and':1,'41':1,'an':1},'1917':{'a':1,'we':1,'upwards':1},'grew':{'to':1,'wheat':1,'by':1,'up':1},'tunic':{'of':1},'kindly':{'emotions':1},'grey':{'red':1,'in':1},'haddock':{'or':1},'intensities':{'of':1},'toward':{'the':2,'death':1,'increasing':1,'us':1},'stickleback':{'enters':2,'being':1,'of':1,'is':2,'s':1,'making':2},'fisheries':{'in':1},'withered':{'leaf':1,'herbage':1},'clerk-maxwell':{'james':1,'246':1,'one':1},'bells.':{'in':1},'alongside':{'of':3},'juice':{'has':1},'sentences':{'of':1,'were':1},'events':{'included':1},'concentration':{'than':1},'organs':{'and':1,'of':1,'pass':1,'but':1,'.':4,'in':1,'throughout':1,'or':1},'gathering':{'light':1,'some':1,'round':1,'to':1,'of':1},'atoms--the':{'energy':1,'discovery':1},'lid':{'.':1},'lie':{'on':1,'disregarded':1,'outside':1,'low':1,'in':1,';':1,'at':1},'u.s':{'.':2},'speculative':{'and':1,'picture':1,'point':1},'flaming':{'jets':1,'hydrogen':2},'scotland':{'1920':1,'s':1,'since':2,'were':1,'.':1},'camouflage':{'and':1,'a':1},'lit':{'our':1,'the':1,'by':1,'up':1},'relieved':{'of':1,'by':2},'labour':{'and':2,'becomes':1,'has':1,'set':1,'.':1},'lip':{'of':1,'the':1,'which':1,'but':1},'useless':{'vestige':1,'responses':1,'movements.':1,'halfpennies':1,'heat':1,'movements':2},'command':{'travels':2},'presently.':{'regions':1,'if':1},'embryological':{'evidence':1,'proof':1},'towards':{'a':1,'what':2,'or':1,'becoming':1,'us':2,'fruit-eating':1,'him.':1,'flesh-eating':1,'harmony':1,'nobler':1,'the':17,'increasing':1,'clothing':1,'its':2,'those':1},'figures--bison':{'reindeer':1},'quote':{'professor':1,'the':1},'literal':{'demonstration':1,'blood-relationship':1},'systems':{'comes':1},'indefinitely.':{'the':1},'eaten':{'or':1},'position':{'and':1,'would':1,'these':1,'of':3,'is':2,'.':1,'held':1,'as':1,'in':1,'invisible':1,'increasing':1,'where':1,'into':1},'alpha':{'the':2,'rays':1,'particle':1,'centauri':2},'approved':{'fashion':1},'19.--comet':{'september':1},'muscle':{'and':1,'for':1,'which':1,'blood-vessel':1},'evolution--factors':{'in':2},'prolongation':{'of':2},'mobile':{'ribs':1,'vehicle':1,'pigment-cells':1,'.':1,'water':2,'in':1,'tongue':1},'performances':{'and':1,'depended':1},'clear':{'and':2,'for':1,'that':8,'ideas':1,'illustration':1,'.':2,'water':1,'as':1,'without':1,'adaptation':1,'in':1,'passage':1,'why':2},'broadened':{'and':1,'out':1},'snapping':{'at':1},'25--giant':{'spiral':1},'electrons':{'and':7,'copper':1,'all':1,'being':1,'possessing':1,'move':1,'moving':1,'it':2,'an':2,'produced':2,'streaming':2,'as':2,'are':7,'in':6,'particles':1,'compose':1,'from':8,'would':1,'electricity':1,'flying':1,'circulating':1,'travel.':1,'.':11,'rushes':1,'to':2,'behind':1,'without':1,'therefore':1,'contained':1,'revolving':1,';':2,'has':3,'pass':1,'is':2,'do':1,'may':1,'circulated':1,'but':2,'263':1,'267':1,'revolve':1,'now':1,'spin':1,'a':1,'rush':1,'resulting':1,'receive':1,'leave':1,'into':1,'258':1,'across':1,'will':1,'continue':1,'so':1,'were':1,'become':1,'increase':1,'or':3},'foster-mother':{'hen':1},'velocity':{'for':1,'of':8,'sufficient':1,'.':2,'which':1,'beyond':1,'masses':1},'usual':{'interchange':1,'direction':1,'definite':1,'difficulty':1,'mode':1,'way':1,'shortness':1,'notion':1},'tubes':{'and':1,'.':1,'by':1,'until':1},'one-eighth':{'of':1},'phenomenon':{'of':1,'is':1,'.':1},'registers':{'the':1,'itself':1},'caries':{'hitherto':1},'velvety':{'skin':1},'stores':{'of':3,'nor':1},'heavens':{'we':1,'7':1,'being':1,'is':1,'.':5,'are':1,'constitutes':1,'which':2,'the':1,'more':1,'with':1,'along':1,'at':1},'164.78':{'34800':1},'wriggle':{'through':1,'up':1},'debts.':{'moreover':1},'with.':{'in':1},'betokens':{'a':1},'northern':{'hemisphere':1,'rhodesia':2,'spain':4,'lakes':1},'duncan':{'.':1},'series':{'of':13,'is':1,'e.g':1,'.':2},'distances;':{'the':1},'less':{'satisfactory':1,'secure':1,'striking':1,'expensively':1,'successfully':1,'powerful':1,'genial':1,'likely':1,'definite':1,'in':1,'radiation':1,'clearly':1,'protrusive':1,'prolific':1,'domed':2,'able':1,'.':2,'moist':1,'stable':2,';':1,'degree':1,'continuous':1,'accurately':1,'important':4,'strenuous':1,'known':1,'regular.':1,'than':17,'conspicuous':1,'aimless':1,'central':1,'fit':2,'brusque':1,'of':3,'steady':1,'severe':1,'promising':1,'the':1,'spontaneous':1},'darted':{'furiously':1},'orbits.':{'circling':1,'yet':1},'surveyed':{'.':1},'pretty':{'generally':1,'fluorescence':1,'pieces':1},'quadrupedal':{'fashion':1},'circle':{'this':1,'of':1,'here':1,'are':1,'round':3,'shows':1},'darwin':{'origin':1,'sir':1,'said':1,'showed':3,'charles':1,'56':1,'observed':1,'s':9,'greatest':1,'in':1,'the':3,'called':1},'ball-room':{'.':1},'dominant':{'spring':1,'reptiles':1},'meanwhile':{'the':1,'we':1,'it':1},'trees':{'a':2,'and':2,'like':1,'with':1,'of':1,'.':2,'where':2,'were':1,'the':1,'has':1,'was':1,'why':1},'famous':{'jesuit':1,'theory':1,'form':1,'of':1,'for':4,'book':1,'manchester':1},'feels':{'for':2},'combinations':{'of':1},'during':{'a':3,'her':1,'eclipses':1,'this':3,'many':1,'an':2,'these':1,'which':5,'the':19,'its':2},'molten':{'interior':1,'matter':1,'by':1},'birds.':{'during':1,'according':1,'it':1},'catches':{'a':1,'the':1},'intrude':{'on':1},'alteration':{'modification':1,'of':1},'flight.':{'illustration':1},'underlying':{'photosphere':1},'withdrawal':{'of':1},'hours--a':{'prodigious':1},'hobbled':{'with':1},'seventeen':{'and':1,'years':1},'religiosa':{'a':1,'138':1},'electro-magnet':{'and':1},'throwing':{'the':1,'off':1},'plausible':{'view':1},'culture':{'gave':1,'migrating':1,'.':1},'invisible.':{'the':2,'sec':1,'illustration':1},'close':{'and':1,'rapidly':1,'indeed':1,'enough':1,'together':1,'to':3,'resemblances':1,'contact':2,'at':1,'reproduction':1,'of':1,'resemblance':1,'by':2},'plankton.':{'hunger':1},'gravitation':{'that':1,'of':1,'is':1,'.':3,'to':1,';':1,'etc.':1},'probable':{'date':1,'age':1,'that':12,'period':1,'however':2},'plasticity':{'of':1,'.':2},'not-living':{'material':1,'materials':1},'tibet':{'indo-china':1},'seventieth':{'of':1},'educability':{'is':1,'but':1,'.':1},'won':{'most':1},'years.':{'and':1,'in':1},'probably':{'associated':1,'illustrates':1,'an':1,'not':1,'are':1,'begun':1,'in':2,'cloud':1,'profitable':1,'from':2,'adapted':1,'there':1,'when':1,'indicate':1,'much':2,'helps':1,'survive':1,'means':2,'lived':1,'that':2,'far':1,'safe':2,'clearer':1,'less':1,'connected':1,'represented':1,'during':1,'breeding':1,'intrinsically':1,'a':3,'did':1,'of':2,'taking':1,'preyed':1,'suggests':1,'points':1,'evolved':2,'the':3,'encased':1,'counted':1,'came':1},'conditions':{'and':1,'that':2,'this':1,'of':15,'when':1,'culminating':1,'.':5,'will':1,'while':1,'internal':1,'are':4,'they':1,'in':2,'reached':1,'the':1,'our':1},'aeons':{'of':1},'ps':{'.':1},'stagnation':{'.':1},'egg-cells':{'and':4},'fox-bat':{'with':1},'missing':{'an':1},'description.':{'it':1},'moults':{'three':1},'craters':{'and':1,'on':1,'indicated':1,'of':3,'.':1,'which':1},'ranked':{'amongst':1},'basalts':{'.':1},'invisible':{'and':2,'because':1,'star':1,'thread':1,'visible':2,'light':2,'gas':1,'against':1,'.':3,'particles':1,'to':1,'rays':1,'electrons':1,'but':1,'molecules':1,'waves':1,'world':1,'medium':1,'if':1},'both':{'jaws':2,'is':1,'in':1,'are':1,'paragraphs':1,'birds':1,'cases--marvellous':1,'from':1,'ways':1,'when':2,'.':1,';':1,'difficult':1,'eyes':2,'his':1,'kinds':1,'photography':1,'chimpanzee':1,'minnows':1,'adult':1,'cases':3,'with':1,'sides':2,'man':1,'on':1,'processes':1,'land':1,'these':3,'of':4,'hemispheres':1,'below':1,'time':1,'small':1,'the':2,'fertility':1,'herons':1},'humidity.':{'there':1},'gaunt':{'and':1},'greater--a':{'sudden':1},'sensitive':{'and':1,'period--the':1,'bromogelatine':1,'hairs':1,'no':1,'to':2,'that':1,'line':1,'than':3},'picture.':{'b':1,'illustration':2},'vaster':{'irregular':1},'experimental':{'plot':1,'discoverer':1,'study':1,'men':1,'character':1,'evidence':1,'behaviour':1,'initiative':1,'way':1,'embryology':1,'conditions':1,'devices.':1,'proof':1},'battery':{'consisted':1},'hewn':{'but':1},'whatever':{'be':1,'kind':1,'medium':1,'means':1,'advances':1,'colour':1,'number':1,'part':1,'way':1,'sets':1,'the':1},'chromosomes.':{'3':1,'5':1,'illustration':1,'6':1},'galileo':{'s':1,'who':1},'climbers':{'of':1,'in':1},'undulating':{'flashes':1},'revolutionising':{'our':1},'persecuted':{'.':1},'described':{'on':1,'later':1,'it':1,'one':1,'to':1,'as':3,'without':1,'stars':1,'in':4,'the':1,'.':1,'by':1},'stamp':{'of':2},'damp':{'meadow.':1,'weather.':1,'grass':1,'meadow-grass':1},'exert':{'this':1,'a':1},'geddes':{'and':1},'describes':{'the':1},'maintenance':{'of':1},'territory':{'we':1},'empty':{'available':1,'shell':2,'space':2,'of':1,'nest':2,'space--ether':1,'coco-nut':1,'infinite':1,'chambers':1,'the':1,'tubular':1},'jesuit':{'astronomer':1},'lived':{'on':1,'like':1,'for':1,'there':1,'.':1,'in':3,'100':1,'between':1},'partly':{'on':2,'because':9,'opened':1,'due':2,'accounts':1,'by':2},'success.':{'the':1},'intelligently.':{'intelligence':1},'freezing-point.':{'the':1},'exempt':{'status':2,'from':1},'permeating':{'the':1},'else':{'it':1,'soon':1,'in':2,'.':1,'seek':1,'mere':1},'lives':{'a':1,'on':2,'there.':1,'for':1,'inside':1,'together':1,'.':3,'at':1,'which':1,'in':4,'or':1},'liver':{'and':1},'magnetised':{'iron':1},'look':{'towards':1,'like':1,'for':3,'exactly':1,'.':1,'to':1,'at':4,'forward':2,'further':1,'precisely':1,'after':3,'more':1},'opportunity.':{'there':1},'ape-like':{'and':1,'eyebrow':1},'pace':{'sternly':1,'of':1},'while':{'and':1,'all':1,'contemporaneously':2,'energy':1,'some':1,'it':1,'one':1,'at':1,'zinc':1,'in':1,'our':1,'neanderthal':1,'her':1,'there':1,'two':1,'to':1,'we':1,'they':2,'others':2,'monkeys':1,'a':2,'on':1,'fleas':1,'these':1,'many':1,'this':1,'the':12,'similar':1},'ought':{'to':4,'definitely':1},'286':{'transformation':1},'mitchell':{'it':1},'guide':{'the':1,'him':1,'.':1},'pack':{'of':1},'albatros':{'fashion.':1},'forelegs':{'as':1},'selected':{'spot':1,'was':1},'dictum':{'that':1},'fed.':{'the':1},'overlooked':{'the':1},'geologists':{'to':1,'cannot':1},'reads':{'the':1,'like':1},'ready':{'to':4,'way':1},'simian':{'tribe.':1,'branch':1,'stock--physiological':1,'characters':1,'line':1,'type':1,'stock':5},'communal':{'life.':1},'predominates':{'.':1},'forewing':{'.':1},'belong':{'to':6,'as':1,'.':1},'unpromising':{'haunt':1},'shad':{'which':1},'grand':{'hardwood':1,'total':1,'.':1},'modification':{'or':1},'composition':{'of':3,'what':1,'was':1,'we':1},'clearness':{'and':1},'hind-leg':{'of':2},'used':{'on':1,'we':1,'for':6,'fire':1,'is':1,'up':2,'.':1,'to':14,'as':4,'threads':1,'in':10,'such':1,'the':1,'was':1,'by':5,'if':1},'temporary':{'and':2,'diseased':1,'nest':1},'suggestion':{'of':5,'that':2,'was':1,'.':1},'optic':{'nerve':1},'tube.':{'it':1},'u.s.':{'unless':1},'wilson':{'a':1,'observatory':2,'reflector':1,'45':1,'reflecting':1,'california':2,'observatory.':8},'000':{'and':1,'barrels':1,'miles':35,'years.':1,'pounds':3,'of':6,'times':3,'feet':1,'to':6,'000':20,'miles--eighteen':1,'are':1,'atoms.':1,'inch':2,'deg':2,'years':17,'bushels':2},'uses':{'it':1},'cleaning':{'the':1},'saucer-shaped':{'body':1},'assortment':{'of':1},'brussels':{'sprouts':1},'tufts':{'growing':1,'of':1,'in':1},'changed.':{'we':1},'luminescence':{'will':1,'makes':1,'that':1},'older':{'astronomers':1,'and':1,'loess':1,'yucca':1,'than':1},'spectrum.':{'that':1},'copper.':{'illustration':1},'consistence':{'of':1},'obviously':{'that':1,'much':1,'means':2,'desirable':1,'depends':1,'complex':1,'the':1,'must':1},'segmented':{'marine':1},'forms.':{'illustration':1},'calcutta':{'which':1,'.':1},'suddenness':{'the':1,'like':1},'scouring':{'a':1,'tide':1},'distances':{'and':1,'distance':1,'from':5,'of':3,'within':1,'deriving':1,'are':1,'which':1,'between':1,'the':1,'with':1},'alytes':{'not':1},'cave':{'in':2,'drawings':1,'northern':4,'.':1},'judgments':{'about':1,'expressed':1,'in':1},'migratory':{'flight':1},'overflows':{'over':1},'rabbit--who':{'by':1},'quarters':{';':1},'perforating':{'the':1},'planetoids':{'splashed':1,'or':1},'useful':{'and':1,'associations':2,'ready-made':1,'branches':1,'means':1,'pennies':1,'teeth':1,'law--senses':1,'to':6,'deposit':1,'advertisement':1,'in':3,'offices.':1,'law':1,'quality':1,'first':1},'praying':{'mantis':3},'informal':{'introductions':1},'possessors':{'to':1,'back':1,'than':1},'stock--physiological':{'proof--embryological':1},'debatable':{'questions':1},'remaining':{'on':1,'six.':2,'provisions.':1},'elver':{'at':1},'unravelled':{';':1},'march':{'23':2},'insert':{'here':1},'reptilian':{'splendour.':1,'mind--mind':1,'life':1,'mind':1,'features':1},'showing':{'a':10,'division':1,'seven':2,'him':1,'upper':1,'gradual':2,'that':1,'evolution':1,'marked':1,'.':1,'how':1,'various':2,'no':1,'under':1,'in':1,'variable':1,'what':1,'the':16,'many':1,'their':1,'trout':1},'game':{'of':4,';':1,'or':1},'wiser':{'than':1},'text-book':{'of':2},'damage':{'or':1},'distance.':{'illustration':1},'wings':{'of':3,'is':2,'turned':1,'it':1,'.':4,'suggests':1,'while':1,'are':3,'have':1,'in':1,'the':1},'translucent':{'blue':1},'ponds':{'and':1,'where':1,'they':1,'.':1},'fore-limb':{'and':1,'of':2,'is':1,'has':2,'transformed':1},'long-drawn-out':{'sublime':1},'pillar':{'to':1,'the':1,'parallel':1},'resorted':{'to':1},'holes':{'and':1},'manifest':{'themselves':1},'eel':{'and':1,'is':1,'early':1,'haddock':1,'anguilla':2,'ever':2},'popular':{'lectures':1,'astronomy':1,'idea':1,'sense':1,'interpreter':1,'estimation':1},'death-feigning':{'for':1},'minced':{'snail':1},'mathematical':{'discussion.':1,'astronomers':1,'genius':1,'points':1,'consequence':1,'astronomy':1,'reasoning':1},'wrack':{'behind':1},'cones':{'and':1,'to':1},'negative.':{'a':1},'creation':{'of':1,':':1,'when':1,'.':3},'some':{'pollen':1,'remarkable':1,'insects':2,'cromagnards':1,'muscle-fibres':1,'worms':1,'parts':4,'years':2,'volcanic':1,'cases':10,'knowledge':1,'hint':1,'interesting':1,'young':1,'improvement':1,'source':1,'writers':1,'black':1,'botanists':1,'deep-seated':1,'thousands':1,'dispute':1,'which':1,'food':1,'leisure':1,'dark':2,'they':1,'radio-active':1,'uncertain':1,'adventurous':1,'stimulus':1,'deficient':1,'miles':1,'truth':1,'small':2,'force':1,'people':1,'animals':4,'idea':2,'namely':1,'are':3,'measure':8,'disturbing':1,'nocturnal':1,'creatures':1,'respects':3,'organisms':1,'solemn':1,'anatomists':1,'eminent':2,'uniform':2,'fossil':1,'new':4,';':1,'twenty-five':1,'sluggish':1,'trout':1,'degree':2,'men':1,'lakes':1,'quite':1,'water':1,'extraordinary':1,'reason':1,'extent':5,'path':1,'canals':2,'strong':1,'great':2,'thirty':1,'of':55,'region':1,'undisguised':1,'aboriginal':1,'butterflies':1,'place':1,'deep-sea':1,'other':15,'mound-birds':1,'members':1,'striking':1,'simple':2,'fishes':3,'hermit-crabs':2,'carry':1,'ape':1,'little':1,'nebulae':2,'would':2,'harmless':1,'lizards':1,'unknown':1,'long':1,'way':5,'more':1,'sort':8,'that':1,'vanishing':1,'mammals':2,'explanation':1,'precision':1,'races':1,'particular':1,'prodigious':1,'primeval':2,'careful':1,'spirit':1,'task.':1,'150':1,'distance':2,'kind':5,'word':1,'solid':1,'theories':1,'nine':1,'were':1,'beautiful':2,'imaginative':1,'larger':1,'beetles':1,'process':1,'modern':1,'geologists':1,'states':1,'say':1,'have':2,'regulate':1,'species':2,'education':1,'considerable':1,'detail':1,'astronomers':4,'very':1,'strange':1,'electrical':1,'animal':1,'semi-fluid':1,'intelligent':1,'day':2,'fairly':1,'unimaginable':1,'kinds':2,'earlier':1,'delicacy':1,'secluded':1,'waves':1,'authorities':6,'such':2,'land':1,'dragon-flies':1,'surprising':1,'magical':2,'think':1,'fundamental':3,'time':1,'wood-snails':1,'eighty-odd':2,'bodies':1,'typical':1},'yolk':{'fully':1,';':1,'has':1,'y.s.':1,'.':1},'apes--gorilla':{'orang':1},'urgent':{'need':1},'lips':{'and':2,'four':1,'audibly':1},'economic':{'and':1},'besides.':{'interpretation':1},'nerve-fibres':{'one':1},'lingers':{'in':1},'body-mind':{'.':1},'universes':{'why':1,'comparable':1,'.':1,'like':1,'in':1},'bruising':{'the':2},'savage':{'nature':1},'nonproprietary':{'or':1},'fifty-millionth':{'of':1},'pitchblende':{'about':1,'which':1},'exceeding':{'the':1,'that':1},'competitions':{'arose':1},'pounding':{'breakers':1},'civilization':{'.':1},'sympathetic':{'ganglia':1,'colouring':1},'claimed':{'that':1},'knitting-needle':{'in':1},'eating':{'at':2,'one':1},'protrusible':{'tongue':1,'tentacles':1},'processing':{'or':1},'lakes':{'and':1,'there':1,'are':2},'stem':{'still':1,'diverged':1,'help':1,'goes':1,'.':2},'step':{'meant':1,'towards':1,'two-thirds':1,'which':1,'in':6,'toward':1,'was':3},'lasts':{'till':1,'through':1,'no':1},'become':{'equally':1,'words':1,'beautifully':2,'satisfactory':1,'an':1,'at':1,'sea':1,'in':3,'luminous':1,'living':1,'bipeds':1,'unavailable':2,'unavailable.':1,'burrowers':1,'silvery':1,'shorter':2,'permanent':1,'fatal':1,'more':3,'real':1,'yellowish':1,'separate':1,'secondarily':1,'invisible--just':1,'faintly':1,'steadied':1,'parr':1,'utterly':1,'not':1,'instinctive':1,'dissipated':1,'quite':1,'invisible.':1,'a':13,'organically':1,'perfectly':1,'like':1,'liquid':1,'of':1,'large':1,'the':2,'adapted':1},'abroad':{'during':1},'facility:':{'http:':1},'shine':{'very':1,'out':1},'faith':{'that':1},'76':{'photo':1,'the':1,'venus':1,'capella':1},'entailed':{'on':1},'prothyl':{'as':1},'warm-bloodedness':{'is':2},'four-footed':{'ancestry':1},'chaps.':{'illustration':1},'silence':{'and':1,'immense':1},'seeing':{'there':1,'it':1},'baboons':{'.':1},'visit':{'to':1,':':1,'http:':1},'within':{'into':1,'60':1,'as':2,'itself':2,'.':1,'their':2,'which':2,'themselves':1,'them':2,'his':1,'reach':1,'five':2,'90':2,'recent':1,'a':7,'about':2,'limits':1,'this':1,'30':1,'bounds':1,'reasonable':1,'the':20,'fixed':1},'libelled':{'as':1},'encircling':{'rampart':1},'one-millionth':{'of':2},'france':{'and':3,'in':3},'smells':{'indeed':1},'theory.':{'the':1,'while':1,'illustration':1},'statistics':{'worked':1},'feelers.':{'illustration':1},'renewal':{'.':1},'sea-snail':{'and':1,'.':1},'transcending':{'the':1,'anything':1},'placing':{'a':1,'the':1},'moseley':{'found':1,'s':1,'some':1},'heritage':{'not':1,'much':1},'spawning':{'none':1,'solution':1,'.':1,'beds':1,'are':1,'method':1},'revolving':{'very':1,'as':1,'electrons':1,'in':1,'round':1,'blades':1},'tortoise-shell':{'butterfly':1},'manufacture':{'and':1,'subtle':1,'much':1,'chlorophyll':1},'himself':{'and':1,'established':1,'educated':1,'the':1,'.':1,'in':1,';':1,'by':1},'registered':{'on':1,'trademark':2},'frost':{'and':1,'acting':1,'but':1},'torch':{'of':1},'shore-crab':{'is':1,'shows':1,'.':1},'properly':{'the':1},'authority':{'on':2,'thinks':1},'newer':{'loess':1},'hares':{'and':1},'dull':{'sheaths':1,'white':3,'red-hot':1,'red':1,'.':1},'zooelogical':{'discoveries':1},'lamp-shells':{'trilobites':1,'molluscs':1},'folk-ways':{'to':1},'drifters':{'the':1,'or':1,'plankton':1},'skull':{'and':6,'represents':1,'from':1,'then':1,'of':2,'is':2,'was':3,'.':3,'discovered':2,'looks':1,'which':1,'the':2,'with':1,'warns':1,'170':1},'circuits':{'as':1},'sifting':{'process':1,'.':1,'to':1,'continue':1,'which':3,'the':2,'by':1,'out':3},'foresight':{'and':1,'to':1,'means':1},'state--':{'radiant':1},'cautiously':{'out':1},'similar':{'palatable':1,'needs':1,'disturbance':1,'inference':1,'adaptations':1,'organisms':1,'sedimentary':1,'performances.':1,'processes':1,'results':1,'forms':2,'to':5,'experiments':1,'statements':1,'in':1,'things.':1,'disorders':1,'pieces':1,'conditions':1,'deposits':1,'stage':1},'non-living':{'sea-dust':1,'world.':1},'adults':{'of':1,'the':1,'like':1},'introducing':{'dust':1,'2':1},'metals':{'afforded':1,'would':1,'began':1,'but':1,'as':1,'were':1,';':1,'seem':1,'the':1},'unwise':{'to':1},'1894':{'in':1},'1895':{'sir':1,'roentgen':1},'1896':{'becquerel':1},'1890':{'that':1},'shown.':{'in':1},'kidney':{'filters':1},'cotton':{'packet':1,'were':1},'ancestors':{'a':1,'belonged.':1,'breathing':1,'on':1,'may':1,'of':5,'.':4,'which':1,'were':2,'during':1},'amounts':{'almost':1,'according':1},'heat.':{'recent':1,'illustration':1,'that':1},'prerogative':{'of':2},'mantises':{'which':1},'dissolved':{'away':2,'in':2,'salts':1,'out':1},'electrical':{'industries':1,'force':1,'installations':1,'nature':1,'influence':1,'energy':2,'phenomena.':1,'phenomena':2,'.':1,'cell':1,'attraction':2,'storm':1},'themselves.':{'illustration':1},'milk-glands':{'of':1},'dashes':{'round':1},'bodies.':{'4':1},'draw':{'water':1,'this':1,'a':1,'back':1},'clean':{'and':1},'calculating':{'boy':2},'crouching':{'bird':1,'lying':1},'potentialities':{'of':1},'triumph':{'that':1},'visits':{'us':1,'another':1},'frances':{'pitt':1},'william':{'king':1,'james':1,'bragg':2,'leche':2,'ramsay':1,'crookes':5},'astronomy.':{'ball':1},'chameleon':{'140':1,'attacked':1,'may':1,'is':2,'.':1,'s':1,'which':1,'in':1,'the':1,'inflated':1,'anolis':1},'does;':{'with':1},'cuttlefish':{'do':1,'or':4,'swimming':1},'structure':{'201':1,'and':3,'or':1,'would':1,'do':1,'far':1,'of':8,'is':1,'between':1,'mainly':1,'.':4,'adaptation':1,'which':1,'in':1,';':1,'has':1,'the':1},'independently':{'established':1,'darting':1},'correlated':{'with':1},'e':{';':1,'vivo':1,'.':9},'practically':{'a':1,'dates':1,'cosmopolitan':1,'anything':1,'certain':2,'extinguished':1,'all':1,'as':1,'every':4,'invisible.':1,'invisible':1,'the':1,'ready-made':1,'illimitable':1},'physics':{'and':2,'is':1,'.':1,'cannot':1,'so':1,'at':1,'has':1,'with':1,'are':1},'portentous':{'furnace':1,'event':1,'mines':1},'required':{'to':2,'five':1,'by':1,'thirty-five':1,'for':3},'resolving':{'to':1,'the':1},'orbit':{'to':1,'of':2,'round':1,'.':1},'utilised':{'to':1,'we':1,'by':1,'directly.':1},'depth':{'of':2,'the':1,'limit':1,'.':1},'night.':{'meteors':1,'higher':1},'utilises':{'the':1},'ignorant':{'of':2},'underrated':{'.':1},'berries':{'and':1},'requires':{'to':2,'the':1,'for':1,'ten':2},'sounded':{'by':1},'evenly':{'together':1},'gr':{'granules.':1},'cheerful':{'and':1},'34800':{'1':1},'go':{'and':1,'into':3,'back':4,'down':2,'through':3,'farther':2,'irresponsibly':1,'in':2,'out':2,'their':1,'up-stream':1,'since':1,'to':4,'too':1,'forward':1,'round.':1,'badly':1,'far':2,'free':1,'hand':1,'they':1,'a':1,'on':8,'fully':1,'straight':1,'up':1,'so':1,'deeply':1,'wrong:':1,'the':1,'round':2},'compact':{'little':2,'readily':1},'birthplace':{'after':1,'where':1,'.':1},'baron':{'cuvier':2},'arid':{'and':1,'summer':1},'suits':{'their':1,'the':1},'task.':{'quick':1},'friendly':{'home':1},'fond':{'of':3},'moribund':{'animalcules':1},'rebounding':{'branch':1},'1796':{'the':1},'miners':{'when':1},'wave':{'would':1,'thunder':1,'of':1,'.':1,'shapes':3,'forms.':1},'board.':{'the':1},'trough':{'to':1,'is':1,'in':1},'more.':{'there':1,'sec':1},'whirlpools':{'.':1,'in':1},'scrapers':{'gravers':1},'stiff':{'when':1,'tail-feathers':1},'positions':{'of':1,'towards':1,'so':1,'.':2},'button':{'at':1},'michael':{'s':1,'hart':1},'hive':{'bees':1},'tree.':{'the':1,'sec':1},'verdict':{'omne':1},'sedentary':{'plants':1,'sea-squirts':1,'sponges':1,'or':1,'types':1},'betelgeux':{'has':1},'deg.-34':{'deg':1},'teeth.':{'adaptations':1,'illustration':1},'dilute':{'substances':1},'booty':{'.':1},'detaches':{'a':1},'gumboil':{'too':1},'picked':{'them':1,'off':1,'it':1,'up':3},'creatures--the':{'first':1},'notwithstanding':{'our':1},'fishermen;':{'without':1},'plays':{'possum.':1,'upon':2,'its':1,'an':2},'paintings':{'on':2},'opaque':{'covering':1,'substances.':1,'substance':1,'with':1,'substances':2},'b-c.':{'older':1},'atoms--different':{'kinds':1},'cell':{'that':1,'to':1,'as':1,'in':2,'the':1,'has':1,'come':1},'prejudicially':{'affected':1},'experiment':{'and':1,'showed':1,'would':1,'that':1,'with':1,'.':4,'will':1,'2':1,'which':1,'in':1,';':1,'has':3,'was':2,'he':1},'poles':{'of':3,'especially':1,'.':1},'rotted':{'into':1},';':{'just':1,'indeed':1,'soon':1,'yet':3,'before':1,'copernicus':1,'interesting':1,'3':3,'to':2,'out-breeding':1,'4':2,'8':1,'his':1,'rational':1,'meanwhile':1,'food':1,'they':25,'not':1,'nor':1,'h':1,'where':1,'round':1,'energy':1,'some':4,'ourselves':1,'out':1,'even':2,'living':1,'what':2,'organisms':1,'its':2,'enough':1,'discovers':1,'7':2,'probably':1,'we':7,'here':1,'water':3,'others':2,'by':5,'on':4,'c':1,'of':2,'larger':1,'or':1,'simple':1,'ca':1,'one':3,'another':2,'mercury':1,'from':1,'there':11,'two':1,'thirdly':1,'2':4,'therefore':1,'6':2,'corresponding':1,'that':12,'ages':1,'but':39,'those':1,'he':3,'sound':1,'b':2,'mc':1,'this':3,'while':1,'r':1,'and':61,'almost':1,'thus':1,'it':51,'an':1,'as':1,'at':1,'in':17,'partly':1,'if':6,'perhaps':4,'foretells':1,'how':1,'5':2,'which':2,'9':1,'though':3,'gradually':1,'most':1,'man':1,'a':7,'lower':1,'short':1,'for':3,'sometimes':2,'so':1,'the':65},'completion':{'assuming':1},'melancholy':{'the':1,'in':1},'cellulose':{'walls':2,'but':2},'filings':{'on':1,'arrange':1},'commercial':{'redistribution.':1},'fifteenth':{'of':1},'arrow-worm':{'and':1},'following':{'short':1,'for':1,'that':1,'this':1,'list':1,'professor':1,'sentence':1,'definite':1,'up':2,':':1,'which':1,'each':1,'the':3,'stages':1},'boot.':{'sec':1},'collar-bone':{'which':1},'canals':{'and':2,'of':1,'running':1,'have':1,'.':2},'water-weeds':{';':1},'convert':{'even':1,'to':1,'nitrogenous':1},'indivisible':{'thing':1,'.':3,'particle':1,'they':1,'in':1},'anvil':{'a':1,'the':1,'could':1,'221':1,'.':1},'haunts':{'and':1,'both':1,'of':5,'there':1,'.':2,'untenable':1,'are':1,'in':1,'the':1,'or':1},'animalcules':{'especially':1,'which':1},'benevolence':{'which':2},'repel':{'one':1},'products':{'the':1},'stars--the':{'shape':1,'nebular':1,'age':1},'hearty--we':{'might':1},'stump-like':{'legs':1},'daybreak':{'and':1},'addresses':{'.':2},'danger':{'home':1,'but':1,'of':1},'foothold':{'and':2,'to':1,'in':2},'limited--there':{'are':1},'wit':{'of':2,'enough':1,'to':1},'vegetation--a':{'very':1},'singing':{'of':1},'cloud':{'and':1,'formations.':1,'of':1,'to':2,'32':1,'not':1,'makes':1,'or':2},'reflector':{'differ':1,'of':1,'.':1,'at':1,'instead':1,'the':1,'has':1},'remains':{'adjusted':1,'bring':1,'as':2,'are':1,'in':1,'unaltered':1,'to':1,'known':1,'that':1,'very':1,'occurred':1,'unfrozen':1,'164':1,'quite':1,'with':1,'man':1,'a':2,'obscure.':1,'of':7,'clear':1,'were':2,'found':4,'the':1,'fixed':1,'stationary':1,'consisted':2},'hydra':{'growing':1,'and':1,'72':1,'a':1,'many':1},'contentment':{'.':1},'crab':{'and':1,'then':1,'gets':1,'on':1,'these':1,'is':3,'continues':1,'soon':1,'to':1,'s':2,'116':1,'has':1,'prefers':1,'must':1},'vehicle':{'and':1,'of':2},'stage':{'and':1,'what':1,'or':1,'fastened':1,'like':2,'of':4,'is':1,'there':1,'.':1,'in':4,';':1,'its':1,'before':1},'depreciate':{'the':1},'started':{'the':1,'his':1,'with':1,'less':1},'becomes':{'a':4,'limited':1,'gradually':1,'feebler':1,'lead':2,'very':1,'radium':2,'hard':1,'uranium':1,'electrified':1,'possible':1,'shorter':1,'much':1,'impure.':1,'radiated':1,'negatively':1,'aware':1,'the':5,'great.':1,'more':4},'visibility':{'are':1,'but':1},'43.4':{'alpha':1},'rivalry':{'of':2},'huxley':{'regarded':1,'1825-95':2,'by':2,'called':1},'sea-floor':{'and':1,'a':1},'crosses':{'a':1,'the':2},'consort':{'with':1},'lapse':{'of':1},'averaged':{'off.':1},'recession':{'of':1},'3--the':{'moon':1},'meet':{'and':1,'exceptional':1,'this':1,'where':1,'their':1,'frequently':1,'the':3,'with':1},'nurture':{'habits':1,'seems':1},'drops':{'of':2,'as':1},'control':{'a':1,'of':2,'over':1,'in':1,'but':1,'.':1,'as':1,'each':1,'the':1},'corpuscular':{'theory':1},'escapes':{'this':1,'attention':1,'from':1,'by':1,'.':1},'escaped':{'and':1},'his':{'chariot':1,'magnetic':1,'actions':1,'hind-legs':1,'polish':1,'throne.':1,'previous':1,'pectoral':1,'limbs':1,'rapid':1,'disposal':1,'beagle':1,'kingdom.':1,'astonishment':1,'world.':1,'grip':1,'plate':1,'big':2,'navigable':1,'wives':1,'famous':1,'breast':1,'facial':1,'vacuum':1,'foot':2,'experiments.':1,'distrust':1,'science':1,'fertility':1,'teeth.':1,'ethical':1,'lowly':2,'infancy':1,'best--':1,'dead':1,'affiliation':1,'cost':1,'living':1,'pedigree':1,'tube':1,'fingers':1,'lowliness':1,'conduct':2,'origin.':1,'achievements':1,'theory':1,'business':1,'dental':1,'behaviour':1,'ancestry':1,'flanks':1,'eye':2,'tortoise':1,'conviction':1,'pursuits.':1,'messages':1,'interesting':1,'or':1,'origin':1,'own':3,'family':1,'bonnet':1,'erect':1,'god-like':2,'refined':1,'greatness.':1,'mental':2,'parentage':1,'fields.':1,'monkey':1,'own.':1,'brute':1,'long':1,'milieu':1,'observations':1,'greatness':1,'right.':1,'telegraph':1,'descent.':1,'head':3,'relationship':1,'bodily':2,'hole':1,'breast-pocket':1,'structure.':1,'encouragement.':1,'work':1,'individual':1,'more':1,'eyes':1,'domesticated':1,'everyday':1,'innings':1,'leisure-time':1,'electro-magnetic':1,'power':2,'faults':1,'reach.':1,'arguments':1,'answer':1,'stock':1,'development':2,'noble':2,'elbows':1,'social':1,'hand':1,'mouse-pupil':1,'mouth':2,'mate':2,'solidarity':1,'attempt':1,'observation':1,'charges':1,'starting':1,'chickens':1,'daily':1,'hypotheses':1,'fundamental':1,'tubes':1,'left':1},'pulling':{'things':1,'the':2},'sought':{'after':1,'out':1},'cave-men':{'of':1,'lived':1,'or':1,'show':1},'herring-gulls':{'lift':1},'embodiment':{'to':1,'or':2,'of':1},'defective':{'you':1,'work':1,'or':2},'digested':{'or':1},'confessed':{'that':2},'andes':{'.':1},'arrangement':{'of':4,'is':1,'there':1,'by':1},'solidifying':{'of':1},'located':{'on':1,'in':1,'at':2,'also':1},'sentiments':{';':1,'in':1},'instinctively':{'a':1,'recognize':1,'as':1,'for':1,'but':1},'re-use':{'it':2},'circular':{'magnetic':1,'orbit':1,'craters':1},'pink':{'mouth':1},'fostered':{'and':1,'not':1},'furiously':{'upon':1},'thunderstorm':{'we':2,'.':1},'trinil':{'in':1},'regrown':{'double.':1,'.':1},'sugar-bird':{'in':1},'free-swimming':{'larval':1,'larvae':1},'1.88':{'4230':1},'gulps':{'.':1},'conspicuousness':{'serves':1},'divided':{'their':1,'the':1,'into':5,'.':1},'immensity':{'of':1,'is':1},'least':{'meant':1,'a':3,'cold':1,'within':1,'600':2,'has':1,'interesting':1,'half':1,'there':1,'twenty':1,'one':1,'as':1,'of':2,'two':1,'in':1,'progress':1,'tremor':1,'.':2,'the':1,'by':1,'inclination':1},'astronomical':{'instruments':1,'society.':2,'instrument':1},'spots--they':{'are':1},'sperm':{'-cell':1},'boils':{'because':1},'primates':{'and':1,'sprang':2,'began':1,'soon':1,'.':1,'emerged':1,'in':1,'was':1},'including':{'climate':1,'shrews':1,'that':1,'some':1,'life':1,'legal':2,'obsolete':1,'checks':1,'but':1,'how':1,'the':5,'river':1,'outdated':1,'any':1},'obelia':{'68':1,'consisting':1},'converting':{'it':1},'facilitates':{'the':1},'brittle':{'spikelet-bearing':1},'avebury':{'s':1},'27-1':{'2':1},'outer':{'layers':1,'and':1,'stream':1,'space':1,'envelope':1,'one-mile':1,'crust':1,'surface':1,'crust.':1,'mile':1,'world':2,'ring':1},'exclusion':{'or':1},'thence':{'to':1},'up-stream':{'as':1},'masses':{'and':2,'of':6,'the':2,'or':1,'a':1},'water-weed':{';':1,'glued':2},'brook':{'of':1},'him':{'and':1,'partly':1,'of':1,'.':2,'how':1,'which':1,'in':1,'with':2},'registration.':{'illustration':1},'pre-dravidians':{'and':1},'master.':{'learning':1},'dead-leaf':{'butterfly':2},'popularly':{'known':1,'supposed':1},'shasta':{'daisy':1},'hills.':{'the':1},'rising':{'and':2,'from':1,'into':1,'sometimes':2,'water':1,'to':1,'in':1},'africa.':{'illustration':2},'stout':{'knitting':1},'hands':{'and':1,'did':1,'.':1,'in':1,'of':1},'front':{'and':3,'of':3,'door':1,'side':1,'.':1},'revealed.':{'even':1,'illustration':1},'masters':{'of':1},'f.e.s.':{'a':5,'diagram':1,'protective':1,'earthworm':1,'when':1,'hermit-crab':1,'hind-leg':1,'glass':1,'green':1,'new':1,'the':5,'trypanosoma':1,'venus':1},'mastery':{'of':5,'by':1,'.':1},'university':{'of':2,'library':3,'10':1},'plate-holder':{'on':1},'magnitude':{'and':2,'of':1,'what':1,'which':1},'mode':{'of':1},'pools':{'and':1,'of':2,'it':1,'dried':1,'which':1,'in':1},'evolution--how':{'it':1},'legions':{'of':1},'upward':{'and':2,'to':1,'at':1},'mare.':{'illustration':1},'map':{'of':2},'globe':{'and':1,'from':1,'like':1,'turns':1,'.':3,'will':1,'to':1,'bounded':1,'which':1,'was':1},'steadied':{'into':1},'mollusc':{'and':1,'s':1,'shells':1},'sands':{'of':2},'measure':{'be':1,'them':1,'for':1,'this':1,'speed':1,'explained':1,'it':1,'.':2,'how':1,'controlling':1,'unveiled':1,'dependent':1,'the':1,'with':1,'climb':1},'separating':{'the':1,'from':1,'positively-electrified':1},'special':{'protective':1,'vertical':1,'danger':1,'rules':1,'study':1,'protection':1,'interest':1,'make-up':1,'skin-leaves':1,'photographic':1,'properties':1},'143':{'protective':1},'ejecting':{'beta':1,'an':1},'vaporisation':{'of':1},'9.--the':{'great':1},'confess':{'to':1},'protoplasm':{'which':1,'flowing':1},'may':{'afterwards':1,'consider':1,'obtain':1,'rest':1,'bring':1,'go':2,'follow':2,'still':2,'find':1,'help':1,'29':2,'charge':1,'choose':1,'save':1,'swim':1,'do':1,'get':1,'read':1,'express':1,'mention':2,'not':4,'tend':1,'fitly':1,'realise':1,'contain':1,'become':3,'mean':1,'traverse':1,'set':1,'we':1,'see':1,'1924':1,'pass':6,'creep':1,'even':1,'by':1,'yet':1,'wriggle':1,'approach':1,'refer':1,'make':3,'be':124,'notice':1,'extend':1,'associate':1,'here':1,'qualify':1,'distinguish':1,'bask':1,'change':1,'convert':1,'keep':1,'credit':1,'place':1,'retain':1,'safely':1,'think':1,'elect':1,'divide':1,'conclude':1,'merely':1,'determine':1,'speak':4,'use':2,'raise':1,'prove':2,'there':2,'add':1,'.':1,'call':1,'therefore':1,'only':1,'form':2,'serve':1,'hear':1,'gain':1,'demand':1,'copy':2,'look':2,'remain':1,'suppose':1,'learn':3,'spawn':1,'give':3,'escape':1,'it':1,'say':3,'at':1,'have':27,'seem':3,'seek':1,'occur':2,'lie':1,'turn':2,'perhaps':1,'travel':1,'also':3,'take':1,'rise':1,'quote':1,'produce':2,'recognise':1,'assume':1,'well':3,'roughly':1,'spend':2},'time.':{'the':2,'illustration':1,'in':1},'pendent':{'whalebone':1},'cause':{'a':3,'and':1,'clouds':1,'of':2,'tiny':1,'chemical':1,'to':1,'the':1,'bodies':1},'achievements':{'of':2,'so':1},'fly.':{'the':1,'illustration':1},'that--':{'first':1},'withering':{'leaves':1,'leaf':1},'completely':{'disappear':1,'invisible.':1,'mysterious':1,'camouflaged.':1,'worked':1,'empty':1},'ancestry':{'of':2,'.':1,'but':1,'in':1},'egg-cocoons':{'in':1},'x':{'indicates':1},'mares':{'brought':1},'spongillidae':{'the':1},'hostile':{'way':1},'determining':{'the':1},'route':{'of':1},'times':{'and':4,'among':1,'smaller':5,'over':1,'it':1,'as':7,'thinner':2,'human':1,'in':3,'still':1,'from':1,'for':2,'whipping':1,'there':1,'when':1,'long':1,'.':2,'cooling':1,'until':1,'more':1,'we':2,'around':1,'that':6,'lizzie':1,'rise':1,'during':1,'emergence':1,'longer':1,'a':3,'faster':1,'of':3,'the':6,'round':1},'counterpart':{'of':1,'in':1},'keen':{'and':2,'a':1,'senses':1,'struggle':2,'are':1},'keel':{'on':1,'which':1,'for':1,'if':1},'apennines':{'have':1},'glories':{'of':1},'sargasso':{'sea.':1,'weed':2},'fertilises':{'these':1,'the':2},'baleen':{'whale':1},'possessing':{'the':1,'with':1},'powerful':{'a':1,'telescopes.':1,'muscles':1,'friar-birds':1,'leg':1,'strokes':1,'legs':1,'tides':1,'factors':1,'possible':1,'agencies':1,'magnet':1,'microscope':1,'current':1,'as':1,'.':1,'than':2,'lens':1},'disembodied':{'electricity':2,'atom':1},'fertilised':{'egg-cell':7,'egg':2,'ovum':2,'by':1},'light-brown':{'colour':1},'lighter.':{'the':1},'proterospongia':{'69':1,'one':1},'activity.':{'this':1},'precisely':{'the':2,'because':1,'controlled':1,'like':1},'quality':{'and':1,'which':2,'that':1,'of':4,'is':1,'.':2,'they':1,'in':1,'than':1},'suck':{'.':1},'long':{'slope':1,'golden':1,'strings':1,'afterwards':1,'weighs':1,'process':2,'series':1,'is':1,'ages':4,'it':2,'as':6,'gristly':1,'summer':1,'result':1,'another':1,'curved':1,'lifetime':1,'racial':1,'tubular':1,'arm':1,'before':3,'story':1,'gamut':1,'pedigree':1,'prehensile':1,'ones':1,'since':3,'.':4,'to':4,'tail':1,'low':1,'way':3,'time':2,'has':1,'red':1,'stilt-like':1,'ago':12,'begin':1,'run':2,'arboreal':1,'history':2,'inclined':1,'after':1,'body':1,'haunt':1,'ovipositor':1,'step':1,'journey':2,'threads':1,'with':1,'day':1,'chapter':1,'on':1,'and':3,'like':1,'stalks':2,'we':1,'the':1,'lizard-like':2,'face':2,'range':1,'branched':1,'period':2,'night.':1,'night':1,'periods':1,'rising':1,'tongue':1,'narrow':1,'summer.':1,'or':1,'pre-human':1,'are':1},'bears':{'very':1,'the':1,'in':2},'dove':{'and':1},'land--the':{'air.':1},'relations':{'and':1,'making':1,'of':1,'with':1,'to':1},'well-formed':{'when':1},'attach':{'to':1},'attack':{'it':1},'fishes.':{'eventually':1,'there':1,'cambrian':1},'declines':{'to':1},'wrapped':{'up':4,'it':1},'perfectly':{'still':1,'aerated':1,'straightforward':1,'circular':1},'final':{'spectrum':1,'.':1,'dispersion':1,'stable':1,'answer':1,'clue':1,'unification.':1},'circulate':{'round':1},'hydrosphere':{'.':1},'2-1':{'2':1},'rays--the':{'alpha':1},'exactly':{'like':1,'where':1,'equal':1,'the':2,'balance':1,'similar':1},'well-finished':{'statuettes':1},'stress':{'on':1},'lists':{'of':1},'feint':{'towards':1},'chemicals':{'which':1},'manipulation':{'of':1,'another':1},'natural':{'process':1,'spectrum':1,'rate':1,'leafy':1,'knowable':1,'size':1,'death':7,'inheritance.':1,'inheritance':2,'question':1,'to':1,'reduction':1,'therefore':1,'size.':1,'conditions':2,'resources':1,'surroundings.':1,'death.':1,'law':1,'death--procession':1,'reflex':1,'history':22},'waist':{'of':1},'photograph':{'a':1,'from':2,'reproduced':1,'of':11,'showing':4,'below.':1,'tied':1,'an':1,'note':1,'255':1,'attaining':1,'are':1,'taken':4,'the':3,'.':1,'shows':3,'clearly':1,'is':2,'fig':1},'glow-worm':{'or':1},'well-established':{'jellyfish':1},'bed':{'of':1},'bee':{';':1,'or':1,'can':1,'.':1},'providing':{'large':1,'access':2,'it':1,'copies':1},'distinguished':{'from':2,'of':1,'astronomers':1,'physicists':1,'solar':1,'anthropologist':1,'man':1},'spurs':{'of':1},'exhibit':{'in':1,'pieces':1},'enforced':{'descent':1},'lightly':{'built':3},'unchanged':{'since':1},'abyssal':{'area':1},'yielding':{'and':1},'p.m':{'.':1},'nototrema':{'there':1},'need':{'and':2,'a':1,'for':3,'be':1,'is':1,'.':1,'not':6,'foundations':1,'hardly':4},'precursors':{'of':4},'screw':{'in':1},'student-citizen':{'otherwise':1},'pursued':{'by':1},'able':{'even':1,'to':36,'with':2,'artificially':1,'in':1},'darkened':{'nest':1},'celandine':{'with':1},'instance':{'a':1,'by':1,'iron':1,'that':3,'of':6,'is':2,'in':4,'when':1,'having':1,'will':1,'how':2,'which':2,'have':1,'were':1,'the':1,'.':1,'was':1,'occurs':1,'to':1,'must':1},'relatives':{'there':1,'some':1,'like':1,'illustrate':1},'rischgitz.':{'professor':1,'baron':1},'pursues':{'a':1,'it':1,'another':1},'blades':{'of':1},'lectures':{'and':1},'moths':{'in':1,'are':1,'that':1},'connected':{'to':2,'story':1,'with':4,'by':1},'last--that':{'is':1},'learnt':{'something':1},'intrinsic':{'racial':1},'gallery':{'there':1},'speed--and':{'must':1},'enregistrations':{'are':1},'radiating':{'away':1,'heat':1,'or':1},'ovum-producer':{'for':1},'upset':{'both':1},'prickle':{'or':1},'astonishing':{'fact':1,'rapidity':1},'prickly':{'fruits':1},'se':{'.':1},'wot':{'isn':1},'impression':{'147':1,'that':1,'of':7,'is':1,'when':1,'illustration':1,'which':1,'on':1,'left':1},'emerging':{';':1,'from':4},'sent':{'on':1,'an':1,'to':1,'through':1,'forth':1,'out':1},'multicellular':{'animals':7},'influences.':{'but':1},'well-being':{'throughout':1},'pigling':{'creeps':1},'graptolites':{'and':1},'slow.':{'illustration':1},'based':{'on':5,'upon':1},'sheriff':{'of':1},'millennia':{'of':1,'in':1},'brighten':{'almost':1},'bases':{'embedded':1},'bud':{'a':1,'by':1},'inherited':{'nature.':1,'from':1},'attained':{'dark':1,'to':3,'a':1,'by':1},'employed':{'and':1,'to':1,'the':1,'in':1},'mortality':{'and':1,'had':1,'hardly':1,'.':1},'seizing':{'and':2,'every':1,'killing':2},'120':{'large':1,'deep-sea':1,'the':1,'flinty':1},'121':{'the':1,'egg':1},'123':{'miles':1},'124':{'photo':1,'woolly':1},'125':{'of':1,'albatross':1,'000':1,'storm':1},'sifting--the':{'groaning':1},'128':{'the':1},'thomson':{'sir':2,'evolution':1,'end':1,'262':1,'this':1,'was':1,'professor':1,'j':1,'regius':1,'as':1,'release':1,'imagined':1,'experimental':1,'darwinism':1},'endless':{'nooks':1,'disturbances':1},'three-hundredth':{'of':1},'gutenberg:':{'1.e.1':1},'processes':{'on':1,'that':1,'of':6,'into':1,'.':1,'to':1,'are':2,'which':1,'such':1},'automatic.':{'upper':1},'gutenberg.org':{'license':1},'trucks':{'.':1},'imperious':{'for':1},'introductions':{'to':1,'like':2,'too--the':1},'she':{'flies':2,'often':1,'soon':1,'at':1,'picked':1,'reached':1,'would':1,'had':2,'handed':1,'does':2,'got':2,'has':1,'was':4,'secures':1,'gave':1,'then':1,'never':1,'very':1,'brushes':1,'flew':1,'wanted':1,'succeeded':1,'presented':1,'did':2,'ever':1,'applies':1},'contain':{'a':1,'wheat':1,'within':1,'electrons':1,'defects':1,'more':2},'amphibia':{'senses':1},'embryonic':{'gill-clefts':1,'food-canal':1,'reptiles':1},'spotted':{'and':1,'leopard':1,'.':1},'multiplying':{'usually':1,'the':2,'by':2,'but':1},'burying':{'them':1},'34.7':{'smaller':1},'cuts':{'both':1,'the':1,'off':2,'it':1},'canine':{'tooth':2,'teeth':1},'inkling':{'of':1,'that':1},'breathe':{'dry':5,'on':1,'depend':1,'oxygen':1},'photosphere--is':{'of':1},'legacy':{'of':4,';':1},'powder':{'to':1,'which':1},'frog-like':{'mouth':1},'humane':{'sentiments':1},'surmised':{'about':1},'unconscious':{'elimination':1,'co-operation':2},'apes--the':{'gorilla':2,'gibbon':1},'southward':{'migration':1},'tend':{'to':15,'toward':1},'state':{'of':23,'visit':1,'applicable':1,'.':3,'to':1,'as':1,'in':1,'growing':1,'such':1,'s':1,'law':1,'the':2},'mind.':{'and':1,'there':1,'other':1,'sec':1,'viii':1,'another':1,'in':1},'carapace':{'of':1,'is':1,'or':1},'allotted':{'to':1},'tens':{'of':2},'neither':{'atmosphere':1,'stores':1,'very':1,'agreement':1,'aspect':1,'in':1},'kidneys':{'are':1,'the':1,'at':2,'.':1},'generations.':{'this':1,'to':1},'comparable':{'on':1,'in':2,'to':4},'attention':{'saving':1,'they':1,'may':1,'of':2,'to':1,'at':1,'decide':1,';':1},'renamed.':{'creating':1},'constituted':{'of':2},'importance':{'and':1,'on':1,'though':1,'becomes':1,'is':1,'were':1,'when':1,'namely':1,'to':1,'as':1,'of':6,'too':1,'in':1,'was':1,'than':1},'hurrying':{'streams':1},'edge-on':{'to':1,'44':1,'notice':1,'of':1},'8.--the':{'sun':1},'efficiency':{'and':1,'of':1,'is':1,'.':1,'in':1},'key':{'to':2,'after':1,'from':1,'opening':1,'.':1},'group':{'and':1,'always':2,'of':6,'only.':1,'the':1,'or':1},'precious':{'and':1,'to':1,'animal':1,'contents':1},'distribution':{'and':1,'underwent':1,'of':6,'.':1,'must':1},'secchi':{'the':1},'hits':{'the':1},'sediments':{'were':1},'limits':{'of':7,'the':1,'in':1,'that':1},'mongol':{'australian':1},'minds':{'of':2,'the':1},'preyed':{'upon':2},'strains':{'of':1,'differing':1,'that':1},'admit':{'a':1,'of':3,'the':1,'that':1,'to':1},'manifestations':{'and':1,'of':1,'in':1},'joy.':{'finally':1},'plankton':{'and':1,'is':1,'as':1,'.':1},'estimation':{'.':1},'torn':{'off':1},'studying.':{'some':1},'886.0':{'29.46':1},'colonisation':{'of':1,'was':1},'habitual':{'surroundings':1,'intelligent':1},'penetrating':{'deeply':1,'consequences':1,'opaque':1},'kin-sympathy':{'and':1},'distinguish':{'the':1,'six':1,'several':1,'different':1},'preparedness':{'until':1},'together.':{'except':1},'sea-cucumber':{'119':1,'it':1},'sense.':{'bibliography':1},'tread':{'of':1},'gregarious.':{'the':1},'addition':{'to':5,'that':1,'it':1,'of':1},'disintegrate':{'much':1,'under':1},'own.':{'the':1,'contents':1,'illustration':1},'cent':{'of':1,'selection':1,'.':3},'immense':{'extent':1,'distance':1,'stretches':1,'darkness':1,'distances':1,'column':1,'void':1,'fossilized':1,'amount':1,'importance':1,'rate':1,'mass':1,'monotony':1,'sea':1,'outbursts':2,'velocity':1,'electrical':1,'accumulation':1,'upward':1},'slowly':{'and':1,'on':1,'about':1,'dying':1,'creeping':1,'into':1,'changed':1,'it':1,'back':1,'down':1,'dissolved':1,'dissolve':1,'changing':1,'worked':1,'.':1,'taking':1},'flinders':{'petrie':1},'dead.':{'illustration':1},'shoulders':{';':1},'senses':{'and':2,'do':1,'recognise':1,'of':4,'.':1,'besides':1,'to':1,'which':1,'in':1,'touch':1,'interpret':1},'diversity':{'and':1,'in':1},'digged':{'and':1},'releasing':{'electrons':1},'four-toed':{'horse':2},'176-177':{'side':1},'expenditure':{'possible.':1},'1769-1832':{'86':1,'one':1},'mail':{'.':1},'mammals--with':{'their':1},'novel':{'and':1,'situation':1,'restlessness.':1,'way':1},'unsegmented':{'worms':1},'domestication':{'illustrate':1},'asexual':{'reproduction':4},'air-tubes':{'blood-channels':1,'takes':1,'or':1},'16.--the':{'moon':1},'chalk':{'cliffs':1},'ten-millionth':{'of':1},'owns':{'a':2},'comets':{'and':2,'is':1,'or':1,'we':1,'.':1},'ago--a':{'few':1},'tide.':{'arctic':1},'inhabits':{'british':2},'surface':{'and':8,'among':1,'often':1,'is':4,'it':1,'an':1,'through':2,'are':1,'in':2,'trailing':1,'millions':1,'from':1,'.':19,'to':3,'does':1,'therefore':1,'which':2,';':2,'was':1,'waters':2,'resembles':1,'but':2,'water':1,'by':4,'must':2,'of':27,'receives':1,'were':1,'the':2,'or':1,'bodies':1,'view':2},'examined':{'to':1,'must':1,'.':1},'lambs':{'and':1,'.':1},'conical':{'projection':1,'teeth':1},'inference--or':{'reason':1},'capture':{'small':1,'and':1,'especially':1,'air.':1},'shooting':{'star':1,'outwards':1,'stars':1,'out':1},'zoophytes':{'corals':1,'and':1},'above.':{'illustration':1},'began':{'on':1,'their':2,'long':1,'.':2,'to':25,'as':1,'in':3,'the':3,'with':2},'views':{'and':1,'we':1,'with':1,'.':1},'parts':{'and':1,'about':1,'to':1,'of':13,'company':1,'was':1,'.':1,'sufficiently':1,'only':1,'take':1,'which':1,'in':2,'ebbs':1,';':1,'save':1,'fluctuate':1,'are':3},'ante-natal':{'life':4,'sleep':1,'period':1,'hood':1},'underground':{'world':2},'party':{'distributing':1},'chlamydosaurus':{'of':1},'tapped':{'supplies':1},'capelle':{'in':1},'experimented':{'on':1,'with':1},'formations.':{'illustration':2},'appearances':{'may':2},'effect':{'and':1,'on':3,'would':1,'may':1,'of':5,'when':1,'.':1,'owing':1,'which':3,'movement':1,'measured':1,'than':1,'before':1},'clouds--some':{'with':1},'compared':{'to':4,'with':8},'surroundings.':{'the':1},'colouring':{'this':1,'remains':1,'the':1,'was':1,'of':1},'prophesied':{'for':1},'fierce':{'and':2,'flood':1},'frequently':{'transfer':1,'spread':1,'recurrent':2,'doubled':1},'destruction':{'of':1,'the':1},'poultry':{'are':2},'scarcely':{'taken':1},'reflection':{'of':1,'.':1},'cliff-loving':{'bird':1},'i':{'am':1,'had':1,'.':4,'came':1,'have':1,'the':1,'was':1,'present':1},'obstacles':{'.':1},'well':{'and':4,'named':1,'says':1,'developed':6,'illustrated':1,'known':2,'as':8,'dried':1,'have':1,'in':2,'shown':1,'able':1,'.':2,'to':1,'be':2,'afford':1,'concealed':1,'suited':3,'alone':1,'advanced':1,'placed':1,'protected':1,'accustomed':1,'mixed':1,'adapted':3},'shell--there':{'is':1},'nebulous':{'matter':2},'rife':{';':1,'in':1},'mccabe':{'a':1,'joseph':1},'years--but':{'in':1},'deadly':{'trypanosome':1},'glowed':{'under':1},'neutralised':{'and':1},'45':{'photo':1},'enormously':{'great':1,'slow':1,'greater':1,'.':2,'high':1,'enlarged':1,'denser':1,'distended.':1,'elongated':3,'increased':1},'increasingly':{'a':1},'accurate':{'analytical':1,'to':1,'measurements':1,'student':1},'mistaken':{'.':1},'leisure-time':{'observations':1},'radium--the':{'discovery':1},'sources':{'of':2},'ermine':{'is':1,'has':1,'mainly':1},'mistakes':{'often':1,'like':1,'that':1},'distant':{'planet':1,'aquatic':1,'star':1,'planets':1,'from':2,'ages':1,'past':1,'shores':1,'blaze':2,'stars':2,'date':1,'world':1},'skill':{'and':1,'.':1,'as':1,'without':1,'they':1,'in':2,'the':1},'jackal':{'and':1},'recapitulated':{'by':1},'grappling':{'and':1,'tentacles':1},'1.f.1':{'.':1},'1.f.6':{'.':1},'ovum':{'and':1,'introducing':1,'from':1,'is':1,'or':1,'with':1,'divides':1},'1.f.4':{'.':1},'density':{'heat':1,'stretching':1,';':1},'deposits':{'of':1,'which':3,'would':1,'were':1},'lured':{'upwards':1},'extends':{'not':2,'from':1,'at':1},'maintaining':{'tax':1},'recapitulates':{'at':1},'size.':{'illustration':1},'warrant':{'for':2},'clouded':{'that':1},'fate':{'of':2,'with':1,'by':1},'disappearance':{'of':2,'as':1},'devised':{'by':1},'utah':{'.':1},'propelled':{'themselves':1},'fats':{'and':1},'262':{'electrons':1,'from':1},'historic':{'interest':1},'267':{'arrangements':1,'disintegration':1},'contingents':{'from':1},'burden':{'and':1},'propeller':{'.':1},'immediately':{'preceding':1,'has':1,'lying':1,'for':1,'.':1},'crusher':{'is':1},'prominent':{'eyebrow':2},'loss':{'of':6,'there':1,'in':1},'fleas':{'and':1},'necessary':{'mathematical':1,'for':1,'that':1,'may':1,'it':1,'.':2,'to':9,'in':1,'apprenticeship':1},'lost':{'and':1,'faunas':1,'is':1,'some':1,'three':2,'races':1,'so':1,'or':1},'sizes':{'of':5,'according':1,'which':1},'ctenophores':{';':1,'or':1},'exhausted':{'by':1,'are':1},'payments':{'and':1,'must':1,'should':1},'lose':{'all':1,'one-millionth':1},'page':{'34.':1,'.':2,'also':1,'are':1,'280':1,'the':1,'92':1,'at':2},'likes':{'to':1},'therein':{'lays':1},'shed':{'germ-cells':1,'in':1,'.':1},'glare':{'of':2,'out':1},'offshore.':{'conditions':1},'arrows':{'tycho':1},'belonged':{'.':1},'phenomena':{'and':1,'then':1,'may':1,'of':3,'studied':1,'near':1,'.':1,'as':1,'cannot':1,'including':1,'are':3,'in':2,'not':1,'mean':1},'library':{'very':1,'of':2,'.':3},'husk':{'.':1},'warmer':{'water':1},'home':{'for':4,'of':1,'university':3,'.':5,'in':5,'anger':1,'was':1,'or':1},'peter':{'perhaps':1,'could':1,'was':1,'which':1},'planetesimal':{'dust':1},'scales':{'and':1,'to':1,'of':1,'shows':1},'before.':{'illustration':1},'projection':{'of':2},'broad':{'flat':1,'massive':1,'way':1,'outlines':2,'fact':2,'saucers':1},'kettle':{'on':2,'over':1,'containing':1},'cabbages':{'such':1},'injects':{'the':1},'appreciative':{'awareness':1},'tadpole':{'becomes':1,'has':1,'with':1,'mouth':1},'fountain':{'of':4},'mutation':{'and':1,'is':1},'demonstrated':{';':1},'limitations':{'are':1,'.':1},'incandescence':{'and':1},'inaccurate':{'or':1},'butterfish':{'or':1},'reaching':{'a':1,'to':1,'the':1,'which':1,'project':1},'millions.':{'the':1},'expansion':{'of':3},'imperfectly':{'known':1,'finished':1,'warm-blooded':1},'instinct':{'and':3,'may':1,'is':2,'by':2,'to':1,'as':1,'cannot':1,'in':1,';':1,'with':1,'professor':1},'stows':{'this':1},'sways':{'from':1},'macpherson.':{'illustration':1},'embryos':{'of':4,'an':1,'that':1},'freedom':{'and':1,'of':3,'understanding':1,'in':1},'interlinked':{'system':1,'in':1},'discovered.':{'primitive':1,'illustration':1},'chance':{'on':1,'as':1,'.':1},'flesh-and-blood':{'natural':1},'dominion':{'astrophysical':1},'tongue':{'a':1,'on':1,'and':1,'of':2,'upon':1,'ending':1,'can':1,'which':2},'liberating':{'the':1,'egg-cells':1},'equally':{'spaced':1,'illumined':1,'well':1,'large':1,'stimulated':1,'important':1,'unwise':1,'by':1},'contending':{'theories':1},'cell-wall':{'of':1},'crossland':{'observed':1},'previously':{'unknown':1,'in':1},'primal':{'mud':1},'washington':{':':1},'due':{'to':28,'as':1},'scharff':{'r':1},'times.':{'there':1,'b-c.':1,'illustration':1,'one':1,'c-f.':1,'the':1},'additions':{'or':1},'properties--ready':{'to':1},'endeavours':{'which':1},'utility':{'the':1,'for':1},'doubtless':{'a':1,'this':1,'discover':1,'as':1,'in':1,'gets':1,'present':1},'mississippi':{'and':1},'additional':{'distance':1,'cost':1,'terms':2,'weight':1,'contact':1},'zoologist':{'in':1,'means':1},'museum':{'and':1,'natural':14,'of':3,'57':1,'after':2,'it':1},'phrases':{'as':1},'associates.':{'in':1},'noticed':{'that':4,'already':1,'in':1,'by':1,'.':1},'night--relieved':{'only':1},'daniell':{'alfred':1},'inner':{'upper':1,'life':3,'aspects':1,'stream':1,'one':1,'aspect':1,'ear':1,'or':1},'cell.':{'this':1},'reiteration':{'of':1},'crushing':{'seeds':1},'north':{'and':1,'europe':3,'from':1,'scandinavia':4,'e.g':1,'when':1,'pole':2,'pacific':1,'an':1,'to':1,'1500':1,'sea':2,'in':1,'227':1,'american':1,'america':4,'or':2},'gluten':{'albumin':1},'make-up':{'which':1},'triangular':{'piece':1},'fountains':{'of':1},'gait':{'is':1,'human':1,'but':1},'gain':{'of':1,'leisure':1,'an':1},'sprinkling':{'of':1},'highest':{'level':1,'of':2,'up':1,'reaches':1,'brilliancy':1,'octave':1,'authorities':1,'line':1,'animals--birds':1},'eat':{'it':1,'in':1},'he':{'replied':1,'discovered':1,'ceased':1,'differs':1,'had':7,'destroyed':1,'belongs':1,'constitutes':1,'has':16,'then':2,'means':1,'produced':1,'did':2,'revolutionised':1,'found':4,'went':1,'traces':1,'reduced':1,'says':3,'often':1,'declines':1,'estimated':1,'thinks':1,'puts':1,'learns':1,'wondered':1,'induces':1,'laid':1,'does':2,'got':3,'shows':1,'measures':1,'chose':1,'reacts':1,'maintains':1,'disappeared':1,'approaches':1,'interposed':1,'asks':1,'poured':1,'could':1,'became':1,'confronted':1,'asked':1,'first':2,'one':1,'likes':1,'cultivated':1,'considers':1,'passes':1,'would':2,'jerks':1,'much':1,'wrapped':1,'was':8,'knows':2,'took':3,'repeatedly':2,'worked':1,'must':1,'plants':1,'made':1,'showed':1,'believes':1,'will':1,'arranges':1,'can':5,'of':1,'plunges':1,'called':2,'and':1,'is':7,'walks':1,'thus':1,'buried':1,'allowed':1,'claimed':1,'tells':1,'said.':1,'drained':1,'began':1,'also':2,'speaks':1,'tapped':1,'concedes':1,'used':1,'may':1,'who':1,'drives':1,'accurately':1,'tries':1,'said':1,'likes--and':1,'so':1,'lays':1,'fitted':1,'once':1},'volplaning':{'of':1,'parachutists':1},'cells':{'and':2,'on':2,'kept':1,'boxed':1,'that':1,'of':4,'showing':1,'no':1,'together':1,'.':5,'marked':1,'but':1,'have':1,'which':2,';':2,'whereas':1,'are':3},'two-spined':{'sticklebacks':1},'exerts':{'a':1},'stories':{'of':1,'if':1},'pumped':{'although':1,'out':1},'eyes.':{'furthermore':1},'piece':{'of':29,'became':1},'display':{'perform':1,'of':3,'.':1,'in':1},'neanderthalensis':{'first':1},'cheek-bones':{'and':1},'universal':{'inevitableness':1,'commodity':1,'freedom':1,'acceptance':1,'or':1,'attraction':1,'carrier':1,'open':1,'ether':3},'penny':{'you':1,'in':3},'climax.':{'the':1},'lobes':{'ps':1,'l':1},'crystals':{'and':1,'of':1,'the':1,'or':1,'in':1},'education':{'and':1,'of':3,'included':1,'she':1},'draco':{'volans':2},'heat--forms':{'of':1},'forest.':{'there':1},'functions':{'of':1,'alike':1,'.':1},'apple-trees':{'of':1},'vibrations.':{'the':1},'offensive':{'persons':1},'vacuole':{'cv':1,'fv':1},'onwards':{'it':1,'.':1},'meteor':{'reached':1,'shattering':1},'chemist':{'use':1,'john':1,'was':1,'but':1},'disposing':{'of':1},'over':{'and':8,'all':3,'fifty':2,'diverse':1,'80':1,'functioning':1,'their':1,'again':5,'space':1,'two':4,'.':1,'to':4,'2':1,'8':1,'200':1,'life':1,'hundreds':1,'five':2,'a':6,'new':1,'100':1,'one':1,'11':1,'31':1,'30':1,'taut':1,'the':23,'800':1,'its':2},'star':{'and':2,'distances':1,'appeared':1,'had':3,'is':4,'corresponds':1,'cluster':1,'as':1,'registers':1,'at':2,'in':2,'sinks':1,'whose':1,'for':2,'perhaps':1,'seems':1,'due':1,'.':6,'to':2,'goes':1,'clusters':1,'which':1,'light-years':1,'means':1,'may':1,'but':1,'it':1,'revealed':1,'crosses':1,'clouds':1,'of':1,'against':1,'near':1,'following':1,'algol':1,'makes':1,'or':2},'scrutinising':{'these':1},'living':{'and':1,'flesh':1,'tissues':1,'mainly':1,'an':1,'at':2,'creatures--the':1,'images':1,'ape':1,'organisms':1,'things':2,'representatives':3,'.':2,'creatures':32,'creature':8,'body':1,'a':1,'we':1,'adaptations':1,'form':1,'fire':1,'in':5,'material':1,'hand':3,'burden':1,'to-day':1,'to-day.':1,'man':1,'plants':1,'on':4,'fossils':1,'for':1,'creatures.':1,'items':1,'microcosm':1,'anthropologists':1,'matter':9,'materials':1,'organism':1},'vega':{'34.7':1},'gradations':{'of':1,'from':1},'stag':{'and':1},'pathways':{'marked':1},'out.':{'if':1},'drainpipes':{'to':1},'dewey':{'that':1},'persistent':{'nevertheless':1,'patience':1,'experiment':1,'death-feigning':1,'grasp':1,'tendency':1},'eighties.':{'it':1},'inset':{'circle':1},'15-20':{'feet':1},'determination':{'to':1},'skimming':{'on':1},'indirectly':{'into':1,'from':1,'the':1,'hastened':1},'disruptive':{'chemical':1},'secondly':{'it':1},'saturating':{'outside':1},'psycho-analyst':{'must':1},'is--but':{'it':1},'mackerel':{'and':1},'better.':{'now':1},'dynamic':{'.':1,'systema':1},'unfurl':{'more':1},'straws':{'he':1,'were':1,'she':1,'.':2},'rampart':{'is':1},'shrinkages':{'which':1},'up.':{'the':1},'whose':{'distance':1,'luminescence':1,'skull':3,'origins':1,'point':1,'fine':1,'warm-bloodedness':1,'stinging':1,'atoms':1,'instrumental':1,'motions':1,'webbed':1,'movements':1,'type':1,'gravitational':1,'mental':1},'gamut':{'between':1},'calculate':{'how':1,'the':1,'your':1,'that':1},'swam':{'close':1,'instinctively':1},'auk':{'were':1},'berridge':{'f.z.s.':8},'bragg':{'247':1,'one':1,'says':1,'that':1},'miall':{'l':1},'presents':{'a':1,'the':1},'fine-grained':{'lithographic':1},'investigation':{'shows':1,'.':1},'vocabulary--he':{'has':1},'teaching':{'very':1},'bird--too':{'far':1},'descendant--the':{'modern':1},'updated':{'editions':1},'hind-limb':{'of':1},'counted.':{'but':1,'in':1},'void':{'the':1,'.':1},'cockchafers':{'are':1},'vase':{'which':1},'thinopus':{'the':1},'smack':{'of':2,'their':1},'asia.':{'man':1},'nourished':{'from':1},'govern':{'what':1},'radio-active':{'substance':1,'substances':3,'.':1,'matter':1,'elements':4,'or':1,'bodies':2},'affect':{'a':2,'our':1,'the':5,'your':1},'vast':{'and':1,'stores':2,'reservoir':1,'disturbances':1,'process':1,'energy':1,'as':1,'numbers':1,'crowd':1,'masses':1,'regions':1,'majority':1,'figures':1,'structures':1,'vegetation':1,'whirlpool':1,'medium':1,'that':2,'new':1,'population':1,'streams':1,'changes':1},'transformed.':{'before':1},'kataleptic':{'state':1},'baking':{'qualities':1},'naturalist':{'louis':1,'of':1},'crops':{'with':1},'conductor--six':{'times':1},'present.':{'the':1},'herbert':{'spencer':1},'indefinitely':{'.':1,'in':1},'danger-signal':{'sounds':1},'1859.':{'heritable':1},'greenish':{'plants':1,'warty':1,'phosphorescence':1},'employees':{'expend':1,'are':1},'breast-bone':{';':1,'has':1,'it':1,'.':1},'clothes':{'it':1},'favoured':{'the':1,'speculation':1},'carnivore':{'by':1},'force':{'and':2,'them':1,'proceed':1,'developed':1,'between':1,'due':1,'but':1,'equal':1,'at':1,'which':1,'of':3,'.':2},'senescence':{'but':1},'concise':{'view':1},'dome-like':{'and':1},'japanese':{'deep-sea':2,'variety':1},'current--the':{'dynamo--magnetism--ether':1},'intelligible.':{'sec':1},'hundredfold':{'in':1},'cactus':{'and':1},'even':{'thinner':1,'learning':1,'ten':2,'less':1,'it':1,'an':1,'as':1,'planetoids':1,'through':1,'at':5,'picked':1,'in':9,'before':1,'cut':1,'wholesome':1,'for':1,'make':1,'when':7,'gases':1,'by':1,'to':4,'then':1,'routine':1,'if':6,'more':6,'picture':1,'his':1,'greater':1,'though':1,'after':1,'suffused':1,'rise':1,'although':1,'suck':1,'with':2,'than':1,'conspicuous':1,'hints':1,'a':8,'on':1,'several':1,'liquid':1,'these':2,'of':4,'proud':1,'against':1,'this':1,'without':1,'vaster':1,'the':17,'calculates':1},'unborn':{'young.':1,'reptile':1,'child':1,'offspring':1,'.':1},'asia':{'and':2,'that':1,'is':1,'africa':1,'.':2,'in':1,'was':1,'minor':1},'liberated':{'and':2,'on':1,'from':3,'eggs':1,'when':1,'were':1},'haze':{'and':1},'rest.':{'illustration':1},'reverently':{'and':1},'dr.':{'schoetensack':1,'cyril':1,'romanes':1},'new':{'corner':1,'ebooks.':1,'knowledge':4,'forms':1,'surroundings':1,'physics--the':1,'world.':1,'associations':1,'views':1,'food':1,'revelations':1,'ones':1,'world':2,'devices.':1,'worlds':1,'corners':1,'freedom.':1,'parasite':1,'possibilities':1,'microscope':1,'habits':2,'view':5,'body':1,'domain':1,'methods':1,'habitat':1,'generation':2,'parasites':1,'individualities':1,'home':1,'ebooks':1,'psychology':1,'habits--experiments':1,'competitions':1,'method':1,'discovery':1,'rhodesian':1,'theory':1,'leg':1,'joy':1,'objects':1,'york':11,'linkage':1,'computers':1,'haunts':1,'kingdoms':1,'72-inch':1,'factor.':1,'kinds':1,'or':1,'departures':10,'one':2,'use':1,'nebulae':1,'area':1,'.':2,'territories':1,'card':1,'interest':1,'suit':1,'shell':1,'clue':1,'zealand.':1,'lives':2,'kind':1,'conception':3,'star.':1,'variations':2,'devices':2,'state--':1,'cards':1,'property':2,'and':2,'permutations':1,'discoveries.':1,'sense':1,'flora.':1,'rays':1,'variety':2,'views--the':1,'feature':1,'inquiry':1,'gateways':1,'doors':1,'development':1,'elements':1,'star':1,'opportunity':1,'zealand':2,'modes':1,'light':2,'departure':2,'element':1,'materials':1,'physics':1},'net':{'detaches':1,'result':1},'ever':{'because':1,'tap':1,'show':1,'within':1,'discover':1,'in':1,'seen':2,'matures':1,'imminent':1,'been':1,'.':2,'take':1,'be':1,'life':1,'lived':1,'devised':1,'thrown':1,'perceived':1,'made':1,'rescued':1,'resolving':1,'rose':1,'passing':1,'arising':1,'could':1,'comes':1,'realised':1},'evolving':{'and':1,'brain':1,'set':1,'system':1,'on':1},'muzzle':{'region':1},'seventh':{'printing':1},'never':{'even':1,'nearer':1,'absent':1,'like':1,'ceases':1,'less':1,'becomes':2,'getting':1,'see':1,'been':1,'germinates':1,'completely':1,'understand':1,'showed':1,'mixing':1,'learned':1,'more':1,'focussed':1,'at':1},'drew':{'this':1,'the':1},'anthropology':{'will':1,'home':1,'and':1,'.':1},'met':{'the':1,'with':2,'by':1,'in':2},'108':{'600':1},'active':{'development':1,'and':1,'life':1,'links':2,'for':1,'cuttles':1,'protozoa':1,'strenuous':1,'cooperative':1,'in':1,'deep-sea':1,'the':1,'swimmers':1,'nor':1},'100':{'tons.':1,'miles':1,'000':9,'after':1},'cardboard':{'and':1,'we':1,'were':1},'interpret':{'as':1,'except':1},'contraction':{'process':1,'of':1,'is':1,'and':1},'dry':{'land':27,'land--the':1,'season':1,'work':1,'air':10,'land.':2,'branch':1,'pasture':1,'ground':3,'was':1,'air--by':1,'after':1},'plates':{'hanging':1,'form':1,'exposed':1},'-reptile':{'embryo':1},'buckled':{'up':1},'rests':{'and':1,'on':2},'light.':{'we':1,'no':1,'all':1,'illustration':1,'it':1,'now':1},'credit':{'of':3,'the':3,'amphibians':1,'card':1,'man':1},'permit':{'of':1,'all':1},'california':{'is':1,'has':1,'.':1},'adopting':{'this':1},'suitable':{'site':1},'fell':{'on':1,'near':2},'eyebrows':{'of':1},'growth.':{'under':1},'mobility':{'very':1},'mail.':{'the':1},'war.':{'the':1,'illustration':1},'peahen':{'stag':1},'god-like':{'intellect':2},'protozoa.':{'the':1},'counts':{'we':1,'rarely':1,'for':1},'lung.':{'it':1},'circumvent':{'the':1},'tertiary':{'strata':1,'times.':1,'era':1},'head-on':{'fashion':1},'is--substitutes':{'for':1},'duck-billed':{'platypus':3},'wingless.':{'it':1},'invaders':{'of':1},'dog-toothed':{'cynodonts':1},'duesseldorf.':{'according':1},'stinging-cells':{'the':1},'overhead':{'at':1,'means':1},'calm':{'and':1,'of':1,'unbroken':1},'cassowary':{'201':1,'its':1},'water-spider':{'argyroneta':1,'the':1,'conquering':1},'right.':{'illustration':1},'type':{'is':1,'reaches':1,'say':1,'have':1,'in':2,'should':1,'relatively':1,'from':1,'for':1,'.':2,'intermediate':1,'rich':1,'has':2,'was':1,'we':1,'but':1,'marked':1,'known':1,'such':1,'with':1,'must':1,'off':1,'like':1,'of':9,'equal':1,'makes':1,'finds':1},'tell':{'all':1,'for':1,'us':6,'at':1,'the':4,'where':1},'gorilla.':{'activity':1},'peeping':{'above':1,'out':1},'lungs':{'a':2,'as':1,'where':1,'but':1,'.':1},'wary':{'trout':1},'oscar':{'riddle':1},'expose':{'the':1},'under':{'a':2,'stones':1,'different':1,'his':1,'her':2,'this':3,'surface':2,'side':1,'water':2,'parts':1,'stimulation--giving':1,'our':2,'the':15,'its':1},'dogma':{'of':1},'warm':{'countries':1,'moist':1,'volcanic':1,'shallows':1},'bipedal':{'dinosaur':1,'progression--always':1,'erect':1},'spawning-pond':{'from':1},'ward':{'f.e.s.':20,'.':1},'latent':{'indefinitely':1,'life':1,'state':1},'flora':{'and':1,';':1,'as':1,'which':1},'room':{'and':1,'we':1,'for':1,'in':1},'civilisations':{'and':1,'of':1},'suggestive':{'fact':2},'guise':{'of':1,'would':1},'root':{'and':2},'humerus':{'or':1},'allantois':{'is':1,'persist':1},'squirting':{'jets':1},'give':{'and':1,'just':1,'certain':1,'modern':1,'it':2,'an':1,'in':1,'out':1,'her':3,'six':1,'definite':1,'to':1,'way':1,'you':1,'more':1,'notice':1,'very':1,'rise':8,'them':1,'such':1,'a':4,'off':2,'prominence':1,'up':2,'us':3,'way.':1,'the':7,'utterance':1},'climax':{'and':1,'among':1,'of':3,'in':5},'involve':{'any':1},'fizzing':{'about':1},'down-stream.':{'1':1},'advancing':{'slope':1,'dog':1,'troop':1},'masterly':{'skill':1,'book':1},'halobatidae':{'wingless':1},'january':{'30':1,'21':1,'22':1,'6':1},'shell-shock':{'is':1},'coral-snakes':{'cobras':1},'faults':{'he':1},'amazing':{'particles':1,'quantities':1},'messrs':{'.':3},'answer':{'even':2,'and':1,'them':1,'forecloses':1,'that':1,'follows':1,'is':7,'back':2,'.':1,'to':4,'first':1,'opens':1,'must':2},'willing--has':{'come':1},'blanket':{'of':2},'minority':{'have':1,'give':1},'undergoing':{'disintegration':2,'disintegration--and':1,'radical':1},'reconciled':{'.':1},'abdomen':{'beneath':1},'food.':{'illustration':1},'long-continued':{'structure':1},'curiosity':{'and':1,'are':1,'its':1},'mud-minnows':{'did':1},'amoeboid':{'cells':4,'line':1},'overtaken':{'.':1},'still;':{'but':1},'descends':{'again':1},'think':{'to':1,'for':1,'that':12,'of':19,'less':1,'.':2,'also':1,'they':2,'clearly':1},'still.':{'and':1},'maintain':{'a':1,'the':1,'that':2},'frequent':{'meals.':1,'paddling':1,'changefulness':1,'occurrence':1,'exhibition':1},'1872':{'charles':1},'carbonic':{'acid':2},'inhabitant':{'of':1},'overtakes':{'it':1},'operations':{'on':1},'fife':{'started':1,'which':1,'in':1},'enter':{'suddenly':1,'our':1,'into':2,'the':2,'deeply':1},'sheltering':{'blanket':1,'is':1},'co-operating':{'with':2},'murray':{'sir':2,'called':1,'.':2},'helena':{'the':1},'hibernation':{'.':1},'down.':{'some':1,'however':1,'illustration':1},'budding':{'or':1,'.':2},'copyright':{'status':1,'royalties':1,'notice':1,'agreement':1,'research':1,'1922':1,'in':2,'holder':4,'or':1,'laws':2},'partisans':{'at':1},'famille':{'lieu':1},'before':{'the':13,'they':5,'it':4,'an':1,'birth.':1,'betraying':1,'our':3,'birds':1,'that.':1,'proceeding':1,'matter':1,'with':1,'there':7,'.':3,'anyone':1,'their':1,'reptiles':1,'you':2,'man':1,'was':1,'we':2,'downloading':1,'reaching':1,'mammals':1,'birth':3,'amphibians':1,'water':1,'heat':1,'them':1,'but':1,'hatching':2,'true':1,'him':1,'he':1,'anything':1,'i':1,'this':1,'she':1,'passing':2,'or':3},'10.5':{'regulus':1},'gyges':{'ring':1},'crew':{'of':1},'better':{'case':1,'by':1,'still;':1,'brains':2,'is':1,'than':1,'forms':1,'to':2,'brain':1,'insertion':2,'teeth':1,'method':1,'or':1,'heel':1},'differently':{'from':1},'persist':{'not':1,'there':1,'when':1},'weeks':{'old':2,'perhaps':1,'removing':1,'when':1,'of':1,'or':1},'overcome':{'the':3,'in':1},'donors':{'in':1},'23.--star':{'cluster':1},'disintegration--and':{'the':1},'swim-bladder':{'of':1,'into':1,'which':1},'combination':{'of':3,'which':1},'within.':{'but':1},'strangest':{'of':1},'caterpillar':{'and':1,'on':1,'.':1},'weaponless':{'animal':1},'indulge':{'for':1},'bluish':{'colour':1},'secured.':{'there':1},'bony':{'fish':3,'collar':1,'flat-fishes':1},'meat':{'and':1,'darted':1},'brightness':{'in':1},'indivisible.':{'the':1},'fogs':{'were':1},'arrested':{'defective':1,'.':1},'proofreading':{'team':2},'mounts':{'guard':3},'went':{'before':1,'on':4,'towards':2,'through':1,'out':1},'meal':{'.':1},'bone':{'and':1,'for':2,'of':1,'u':1,'which':1,'in':1,'the':1,'muscle':1},'mean':{'and':1,'distance':1,'great':1,'save':1,'that':7,'stagnation':1,'one':1,'1':1,'to':1,'so':1,'not':1,'the':1,'.':1,'by':3},'telescope.':{'illustration:':1,'but':1},'afforded':{'the':1,'much':1,'by':3},'problems.':{'sec':1},'successively':{'worked':1},'suspended':{'particles':2,'at':1,'for':1,'in':1},'conifer':{'and':1},'principles':{'employed':1,'of':2},'hive-bees':{'italians':1},'taught':{'to':2,'two':1,'us':1,'that':2},'wave-lengths':{'.':3,'that':1},'first-class':{'sensory':1,'cereal':1},'extract':{'from':1},'conspicuous.':{'at':1},'conjectures':{'which':1},'superposing':{'a':1},'restricted':{'to':2,'that':1,'.':1},'content':{'even':1,'to':2,'ourselves':1,'for':1},'sparkle':{'in':1},'cave-man':{'may':1},'is.':{'energy':1,'let':1},'reader':{'a':1,'who':1,'may':1,'imagines':1,'an':1,'will':1,'to':1},'surprise':{'none':1},'sluggish':{'fishes':1,'turtle':1,'the':1,'animals':1,'creatures':1},'langur':{'monkeys':1},'turning':{'upon':1,'off':1,'the':1,'every':1,'up':1},'meridian.':{'the':1},'hangers-on':{'and':1},'wave-length.':{'deep-red':1},'ascending':{'the':1},'skin.':{'but':1},'246':{'photo':2},'240':{'white':1},'243':{'the':1},'telescopes':{'begins':1,'and':1,'smaller':1,'for':1,'of':2,'.':1,'at':1},'shaggy':{'hair':1},'began.':{'archaeozoic':1,'ordovician':1},'starts':{'as':1,'.':1},'messages':{'from':1,'.':3},'thus':{'diverts':1,'set':1,'just':1,'produces':1,'certain':1,'some':1,'it':4,'separated':1,'as':2,'at':2,'sir':1,'from':2,'appear':1,'securing':2,'no':2,'began':1,'there':5,'uranium':2,'two':1,'been':1,'to':1,'helps':1,'molecules':1,'volvox':1,'we':12,'arises':1,'form':1,'again':1,'becomes':1,'formed':1,'possible':1,'completely':1,'although':1,'fishes':1,'flowers':1,'producing':2,'a':1,'animals':1,'driving':1,'this':1,'professor':2,'shunted':1,'ascertain':1,'the':12,'spiders':1},'isn':{'t':1},'survive--although':{'they':1},'arrived':{'at':3},'cave-lion':{'and':1,'cave-hyaena':1},'loud':{'noises':1},'user':{'provide':1,'to':1,'who':1},'untutored':{'bird':1},'features':{'and':1,'of':3,'there':1,'but':1,'so':1,'which':1,'such':1,';':1},'grade':{'bring':1},'unlit':{'lamp':1},'peculiarity':{'of':1},'disappearing':{'a':1},'enumerate':{'the':1},'radiate':{'away':1,'long':1,'out':1},'immensely':{'large':1,'larger':1,'greater':1,'faster':1},'ditch':{'or':1,'.':1},'hood':{'is':1,'spread':1,'called':1,'or':1},'monotonous':{'world':1,'green':1},'anyone':{'providing':1,'may':1,'.':1,'anywhere':2,'can':2,'in':1,'else':1},'pelagic':{'plants':1,'life':1,'bird':2,'haunt':1,'area':1},'84116':{'801':1},'shiver':{'.':1},'periwinkle':{'or':1},'witnessing':{'the':1},'dwell':{'too':1},'growth':{'and':1,'of':6},'fiery':{'tongues':1,'vapour.':1,'fate':1,'journey':1,'eruptions':1,'outbreak':1},'radiation':{'and':1,'from':2,'of':2,'.':1,'cannot':1,'in':1},'ages--the':{'procession':1},'feathers':{'of':2,'proving':1,'.':1,'are':2,'have':1,'91':1,'the':1,'or':1},'pre-material':{'world':1},'floor.':{'jasper':1},'digs':{'away':1},'glumes':{'or':1},'somewhat':{'like':2,'suddenly':1,'of':1,'as':1,'higher':1,'in':1,'simpler':1,'difficult':2},'feature.':{'some':1},'conger-eels':{'and':1},'brazil.':{'the':1},'peculiar':{'and':1,'people':2,'physiological':1,'characteristics':1,'interest':2,'bones':1,'cases':1,'circumstances':1},'begins':{'on':1,'his':1,'.':1,'to':2,'as':1,'at':1,'in':1},'distance':{'a':1,'and':3,'towards':1,'from':8,'that':1,'of':13,'is':2,'in':2,'thus':1,'period':1,'.':5,'varies':1,'between':1,'it':2,'plays':1,'the':3,'once':1,'was':1,'away':1,'more':1},'creatures.':{'we':1,'the':1,'illustration':2},'dredge':{'has':1},'structures':{'and':5,'reveal':1,'inherited':1,'are':1,'tend':1},'regularised':{'and':1},'sea-serpents':{'terrestrial':1},'preparation':{'for':2},'matter':{'and':16,'chlorophyll':1,'says':1,'exists':1,'is':14,'it':1,'four':1,'as':2,'itself':1,'exist':1,'are':7,'have':3,'in':7,'consists':2,'throughout':1,'ether':2,'254':1,'if':1,'cannot':1,'from':2,'there':2,'.':18,'contained':1,'therefore':1,'which':7,'flowing':1,';':1,'really':1,'was':3,'into':2,'passed':1,'energy':1,'that':4,'may':1,'than':1,'of':10,'however':2,'but':2,'quite':1,'were':2,'cutting':1,'moving':1,'here':1,'itself.':3,'not':1,'end':1,'along':3,'by':1,'a':1,'on':1,':':2,'this':1,'ever':1,'attracts':1,'required':1,'up':1,'agoing.':1,'or':2,'trillions':1,'so':1,'can':1,'contain':1,'through':1,'the':2,'out':1,'reduced':1},'messengers':{'regulate':1,'from':1,'are':1,'which':2,'more':1},'silly':{'ants':1},'shore-waters':{'to':1},'hailstones':{'on':1},'enables':{'the':2,'them':1,'us':3,'it':1},'extracting':{'the':1},'chrysalis':{'probably':1},'recommence':{'when':1},'membranes':{'the':1,'vocal':1},'modern':{'mathematical':1,'researches':1,'mammals':1,'brain...':1,'times.':1,'comparative':1,'times':2,'birds':2,'size':1,'horse':4,'representatives':1,'philosopher':1,'spectroscopist':1,'astronomers':1,'investigation':1,'physicists':1,'instruments':1,'flowering':1,'type':5,'divers':1,'tree-shrews':1,'civilisation--coal':1,'life':1,'theory':2,'brains':1,'line':1,'giant':1,'direct-reading':2,'physicist':1,'binoculars':1,'world':1,'estimate':1,'astronomy':6,'telescopes':1,'man':10,'advance':1,'observatory':1,'language':1,'species.':1,'science':8,'industry':1,'science.':1,'diffraction':1,'british':1,'theories':1,'bird':3,'man.':1,'dynamo':1,'representation':1,'history':1,'physics':1,'view':1},'mind':{'and':3,'among':1,'is':3,'at':1,'in':6,'seemed':1,'from':1,'for':1,'.':12,'which':1,'has':4,'we':4,'205':1,'that':3,'cannot':1,'let':1,'the':2,'a':1,':':1,'of':15,'craves':1,'can':1,'entirely':1,'out':1},'eyes':{'and':4,'the':1,'of':5,'could':1,'.':5,'to':1,'are':3,'become':1,'protrude':1,';':1,'themselves':1,'having':1},'rigorous':{'boundary':1},'seed':{'being':1,'was':1,'for':1},'nervures':{'on':1},'seen':{'among':1,'emerging':1,'sometimes':1,'gripping':1,'just':1,'is':2,'an':1,'as':1,'full':1,'through':1,'at':4,'another':1,'in':15,'shooting':1,'its':1,'even':1,'what':2,'from':1,'for':2,'to':5,'giving':1,'when':2,'.':5,'how':1,'enough':1,'under':1,'energy':1,'we':1,'towards':1,'that':5,'edge-on':2,'but':1,'quite':1,'boys':1,'every':1,'entangled':1,'by':2,'a':1,'on':5,'washing':1,'driving':1,'of':1,'later':1,'making':1,'the':3,'or':1,'are':1},'seem':{'strangely':1,'do':1,'we':1,'for':1,'always':1,'bound':1,'early':1,'to':18,'bad':1,'does':1,'in':1},'grind':{'a':1},'seek':{'to':1,'any':1,'out':1},'tells':{'and':1,'of':2,'its':1,'us':6},'starfish':{'is':1,'sea-lilies':1,'acorn-shell':1,'which':2,'with':1,'called':1,'asterias':2},'point.':{'and':1},'chest':{'and':1,'.':1},'chess':{'with':1},'blotched':{'by':1},'permian':{'light':1,'period':3,'ice':2,'.':1,'reptiles':1,'the':1,'was':1},'established':{'on':1,'all':1,'may':1,'is':1,'between':1,'an':1,'.':2,'in':3,'themselves':1,'one':1,'by':2,'fact':1},'changefulness':{'and':1,'of':2,'rather':1},'vermiform':{'appendix':2},'regular':{'flux':1,'relation':1,'orbit':1,'movement':1},'meaning':{'of':10,'the':2,'.':1,'an':1},'see.':{'as':1,'that':1},'promising.':{'illustration':1},'refractor':{'and':1,'is':3,'measures':1,'the':1,'48':1},'zealand':{'is':1,'which':1},'broadcast':{'in':1},'observation':{'and':1,'on':1,'by':1,'that':1,'.':1,'or':1},'consumed':{'and':1},'deliberate':{'introductions':1},'m':{'and':1,'.':1},'dog':{'scouring':1,'and':4,'shown':1,'turning':1,'that':2,'of':2,'professor':1,'or':2,'as':1,'carrying':1,'at':1,'a':1,'in':1,'van':1,'the':1,'has':3,';':1},'breathes':{'dry':1,'by':1},'definitely':{'formulated':1,'proved':1,'begun':1,'that':2,'free':1,'guiding':1,'the':1},'principle':{'we':1,'of':2,'is':1,'can':1,'which':2,'applies':1,';':1},'molluscs':{'and':1,'.':1,'are':1,'ascidians':1,'in':1},'dover':{'and':1},'planetary':{'system.':1,'families':2,'nucleus':1},'aquatic':{'ancestors':1,'animals':1,'insects':1,'surinam':1,'ancestry':2,'locomotion':2},'rayleigh':{'stated':1},'visitor':{'gave':1},'probe':{'for':1},'skin-wing':{'a':1},'ending':{'in':1},'brilliancy':{'.':1},'attempts':{'to':4,'made':1,'at':1,'have':1},'fungas':{'spots':1},'counteractive':{'measures':1},'creature--far':{'from':1},'ear.':{'illustration':2},'representing':{'nude':1,'one':1},'explain':{'what':1,'presently':1,'for':1,'this':3,'how':1,'the':6,'why':1},'folded':{'in':1},'sugar':{'fats':1,'.':1},'judged':{'as':1,'from':1,'by':1},'above':{'and':1,'distances':1,'all':1,'is':1,'seven':2,'our':1,'scale':1,'shrinkage':1,'six':1,'them':1,'illustration':2,'it':1,'diagram':1,'five':1,'with':1,'boiling-point':1,'sea-level':1,'a':1,'illustration.':1,'these':1,'pictorial':1,'them.':1,'the':12},'compounded':{'of':2,'so':1},'indicus':{'--are':1},'morsel':{'of':1},'chromosphere':{'great':1,'extends':1,'are':1,'.':1},'stop':{'and':1,'vii':1,'when':1,'but':1,'at':1,'the':2},'perceive':{'a':1,'their':1},'coast':{'of':1},'12':{'is':1,'000':2,'what':1},'energy--what':{'a':1,'heat':1},'21.--typical':{'spectra':1},'ignoble':{'creatures':1},'comply':{'with':5,'either':1},'bat':{'the':1,'flying':1,'s':1,'shares':1},'bar':{'of':1,'.':1},'17':{'origin':1,'1905':2},'room--pour':{'molecules':1},'fields':{'.':1},'bay':{'and':1,'of':1},'bag':{'of':1,'containing':1},'microscope':{'behaving':1,'these':1,'which':1},'discs':{'of':1,'that':1,'.':1},'troop':{'of':1,'masked':1},'18':{'photo':1,'solar':1},'fertility':{'and':1,'in':1},'upwards':{'and':3,'of':2,'from':1,'that':1},'ears':{'and':2,'of':2,'.':1},'ethical':{'face':1},'head-brains':{'the':1},'reference':{'to':1,'has':1,'in':1},'testing':{'probing':1,'all':2},'alterations':{'would':1,'in':1},'tag--but':{'larger':1},'zones':{'of':1,'each':1},'decided':{'to':1,'that':1},'interruptions':{'of':1},'subject':{'and':1,'we':1,'of':2,'is':2,'here':1,'to':4,'as':1,'deeply':1},'pebbles':{'gripped':1,'.':1},'voyage':{'found':1,'darwin':1},'said':{'and':1,'is':1,'some':1,'in':1,'what':2,'for':2,'there':2,'long':1,'.':1,'to':9,'enough':1,':':1,'that':19,'but':1,'a':1,'about':1,'like':1,'of':2,'later':1,'so':1,'the':4,'consisted':1},'scrap':{'from':1},'sail':{'or':1,'in':1},'artificial':{'floor':1,'light':2,'fogs':1,'light.':1,'surroundings':1,'item':1,'transmutation':1},'pets':{'of':1},'simplest':{'forms':2,'animals':1,'form':2,'of':2,'possible':1,'multicellular':1,'bacteria':1,'creatures':1},'unsolved.':{'the':1},'sorts':{'and':1,'of':4,'occupations':1,'out':2},'polygamous':{'.':1},'lethargic':{'state':1},'profitable':{'to':3,'movements':1,'habit':2,'one':1},'cleverer':{'mammals':1,'animals':1,'than':1},'venture':{'out':1},'mountain-top-like':{'cusps':1},'physicist':{'and':1,'set':1,'brings':1,'.':1,'to':1,'has':1},'harvard':{'college':4},'386':{'times':1},'cousin':{'to':1},'motto':{'in':1},'suggested':{'genealogical':2,'this':1,'that':6,'however':1,'.':1,'to':1,'at':1,'another':1,'in':2,'by':2},'air--a':{'globule':1},'sperm-producer':{'and':2},'canines':{'and':1},'against':{'a':5,'downward-projecting':1,'branches':1,'her':1,'instability':1,'these':1,'certain':1,'it':1,'evaporation':1,'their':1,'intensities':1,'of':1,'accepting':1,'the':17,'one':2},'feathering':{'of':1},'puffin':{'s':2},'1.--diagrams':{'of':1},'distinction':{'of':1,'has':1,'so':1},'confronted':{'his':1},'simplified.':{'we':1},'fore-leg':{'of':1,'has':1},'appeared':{'suddenly':1,'upon':1,'related':1,'.':2,'to':1,'in':1,'inconceivable':1,'or':1},'repertory':{'of':5},'buries':{'itself':1},'incessant':{'colliding':1,'movement':2},'inquisitive':{'insects':1,'adults':1,'interest':1},'purling':{'brook':1},'lick':{'observatory.':4},'initiative':{';':1,'so':1},'lowly':{'forms':1,'origin.':2},'ether':{'and':11,'because':1,'exists':1,'disturbances':1,'is':2,'surrounding':1,'as':1,'are':1,'carry':1,'if':1,'permeates':1,'what':1,'disturbance':4,'.':8,'2':1,'which':1,'flowing':1,';':3,'has':2,'was':2,'then':1,'may':1,'but':2,'waves':2,'he':1,'by':2,'must':1,'of':2,'carries':1,'light':1,'or':1},'now.':{'the':1},'recognises':{'the':1},'puts':{'a':1,'the':1,'his':1,'forth':1,'it':2},'basis':{'of':5,'for':5,'but':1},'ramifying':{'system':1},'three':{'and':3,'cautions':1,'letters':1,'reasons':1,'arms':2,'feet':2,'in':2,'females':1,'species':1,'centuries':1,'different':1,'or':3,'dimensions':3,'distinct':2,'fingers':1,'to':3,'wonderful':1,'weeks':3,'hundred':3,'conditions':1,'lowest':1,'aspects':1,'complete':1,'inches':2,'thousand':3,'great':4,'atoms':1,'hours':1,'semicircular':1,'pairs':1,'months':2,'times':5,'chief':1,'miles':1,'fundamental':1,'quarter':1,'other':1},'erect':{'posture':1,'after':1,'lines':1,'attitude':2,'the':1,'he':1,'consisted':1},'milieu':{'.':1},'chrysanthemum':{'of':1},'trigger':{'of':4,'is':1,'which':1,'.':1},'interest':{'and':2,':':1,'for':3,'that':2,'of':2,'is':1,'us':1,'.':4,'to':3,'are':1,'in':5,'increasing':1,'was':1,'or':1},'entered':{'our':1,'into':2,'upon':1,'so':1,'on':1},'chaffinch':{'disguise':1},'threw':{'in':1},'light-year':{'is':1},'deeper':{'down':1,'and':1,'waters':1,'hollows':1},'quantities':{'not':1,'of':2,'pour':1,'destined':1},'sunshine':{'then':1,'of':1},'cold--an':{'eternal':1},'meadow-grass':{'before':1},'locations':{'where':1,'.':1},'168':{'profile':1},'164':{'suggested':1,'the':1},'165':{'the':1},'166':{'photo':2},'167':{'photo':1},'160':{'professor':1,'000':1,'tons':1},'161':{'photo':1,'after':1},'encyclopaedia':{'giving':1},'ether.':{'waves':1},'exception':{'and':1,'of':1},'were--the':{'working':1},'tank':{'of':1},'winding':{'in':1},'originate':{'and':1,'is':1},'spontaneously':{'and':1,'become':1,'or':1,'liberated':1,'becomes':1},'horse-power':{'in':1},'near':{'them':1,'that':2,'scarborough':2,'duesseldorf.':1,'victoria':1,'relative':1,'its':1,'shore':1,'at':2,'enough':2,'the':18,'with':1,'heidelberg':3,'as':2},'neat':{'way':1},'aeroplane':{'s':1,'in':1},'balance':{'of':1,';':1,'used':1,'between':1,'.':2},'study':{'and':1,'rabbits':1,'in':1,'of':12,'under':1,'mammals':1,'.':1,'which':1,'leading':1},'twenty-four':{'hours':2},'spawn':{'and':1,'only':1,'in':4,'.':3},'longer.':{'illustrations':1},'seven':{'hours':2,'different':1,'rays':1,'neck':1,'inches':1,'months':1,'two':1,'colours':5,'other':1,'planets':1,'stages':2},'thought.':{'sec':1,'yet':1},'mexico':{'to':1,'by':1},'diaphragm':{'came':1},'is':{'all':4,'evidence':5,'believed':3,'caused':2,'comparatively':2,'four':1,'remarkably':1,'abundant':2,'looking':1,'certainly':5,'inverse':1,'electricity':2,'concerned':2,'young':2,'to':52,'thinnest':1,'preserved':1,'inconspicuous':1,'worth':2,'tethered':1,'worse':1,'outside':1,'very':48,'indubitable':1,'radio-active':1,'vastly':1,'continued':1,'illustrated':1,'asexual':1,'probably':7,'woven':1,'familiarly':1,'smaller':1,'insignificant':1,'overlying--the':1,'past':1,'likely':1,'utter':1,'estimated':1,'situated':2,'shining':1,'even':2,'established':1,'what':7,'necessary.':1,'comparable':1,'beaten':1,'contributed':1,'expressed':1,'liberated':1,'above':1,'shared':2,'falling':1,'ever':1,'melancholy':1,'never':5,'leaping':1,'desired':1,'learnedly':1,'represented':5,'obtained':1,'great':5,'commonly':1,'descended':1,'usually':3,'conveniently':1,'composed':6,'love':1,'suddenly':1,'merely':1,'explained':2,'apt':3,'highly':10,'brought':4,'rarely':2,'from':4,'would':1,'superficially':1,'two':1,'doubt':1,'therefore':1,'taken':1,'unthinkable':1,'lessened':2,'more':23,'rich':1,'started':1,'pursuing':1,'one-sided':1,'suffused':1,'varying':1,'known':11,'given':4,'carried':2,'locked':1,'room':1,'this':6,'moulted':1,'itself':1,'obvious':1,'can':1,'growing':1,'making':2,'stimulating':1,'proof':2,'nearest':2,'bent':1,'pushed':2,'something':2,'wonderful':2,'struck.':1,'huge':1,'rather':4,'divided':1,'breaking':1,'fortunate':1,'1':1,'located':2,'instead':1,'left--to':1,'maternal':1,'intended':1,'inconceivably':1,'derived':2,'movable':1,'disgusted':1,'eighty-eight':1,'coming':1,'such':4,'horizontal':1,'inconceivable':1,'revealed':1,'a':196,'short':1,'natural':3,'effective':1,'yielding':1,'fortunately':1,'so':21,'pulled':4,'secured':1,'justifiable':2,'unpalatable':1,'indeed':1,'mainly':3,'discharging':1,'produced':3,'held':1,'through':3,'committed':1,'still':9,'its':5,'admirably':1,'superior':1,'26':1,'how':2,'susceptible':1,'interesting':14,'actually':1,'better':2,'covered':1,'travelling':2,'admirable':1,'easier':3,'then':4,'popularly':1,'affected':1,'greater':2,'thereby':1,'food':1,'safe':4,'wise':1,'not':79,'now':18,'always':7,'reasonably':1,'tenanted':1,'arrested':1,'establishing':1,'transmitted':1,'reasonable':1,'radial':1,'found':6,'entirely':4,'physiologically':1,'afforded':3,'doing':1,'there':10,'crushing':1,'related':2,'our':3,'beyond':5,'thick':2,'really':4,'living':1,'shown':5,'surrounded':3,'content':1,'contained':1,'denoted':1,'revolving':1,'twenty-five':1,'borne':2,'disputed':2,'built.':1,'incalculable':1,'quite':10,'reason':3,'surely':2,'struggle':2,'intensely':1,'thrown':1,'enormous':1,'organic':1,'keen':2,'disturbed':2,'moving':5,'assuredly':1,'most...':1,'first':1,'complete.':1,'constantly':4,'blown':1,'synonymous':1,'reflected':6,'one':23,'well-known':1,'done':1,'sunlight':1,'another':13,'impossible':8,'immensely':1,'discharged':1,'bitten':1,'little':3,'necessarily':2,'needed':1,'unknown':2,'their':2,'2':1,'too':3,'passed':1,'molecular':1,'vigorous':1,'that':76,'relieved':2,'continuous':2,'wisdom':1,'wasted':2,'prodigious':1,'undoubtedly':2,'flightless':1,'16':1,'divisible':1,'double':1,'enabled':2,'slowed':1,'866':1,'matter':2,'supposed':5,'historical':1,'accessed':1,'and':2,'unrestricted.':1,'gathering':2,'lightly':1,'turned':2,'vitally':1,'unlikely':2,'cleaned':1,'imperfect':2,'obviously':3,'apparently':1,'any':3,'relatively':1,'forced':1,'built':2,'efficient':1,'thoroughly':1,'able':5,'snow':1,'also':18,'trying--the':1,'absorbed':2,'embryological':1,'sure':1,'diminishing':1,'-273':1,'most':5,'connected':1,'printed':1,'nothing':7,'alpha':1,'measured':1,'conspicuous':2,'considered':1,'calculated':1,'sometimes':8,'repeated':1,'dissolved':1,'accounted':1,'normally':1,'lying':1,'precise':1,'particularly':2,'supported':1,'scattered':1,'discovered':2,'scarce':2,'enormously':2,'nearer':1,'founded.':1,'shuffling':1,'with':2,'excessively':1,'enough':6,'unhappy':1,'only':19,'going':7,'touched':1,'molecules':1,'regrowing':2,'adequate':1,'evinced':1,'meant':5,'compounded':2,'exceptional':1,'dependent':1,'familiar':2,'famous':3,'unimportant':1,'123':1,'nearly':1,'closely':5,'drawn':2,'instinctive':2,'dr':1,'justified':1,'beset':1,'evolution':2,'instructive':2,'influenced':1,'common':2,'rung':1,'characteristic':3,'fixed':2,'steam':1,'strengthened':1,'swept':1,'physically':1,'condensed':1,'observed':1,'are':1,'enhanced':1,'tender':1,'close':1,'luminous':1,'forthcoming':1,'best':1,'subject':2,'said':5,'probable':4,'distinctive':1,'missing':1,'continually':1,'written':1,'between':2,'conceptual':2,'progress':2,'neither':1,'available':1,'we':1,'reproduced':1,'nature':2,'tending':1,'however':5,'efficiency':1,'386':1,'suggested':4,'both':1,'essentially':2,'reported':2,'freely':1,'ill':1,'thickly':1,'against':1,'called':21,'sensitive':1,'passing':1,'among':2,'volcanic':1,'simple':1,'acted':1,'maintained':1,'simply':4,'learning':3,'associated':2,'pouring':1,'described':1,'capable':1,'scented':1,'due':5,'.':3,'recognised':1,'hardly':6,'resting':1,'life':2,'partly':5,'sufficient':5,'formed':2,'an':40,'diverted':1,'applied':3,'these':3,'plain':6,'eclipsed':1,'intimately':1,'reflex':1,'64-6221541':1,'flooding':1,'taking':1,'owed':1,'almost':8,'endowed':1,'thus':4,'it':7,'according':1,'helped':1,'good':2,'clinging':1,'in':33,'ready':1,'if':2,'tumbled':1,'perhaps':3,'occupied':1,'limited--there':1,'clearly':1,'solidary':1,'capped':1,'split':2,'finite':1,'difficult':6,'independent':1,'used':7,'wisest':1,'running':2,'arrived':1,'climbing':1,'circumvented':1,'centred':1,'lower':2,'largely':2,'paralysed':1,'humanly':1,'well':10,'magnified':1,'rife':1,'without':1,'the':158,'left':3,'departed':1,'just':5,'less':4,'being':3,'profoundly':1,'disguise':1,'stored':1,'atomic':1,'rocked':1,'behind':1,'useful':1,'renewed':1,'corroborated':1,'possible.':1,'passive':1,'spread':1,'transformed':1,'easy':2,'born':1,'struck':1,'increased':1,'loss':1,'showing':1,'decomposed':1,'possible':15,'marked':2,'advanced':1,'acute':1,'sorting':1,'necessary':7,'like':11,'lost':2,'shaped':1,'cooler':1,'admittedly':1,'62':1,'lapsed':1,'fully':1,'soft':1,'essential':1,'towards':2,'right':1,'often':22,'some':4,'somehow':1,'urgent':1,'added':2,'jupiter':1,'52':1,'perfected':1,'irresistible':1,'provided':1,'gradually':3,'condensed--who':1,'for':4,'unlocked':1,'recorded':1,'critical':1,'masked':2,'conquering':1,'good.':1,'freed':1,'indestructible':2,'peculiarly':2,'continuing':1,'broken':4,'worthy':1,'by':3,'on':6,'about':8,'mingled':3,'anything':1,'getting':1,'of':16,'mutually':1,'steadily':2,'introduced':1,'consequently':1,'swimming':1,'diversely':1,'equally':1,'within':1,'bound':1,'because':2,'lively':1,'primarily':1,'einstein':1,'nowadays':1,'doubtless':2,'seen':18,'indispensable':1,'flying':1,'long':1,'much':12,'infected':1,'low':1,':':4,'considerably':1,'complete':1,'secreted':1,'abundantly':1,'constituted':1,'heat':1,'true':20,'considerable':3,'posted':3,'absent':1,'made':10,'arranged':1,'evident':1,'obscure.':2,'whether':2,'dangerous':1,'placed':3,'converted':1,'emotional':1,'clear':7,'hotter':2,'certain':9,'slowing':1,'general':1,'transfused':2,'as':9,'at':11,'effected':2,'again':1,'raised':1,'inborn':2,'no':60,'unaccustomed':1,'out':1,'poor':1,'white-hot':1,'convincing':1,'ultimately':1,'generated':1,'important':2,'suited':3,'included':1,'aware':1,'promising.':1,'to-day':1,'happening':1,'practically':6,'cohesion':1,'ascertained':1,'implied':1,'time':1,'far':5},'it':{'holds':1,'illustrates':2,'scooped':1,'over':1,'fall':1,'splitting':1,'leads':1,'boils':1,'through':2,'looks':8,'cuts':1,'consists':2,'facilitates':1,'agrees':1,'causes':1,'crashing':1,'sprang':1,'sinks':1,'burns':1,'betokens':1,'furnished':1,'seems':23,'should':3,'forms':4,'to':18,'only':2,'spread':1,'firmly':1,'positively':1,'easy':1,'under':2,'8':1,'hammers':2,'has':82,'might':6,'sent':1,'gave':1,'meant':3,'then':1,'his':1,'wished':1,'goes':3,'listeth':1,'means':7,'contracts':2,'breaks':1,'continues':1,'stop':1,'possible':8,'flew':1,'engulfs':2,'matters':1,'cannot':5,'they':1,'altogether':2,'not':2,'meets.':1,'now':3,'neither':1,'discovered':1,'necessary':1,'went':2,'lies':1,'did':3,'always':2,'fixes':1,'serves':1,'loses':2,'herald':1,'off':1,'expels':1,'turns':1,'found':2,'feeds':2,'works':1,'mean':1,'reveals':1,'often':5,'exists':1,'sends':1,'folds':1,'acquires':1,'back':1,'alive':1,'differs':1,'used':1,'swims':3,'are':1,'picked':1,'reached':2,'collects':1,'out':1,'ascends.':1,'what':1,'probable':1,'for':4,'profit':1,'away':2,'revolves':1,'stops':1,'climbs':1,'misses':1,'does':14,'provides':2,'without':2,'got':1,';':1,'seemed':1,'ever':1,'occurs':4,'shows':2,'be':5,'we':1,'give':2,'led':2,'chose':1,'passes':3,'pours':1,'jumps':1,'works--the':1,'disintegrates':1,'works.':1,'surely':1,'put':1,'refers':1,'emits':1,'change':1,'takes':6,'on':6,'dates':1,'hunts':1,'consisted':1,'limits':1,'rests':1,'could':2,'settles':2,'approaches':1,'against':2,'must':20,'suggests':1,'became':5,'greatly':1,'usually':1,'leaps':1,'makes':2,'finds':1,'comes':4,'being':1,'own':1,'afterwards':1,'weighs':1,'had':17,'into':6,'were.':1,'corresponds':1,'reaches':1,'one':1,'running':1,'skips':1,'casts':1,'likes.':1,'impossible':3,'.':31,'doubtless':1,'utters':1,'rises':3,'from':3,'collides':1,'would':23,'remains':4,'expands':1,'there':1,'chooses':1,'vibrate':1,'by':2,'fully':1,'belongs':1,'appears':3,'recognised':1,'furnishes':2,'tells':1,'grew':1,'hardly':1,'until':1,'perishes':1,'slips':1,'that':3,'becomes':2,'contains':3,'convinces':1,'took':1,'strikes':1,'gently':1,'implied':1,'lives':3,'stiffens':1,'probably':1,'with':2,'than':1,'present':1,'he':1,'begins':1,'save':1,'were':18,'builds':1,'looks.':1,'was':98,'originate':1,'bids':1,'up':3,'promotes':1,'will':20,'exerts':1,'can':19,'applies':1,'about':1,'happened':1,'leaves':1,'breeds':1,'and':12,'buries':1,'changed':1,'go':1,'jettisons':1,'escapes':2,'almost':1,'is':473,'occupies':2,'thus':1,'naturally':1,'or':1,'an':1,'as':7,'at':1,'in':13,'need':4,'follows':4,'made':1,'proceeds':1,'if':1,'gives':2,'again':4,'needs':1,'shuts':1,'thereby':1,'amounts':1,'began':4,'acts':1,'when':3,'aside':1,'intelligently':1,'also':1,'parts':1,'which':1,'brings':1,'you':1,'gets':2,'pecked':1,'pursues':1,'practicable':1,'effected':1,'looked.':1,'wrongly':1,'radiates':1,'may':59,'fails':1,'occurred':1,'develops':1,'grows':2,'uses':1,'thrills':1,'contain':1,'concentrating':1,'died':1,'glow':1,'a':2,'implies':1,'advantageous':1,'records':1,'behaves':1,'clear':2,'sometimes':4,'flow':1,'breathes':1,'obviously':1,'more':1,'points':1,'so':2,'fitted':1,'harks':1,'the':4,'once':2,'requires':1,'possesses':1,'came':2,'repeatedly':1},'iv':{'the':1,'.':3},'ii':{'the':1,'.':3},'clinging':{'to':1},'in':{'limited':2,'all':20,'evidence':1,'skeleton':1,'particular':2,'four':2,'sleep':1,'canes':1,'hunting':1,'reptiles':1,'those':3,'masculine':1,'very':4,'indubitable':1,'duck-ponds':1,'every':5,'asia.':1,'hibernating':1,'monkeys':3,'minute':1,'archaeopteryx':1,'apprehension':1,'succession':2,'relation':1,'sedentary':1,'pterodactyl':1,'revolution':1,'ten':4,'dealing':2,'rivers':2,'cost':1,'nests':1,'what':2,'constitution':1,'nature.':2,'favour':1,'asia':2,'uniform':1,'new':3,'nails':1,'contrast':1,'movement':2,'body':1,'degree':2,'ninety-nine':1,'atoms':1,'water':2,'others':1,'directions':1,'fifteen':2,'great':7,'bygone':1,'northern':2,'healthy':1,'compliance':2,'miniature':1,'amount':2,'action':2,'locomotion':2,'mistake':2,'amphibians;':1,'diameter':14,'egypt':1,'africa':3,'gristly':2,'1907':2,'1900':2,'1901':1,'attendance':2,'from':2,'two':3,'cretaceous':1,'france':3,'comparing':1,'doubt':1,'black':1,'fossiliferous':1,'more':2,'horses':1,'pencil':1,'bodily':1,'glass':1,'warm':2,'virtue':3,'varying':1,'andalusia':1,'keeping':1,'animals':3,'this':48,'facilitating':1,'paragraph':6,'nine':1,'stature':2,'following':1,'making':4,'nurture':1,'control':1,'figure':1,'process':5,'persuading':1,'india':1,'pieces':1,'autumn':1,'orion':2,'times':2,'spite':6,'winter':5,'destroying':1,'six':1,'machine':1,'buns':1,'vital':1,'animal':2,'elephant':1,'ordinary':1,'civilisation':1,'edinburgh':1,'southern':1,'orbits':1,'unawares':1,'mankind':4,'waves':1,'1887':1,'such':8,'response':1,'trinil':1,'man':19,'a':188,'short':3,'natural':2,'outline':1,'so':1,'order':7,'typical':1,'imagining':1,'reproduced':1,'breaking':1,'september':1,'hand.':2,'years':1,'radio-active':3,'pascal':1,'existence':1,'cold':1,'its':36,'apes':1,'interesting':1,'amazing':1,'writing':3,'forms':1,'fig':1,'travelling':1,'admirable':1,'them':3,'good':1,'greater':2,'similar':1,'practice':1,'underneath':1,'overpowering':1,'not':1,'courtship':1,'sea-urchins':1,'respiration.':1,'all.':1,'truth':1,'each':3,'pools':2,'liberating':1,'doing':1,'year':1,'our':16,'operation':1,'1898.':1,'special':1,'canada':1,'living':2,'space':4,'safety':2,'kent':3,'millions':1,'turning':1,'monkeys--activity':1,'others--which':1,'little':1,'reason':1,'fastening':1,'organic':4,'e.g':1,'determining':1,'cosmic':1,'british':1,'behaviour.':1,'motion':1,'turn':4,'length':7,'place':1,'consequence':2,'locating':1,'south':1,'flying':1,'faculty':1,'number':6,'one':14,'dominating':1,'another':11,'precisely':1,'quality':1,'sockets':1,'size':11,'horse':1,'obedience':1,'their':35,'sumatra':1,'intermediate':1,'fiery':1,'reign.':1,'white':1,'store':1,'exploring':1,'that':5,'relieved':1,'kangaroo-like':1,'1918':1,'part':6,'western':1,'conger-eels':1,'1912':2,'1917':1,'kind':3,'accordance':3,'isolation':1,'matter':1,'supposed':1,'gigantic':2,'photosynthesis':1,'and':7,'modern':8,'mind':5,'locations':1,'interruptions':1,'any':19,'domestication':1,'relatively':2,'strength':1,'studying':1,'suddenness':1,'scotland':3,'isolated':1,'moist':1,'perigord':1,'internal':1,'which':43,'forming':2,'green':1,'circles':3,'inky':1,'play':1,'permian':1,'opposite':2,'scotland.':1,'most':15,'nothing':1,'difficulties.':1,'whalebone':1,'professor':1,'perceiving':1,'section':2,'fact':5,'quantity':1,'saying':2,'walking':1,'insects':2,'brief':1,'multicellular':1,'manchester':1,'prodigious':1,'changeful':1,'subtle':1,'thickness':3,'fine':1,'gilded':1,'knowledge':1,'stormy':1,'situations':1,'proportion':2,'considerable':1,'surroundings':1,'flood.':1,'darwin':1,'abeyance.':1,'photographs':1,'his':23,'exceptional':2,'expectation':2,'trees':2,'nearly':1,'words':1,'conjunction':1,'areas':1,'evolution':12,'luminosity':1,'violent':2,'flight.':1,'insectivorous':1,'miles':1,'croatia':1,'common':1,'activity':1,'view':1,'unison':1,'multiplying':1,'reference':1,'habit':1,'electrons--and':1,'intelligence':3,'radium':1,'silurian':1,'relative':1,'1921':5,'migration':1,'andromeda':2,'creating':1,'combustion':1,'ways':1,'opening':1,'birds--intelligence':1,'birds':14,'3':1,'various':4,'crookes':1,'europe':5,'we':1,'terms':4,'august':1,'parental':1,'ignorance':1,'queensland':1,'coma':2,'cities':1,'both':6,'many':26,'connection':8,'whole':1,'experimental':2,'point':1,'simple':1,'sweet':1,'vain':1,'ants':3,'height':1,'concluding':1,'adaptation':3,'scottish':1,'majestic':1,'extinct':1,'ether':5,'adults':1,'considering':2,'late':1,'unusual':1,'java':3,'addition':6,'damp':1,'three':6,'.':1,'tropical':2,'interest':2,'bewildering':1,'empty':1,'life':4,'sufficient':1,'search':1,'amphibians':1,'1864':1,'1869':1,'1868':1,'general':2,'captivity':2,'respiration':1,'plants':1,'sixes':1,'prehistoric':1,'these':10,'britain':4,'air':1,'lesser':1,'formats':1,'wild':3,'picturing':1,'girth':1,'albatros':1,'almost':1,'is':1,'it':7,'bipedal':1,'itself':2,'1895':2,'different':4,'locomotion;':1,'estuaries':1,'several':1,'crevices':1,'higher':1,'development':1,'safe':1,'leopard':1,'cleaning':1,'recent':1,'lower':1,'colour':6,'contact':2,'regulating':1,'biology.':1,'the':800,'chemistry':1,'summer':3,'less':2,'being':4,'ideas':1,'front':3,'shape':1,'hercules':3,'distant':1,'human':5,'succeeding':2,'rapid':3,'gentleness':1,'evolution.':1,'thinking':1,'alternate':1,'wet':1,'showing':2,'sussex':2,'early':2,'vacuum':1,'belgium':1,'cape':1,'hollow':1,'dreams':1,'ponds':1,'backboned':1,'brain-development':1,'lightning':1,'true':1,'either':2,'popular':1,'65':1,'methods':1,'some':52,'choosing':1,'sight':1,'illumination':1,'proper':2,'ourselves':3,'preparing':1,'dense':1,'dimensions':1,'for':2,'broad':1,'normal':1,'fluids':1,'1856':1,'tertiary':1,'cuttlefishes':1,'intimate':1,'miles.':1,'of':1,'agreement':1,'illustration':1,'constructive':1,'broken':2,'by':2,'comparison':3,'about':1,'central':3,'getting':3,'freedom':1,'hot':1,'gentler':1,'despair':1,'ox':1,'vogue':1,'or':1,'swimming':1,'1859.':1,'gearing':1,'fishes':3,'bats':1,'lieu':2,'your':2,'ontario':1,'her':5,'shells':1,'support':1,'sargasso':2,'question':1,'war':1,'north':6,'form':1,'mammals':4,'regard':15,'gait':1,'wireless':1,'1871--a':1,'thickness.':1,'with':1,'themselves':2,'partially':1,'blanketing':1,'places':3,'dordogne':1,'iron-mines':1,'diameter.':1,'laplace':1,'nature':8,'constant':1,'mesozoic':1,'certain':5,'paragraphs':1,'an':21,'as':2,'1894':1,'kind.':1,'1896':1,'work':1,'mutual':1,'inborn':1,'no':2,'overcoming':1,'peace':1,'erecting':1,'reality':1,'other':21,'electrical':2,'themselves.':1,'thickness--a':1,'conclusion':2,'gaining':1,'explaining':1,'star':1,'scrutinising':1,'sal-ammoniac':1,'shore-pools':1,'william':1,'scores':1,'variable':1,'astronomy':2,'structure':5,'building':2,'remote':1,'ancestral':1,'holes':1,'2001':1,'thames':1,'time':4,'fresh':7,'starting':1,'having':5},'unbranched':{'radial':1},'mouse':{'as':1,'is':1,'which':1,'chose':1},'boom':{'of':1},'disappear':{'for':1,'in':1},'if':{'unimpeded':1,'all':5,'it':25,'one':5,'nothing':3,'as':2,'at':1,'in':2,'our':2,'hydrogen':1,'any':5,'no':1,'there':8,'to':1,'going':1,'instead':1,'white':1,'ever':1,'division':1,'we':39,'that':2,'painted':2,'after':1,'every':1,'they':15,'progress':1,'not':1,'an':6,'you':17,'he':1,'a':11,'substances':1,'this':2,'light':1,'asexual':1,'she':3,'the':49},'grown':{'to':1,'now':1},'them--or':{'great':1},'belle':{'vue':1},'make':{'aerial':1,'mental':1,'some':1,'it':11,'society':1,'itself':1,'its':1,'galls':1,'for':4,'no':1,'any':2,'their':1,'new':1,'instinctively':1,'more':2,'to':1,'nothing':1,'themselves':1,'a':11,'up':8,'fewer':1,'mistakes':1,'donations':1,'the':9,'shows':1},'respectively.':{'the':1},'solidary':{'with':1},'concavity':{'.':1},'belly':{'very':1},'mixtures':{'of':1},'vegetable':{'mould':1,'matter':1,'kingdom.':1},'colonies':{'communities':1,'inside':1},'grows':{'hotter':1,'larger.':1,'hotter.':1,'to':1,'broader.':1,'old':1,'until':1,'out':1},'bells':{'drove':1},'evolve':{'such':1,'in':1,'.':1},'dissolution':{'must':1},'differing':{'for':1},'delight':{'in':1},'renaissance':{'of':1},'waterfall':{'is':1,'or':1},'sea-water':{';':1,'with':1,'back':1},'kin':{'by':1,'at':1},'supposing':{'our':1,'the':1,'that':3},'opportunity':{'and':1,'for':2,'of':1,'to':2,'during':1,'was':1},'butter':{'in':1},'bell.':{'copper':1},'changes':{'and':1,'again':1,'from':1,'e.g':1,'very':1,'of':7,'that':2,'.':3,'to':1,'as':1,'are':1,'which':1,'in':9,'occurring':1,'involved':1,'with':1,'wrought':2,'endless':1},'stimuli':{'and':1,'to':1,'from':1},'neptune':{'and':1,'2971.6':1,'quite':1,'s':1,'.':1,'by':1},'sea-anemone-like':{'polyps':2},'skull-cap':{'a':1,'indicates':1,'thigh-bone':1,'157':1},'809':{'north':1},'materials':{'nearer':1,'deeper':1,'for':1,'that':1,'this':1,'of':2,'are':1,'have':1,'such':2,'or':1},'impure.':{'the':1},'qualities':{'not':1,'of':1,'with':2,'sir':1,'.':2},'bootlace':{'and':1},'claims':{'of':1},'801':{'596-1887':1},'800':{'illustrations':1,'trillion':1},'left':{'and':4,'wall':1,'is':1,'it':2,'high':1,'alone':2,'at':1,'in':1,'only':1,'out':1,'isolated':1,'their':1,'behind':3,'his':1,'showing':1,'free':1,'else':1,'not':1,'hand':1,'a':1,'severely':1,'of':1,'having':1,'the':2,'side':1},'just':{'one':1,'as':28,'examined':1,'mentioned':3,'seen':1,'before':1,'detect':1,'two':1,'been':2,'foam-bells':1,'liberated':1,'peeping':1,'means':1,'outlined':1,'said':1,'mentioned.':1,'a':1,'on':1,'like':3,'this':1,'leaving':1,'dealt':1,'the':1},'sentence':{':':1,'set':1,'with':1},'ignorabimus.':{'a':1},'sporting':{'jellyfish':1,'or':1,'stock':1},'presume':{'that':1},'longish':{'hair':1},'fife--a':{'first-class':1},'identify':{'do':1},'salivary':{'juice':1},'fullness':{'freedom':1},'facts':{'and':3,'appear':1,'that':1,'of':2,'is':2,'there':1,'favour':1,'.':2,'to':2,'are':2,'point':1,'suggest':1,'not':1,'with':1,'recall':1},'yes':{'card':1},'yet':{'there':1,'just':1,'it':6,'discovered':1,'as':1,'at':1,'another':1,'in':1,'its':1,'even':1,'again':1,'would':1,'flash':1,'admit':1,'been':1,'to':1,'without':1,'passed':1,'stable':1,'we':2,'greater':1,'that':1,'here':1,'discover':1,'met':1,'they':1,'not':1,'now':1,'the':8,'man':1,'a':2,'steadfastly':1,'this':1,'many':1,'possessed':1,'studied':1,'these':1,'remain':1,'definitely':1,'she':1,'though':1,'found':1,'unborn':1},'infinitely':{'small':1,'long':2,'minute':1},'agile':{'hunters':1,'clever':1},'regarded':{'as':13,'the':2},'royal':{'astronomical':2,'observatory':6,'college':2},'long-lost':{'heir':1},'save':{'them':1,'that':1,'in':1,'it':1,'itself':1,'blood':1,'time':1,'fun':1,'the':1,'its':1,'man':1},'resting-place':{';':1},'ago.':{'when':1,'illustration':2},'nightjar':{'with':1,'.':1},'seventy-five':{'inches':1},'loose-limbed':{'fellow':1},'roadside':{'we':1},'forester':{'or':1},'gyrating':{'with':1},'background':{'and':1,'of':2,'professor':1,'parallax':1,'.':1},'destroy':{'a':1,'energy':1,'all':2},'hibernating':{'mammals':1},'dreamt':{'much':1},'grape-sugar':{'.':1},'dreams':{'mixed':1},'shoulder':{'.':1},'ascent.':{'illustration':1},'post-glacial':{'pleistocene':2},'nude':{'female':1},'autumn.':{'we':1},'manual':{'of':1},'unnecessary':{'display':1},'x-rays.':{'below':1},'admittedly':{'provisional.':1},'signal':{'noli':1,'illustration':1,'for':1},'greenland':{'whale':2},'deal':{'about':1,'of':5,'is':1,'.':1,'in':1,'further':1,'the':1,':':1,'with':8,'more':1},'sound--':{'five':1},'deaf':{'for':1},'somehow':{'condensed;':1,'associated':1,'breaking':1,'been':1,'underneath':1,'connected':1,'or':1},'dead':{'plants':1,'star':4,'stars':1,'forests':1,'cuticle':1,'.':1,'matter':1,'reverently':1,'fishes':1,'world':3,'animals.':1,'herring':1,'or':1,'before':1},'jupiter':{'and':3,'shine':1,'saturn':1,'from':1,'23':1,'is':3,'however':1,'.':2,'s':1,'which':1,'in':1,'the':1,'483.3':1,'as':1},'paragraphs':{'1.e.1':2,'1.e.8':1},'chromosomes':{'represented':1,'nuclear':1,'2':1,'lie':1},'disadvantage--a':{'broiling':1},'shapes':{'of':1,'282':1,'.':1,'in':1,'wave-motions':1},'dense':{'by':1,'waters':1,'forests':1,'or':1,'moisture':1,'region':1,'masses':1},'stations.':{'what':1},'normal':{'development':1,'number':1,'routine':1,'baby':1,'path':1,'condition':1,'circumstances':1},'distrust':{'which':1,'for':1},'nerve-cord.':{'4':1},'flounder':{'is':2},'conquering':{'them':1,'time':1,'the':2,'two':1,'space':1},'scotland.':{'what':1},'bold':{'enough':1},'novelties':{'may':1,'.':1,'or':1,'that':1},'burn':{'itself':1},'34':{'000':1},'translated':{'the':1,'mind.':1,'into':1},'bolt':{'escaped':1,'their':1},'tartan':{';':1},'flinty-shelled':{'radiolarians':1},'invertebrate':{'stocks':1,'animals':1},'bury':{'their':1},'air--by':{'means':1},'skin-twitching':{'muscle':1},'flourished':{'probably':1,'in':1},'conceal':{'.':1},'acceptation':{'of':1},'ribs':{'and':1,'of':1,';':1,'are':1,'.':1},'azure':{'blue':1},'islands':{'and':1,'off':1,'of':1,'but':1,'.':3,'in':1},'plesiosaurs':{'dinosaurs':1},'little-changed':{'descendant':1},'automatically':{'to':1,'adjusts':1},'ores':{'of':1},'nerve':{'to':1,'for':1,'man':1},'thinner':{'and':1,'as':1,'than':3},'for.':{'information':1},'formerly':{'had':1},'intellectual':{'keys':1,'tool':1,'property':2,'adventure':1,'coin':1},'chooses':{'for':1},'down':{'and':7,'into':1,'it':1,'as':1,'sec':1,'at':1,'in':2,'before':1,'even':1,'again':1,'from':2,'their':1,'when':1,'.':4,'to':9,'behind':1,';':2,'more':1,'towards':1,'unless':1,'upon':1,'losing':1,'with':1,'by':4,'a':1,'on':5,'branches':1,'these':1,'of':5,'taking':1,'without':1,'many':1,'the':20},'lies':{'in':1,'safe':1,'.':2,'at':1,'between':1,'the':1},'doctrine':{'of':2},'lieu':{'of':2,'travail':1},'refined':{'methods':1},'crab-apple':{'of':1},'ring-formations':{'on':1},'weathered':{'by':1},'amazingly':{'.':1},'initial':{'picture.':1},'jealousy':{'and':1},'approximate':{'and':1,'way':1},'saucerful':{'.':1},'fraction':{'1':1,'of':3,'about':1},'marten':{'for':1},'form':{'and':2,'accessible':1,'is':2,'some':1,'an':2,'as':1,'including':1,'are':1,'any':1,'what':1,'no':2,'.':5,'molecules':2,'we':2,'that':1,'atoms':1,'water':1,'part':2,'reappears':1,'a':16,'fossils':1,'this':1,'of':20,'centres':1,'the':9,'or':1,'once':1},'pinna':{'a':1},'analyse':{'it':1},'feminine':{'structures':1,'characters':1,'.':1},'powerfully':{'along':1},'snow-caps':{'in':1},'magellanic':{'cloud':1},'minuteness':{'of':2},'221':{'photo':1},'evinced':{'and':1},'manatees':{'and':1},'builds':{'up':1},'understood':{'before.':1,'unless':1,'that':1,'when':1,'to':1,'as':1},'harmony':{'and':2},'attached':{'to':3,'full':1},'bounds':{'of':1,'until':1},'pistil':{'thus':1},'centipede':{'s':1},'bird-dropping':{'perhaps':1,'on':2,'spider':1},'egg-eating':{'african':1},'cosmos':{'more':1},'attaches':{'to':1},'temper':{'rather':1,'the':1,'but':1,'.':1},'fractions':{'showing':1},'strengthening':{'of':1},'sticks':{'to':1},'discovery.':{'certain':1,'2':1},'seeds--and':{'resolving':1},'covers':{'them':1,'the':1},'sticky':{'club':1},'gland':{'of':1,'.':1},'mediocre':{'stock':1},'marking':{'the':1},'profit.':{'illustration':1},'discriminate':{'infallibly':1,'differences':1,'sifting':1,'between':1,'cards':1,'the':1},'x-rays--the':{'discovery':1},'font-de-gaume':{'on':2,'cavern':2},'generally':{'described':1,'burst':1,'correspond':1,'deep':1,'as':1,'accepted':1,'adopted.':1},'handed':{'a':1,'on':1,'over':3},'carnivorous':{'confined':1,'turtles':1},'mediaeval':{'and':1},'delivered':{'up':1},'dies':{'to':1},'felt':{'thought':1,'.':1,'than':1,'that':1},'diet':{'mainly':1,'in':1},'genealogical':{'tree':6},'journey':{';':1,'through':1,'round':1,'.':3},'routine--not':{'that':1},'authorities':{'on':1,'neanderthal':1,'recently':1,'referring':1,'is':1,'there':1,'regard':1,'who':1,'have':1,'the':1,'include':1,'think':1},'died':{'away':1,'when':1,'suffered':1,'.':1},'billion':{'is':1,'the':1},'immemorial':{'and':1,'spawning':1},'happening':{'to':1,'is':1},'potato':{'and':1},'assume':{'different':1,'its':1,'that':1},'blushing':{'but':1},'microcosm':{'only':1},'daily':{'.':1,'paper':1,'mail':1,'i.e':1,'mail.':1,'round':1},'jacket':{'and':1},'gorilla':{'g':1,'inhabiting':2,'.':1,'brain':1,'s':1,'164':1,'the':2,'man':3},'almanac':{'and':1,'.':1},'teeth':{'and':3,'on':2,'that':1,'of':1,'.':5,'obeying':1,'till':1,'without':1,'so':1,'are':3,'which':2,'in':3,'fixed':1},'skull-cap.':{'illustration':1},'restored':{'.':2,'it':1,'by':1},'milt':{'and':1},'managed':{'to':1},'limbless':{'lizard':1,'larva':1},'woodwork':{'knew':1},'relieve':{'the':1},'vestiges':{'have':1},'pierces':{'with':1},'hind-legs':{'and':5,'about':1},'manages':{'to':1},'skin':{'and':5,'able':1,'is':1,'pushed':1,'as':1,'are':1,'when':1,'responds':1,'.':2,'to':1,'was':1,'extended':1,'becomes':1,'during':1,'with':1,'minute':1,'begins':1,'on':1,'of':2,'involved':1,'the':1,'or':1},'leche':{'of':2},'shot':{'out':4,'in':1,'humming-bird':1},'mill':{'in':1,'.':1},'abundant':{'modern':1,'from':1,'material':1,'evidence':1,'flux':1,'near':1,'representation':2,'oxygenation':1},'milk':{'.':2},'resourceful':{'of':1},'retention':{'of':2},'anticipation':{'of':1},'depend':{'on':4},'disorders':{'are':1},'educable':{'and':1,'loquacious':1,'creature':1,'.':1},'pouch':{'and':2,'83':1,'the':1,'on':1},'father':{'secchi':1,'of':1,'sea-horse':1,'s':1,'lumpsucker':1,';':1,'stickleback':1,'was':1,'sea-spider':1},'travel.':{'but':1},'answered':{'that':1},'finally':{'and':1,'we':1,'marquis':1,'becomes':1,'there':1,'it':2,'discover':1,'to':1,'words':1,'resulted':1,'become':1,'the':1},'appendicitis':{'.':1},'reptiles':{'and':7,'appeared':1,'some':1,'are':1,'in':4,'birds':2,'before':2,'suggest':1,'when':1,'.':1,'finding':1,';':1,'burrowing':1,'but':2,'such':2,'with':1,'on':1,'e.g':1,'did':1,'of':1,'the':1,'or':1},'swoop':{'from':1},'marks':{'on':1,'most':1,'with':1,'an':1},'vegetation.':{'the':1,'illustration':1,'they':1},'suffered':{'and':1,'from':1},'must':{'often':1,'give':1,'describe':1,'influence':1,'it':1,'one':1,'recall':1,'exist':1,'at':1,'have':17,'go':1,'still':1,'open':1,'find':1,'use':1,'necessarily':1,'appear':1,'suffice':2,'point':1,'also':4,'live':1,'therefore':1,'include':1,'be':59,'draw':1,'move':1,'return':1,'extend':1,'rise':1,'gradually':1,'however':2,'surely':1,'struggle':1,'recognise':4,'imagine':1,'not':11,'affect':1,'come':1,'comply':2,'look':2,'convert':1,'remember':3,'of':1,'require':1,'leave':1,'admit':3,'always':4,'cease':1,'first':3,'obtain':1,'think':3,'sink':1},'fancied':{'there':1},'abundance':{'of':5,'so':1,'at':1},'mud-turtle':{'or':1},'string':{'of':1,'beads':1},'einstein--the':{'tides--origin':1},'theme.':{'when':1},'soapy':{'water':1,'froth':1,'film':1},'figment':{'of':1},'first-known':{'bird':1},'merit':{'of':1},'word':{'development':1,'obviously':1,'about':1,'now':1,'like':1,'for':1,'pencilled':1,'may':1,'processing':1,'atom.':1,'surface':1,'atoms':1,'specificity':1,'.':1,'s':1,'learn':1,'need':1,'has':1,'history':1},'dim':{'and':1,'luminous':1,'at':1},'banished':{'from':1},'did':{'fly':1,'naturally':1,'great':1,'good':1,'service':1,'this':1,'all':1,'long':1,'it':1,'to':1,'much':1,'exist':1,'at':1,'they':1,'not':14,'.':1,'really':1},'die':{';':1,'after':1,'or':1,'.':2},'cavendish':{'professor':1,'physical':1},'travels':{'from':1,'straight':1,'down':2,'at':3,'in':2,'along':2,'by':2},'item':{'in':1},'excellence':{'and':1,'that':1},'perceptual':{'inference.':1,'inference':5,'influence.':1},'round':{'and':3,'it':7,'at':1,'planets':1,'in':3,'its':2,'rapidly':1,'would':1,'.':1,'which':1,'mars':1,'hers.':1,'them':2,'his':1,'that':2,'each':1,'a':5,'on':2,'about':1,'this':2,'smooth':1,'these':1,'centres':1,'the':38},'attracting':{'other':1,'or':1},'talked':{'of':1},'dealing':{'with':4,'from':1},'radium.':{'the':1},'run':{'to':1,'leap':1,'on':2},'langmuir':{'has':1},'bipeds':{'and':1},'adds':{'to':1},'1910.':{'illustration':1},'heaviest':{'and':1,'uranium':1,'.':1},'favour':{'of':1,'the':2,'in':1},'rub':{'it':1},'international':{'donations':1},'filled':{'with':1},'dwarf':{'a':1},'fibre':{'.':1},'mr':{'.':11},'appetites':{'of':1},'french':{'mathematician':1,'copper':1,'authority':1},'tangent':{'is':1,'.':1},'congestion':{'and':1},'four-chambered':{'mammalian':1},'nooks':{'of':1},'wait':{'for':2},'box':{'and':3,'of':1,'containing':1,'green':1,'.':1},'boy':{'a':1,'or':1},'cranial':{'cavity':2,'walls':1,'capacity':1},'1924':{'the':1,'made':1},'shift':{'of':2,'against':1},'intelligence.':{'illustration':1},'works.':{'sec':1,'1.e.9':1,'professor':1,'-':1},'animals--the':{'most':1,'flying':1},'smoke-like':{'haze':1},'exploitation':{'is':1},'simultaneous':{'discharge':1},'atoms.':{'molecules':1,'illustration':1},'conveniently':{'divided':2},'hither':{'and':2},'adjustable':{'in':1},'elect':{'to':1,'were':1},'merely':{'passes':1,'striking':1,'of':1,'that':1,'approximate':1,'air':1,'as':1,'have':1,'represented':1,'finger-posts':1,'means':1,'the':3},'reef-building':{'coral':2},'everybody':{'knows':1,'.':1},'coaxing':{'he':1},'wealth':{'of':1},'sake':{'of':1,'professor':1,'there':1},'hundred-thousandth':{'part':1},'uncritical':{'generosity':1},'--are':{'related':1},'trilobites.':{'looking':1},'ways.':{'iii':1},'flaunting':{'conspicuousness':1},'100-inch':{'telescope':2,'reflector':1},'phosphorescent--they':{'become':1},'cooperated':{'with':1},'lessened':{';':1,'by':1},'alpines':{'and':1},'fish-eating':{'turtles':1},'sharing':{'project':1},'labyrinth':{'if':1},'malay':{'and':1,'to':1,'islands':1},'rigid':{'during':1},'knowledge--the':{'senses':1},'effort':{'to':2,'good':1,'.':1,'much':1},'robe':{'of':1},'capturing':{'a':2,'the':1},'bushels':{'of':1,';':1},'fly':{'off':4,'for':1,'far':3,'into':2,'spreads':1,'.':1,'which':2,'in':1,'flicking':1,'once':1},'flagellum':{'by':1},'avoiding':{'death':1,'enemies':1},'sum-total':{'of':1},'amarus':{'a':1,'124':1},'reappear':{'perhaps':1,'at':1},'growing':{'on':1,'point':1,'over':1,'moulting':1,'stronger':1,'period':1,'to':1,'under':1,'thicker':1,'out':1},'making':{'a':5,'great':1,'towards':1,'daring':1,'these':1,'of':7,'cache':1,'life':1,'what':1,'it':1,'antagonistic':1,'more':1,'experiments':1,'them':1,'sentences':1,'the':10,'.':1,'intelligent':1,'animate':1,'tentatives--new':1},'thicknesses':{'of':1},'sea-spider':{'carries':1,'or':1},'claim':{'a':1},'portals':{'were':1},'bullhead':{'and':1},'predict':{'the':1},'596-1887':{'email':1},'permutations':{'and':1},'agent':{'or':1,'.':1},'sample':{'sent':1,'david':1},'stroke.':{'illustration':1},'1.f.':{'1.f.1':1},'above--that':{'is':1},'redness':{'.':1},'pages.':{'illustration':1},'rays':{'streamed':1,'visible':1,'see':1,'are':5,'have':1,'in':1,'carry':1,'out':1,'from':2,'their':1,'had':2,'except':2,'.':5,'to':3,'poured':1,'which':1,'was':1,'crookes':1,'passed':1,'that':2,'becomes':1,'emitted':1,'but':1,'263':1,'impinged':1,'carrying':1,'post':1,'must':1,'shoot':1,'diverging':1,'of':4,'as':2,'will':1,'were':2,'at':1,'the':2,'consisted':1},'comb-bearers':{'or':1},'get':{'crumbs':1,'into':3,'mind':1,'an':2,'at':3,'another':1,'in':3,'out':3,'even':1,'little':1,'from':1,'two':1,'much':1,'white':1,'more':1,'good':1,'some':2,'free':1,'correspondingly':1,'plenty':2,'a':8,'both':1,'about':1,'this':1,'the':3,'farther':1},'mongols':{'include':1,'curly-or':1},'till':{'a':1,'we':1,'daybreak':1,'there':1,'all':2,'dawn.':1,'only':1,'the':5,'he':1},'orang-utan':{'a':1,'3':1,'4':1,'232':1,'233':2},'1.e.9':{'.':1},'1.e.8':{'or':2,'.':1},'pure':{'radium':1},'skates':{'and':1},'1.e.5':{'.':1},'1.e.4':{'.':1},'1.e.7':{'and':1,'or':1,'.':1},'1.e.6':{'.':1},'1.e.1':{'through':2,'with':1,'.':1},'1.e.3':{'.':1},'1.e.2':{'.':1},'146':{'the':1,'protective':1},'147':{'cuckoo-spit':1,'photo':2},'144':{'dead-leaf':1,'another':1},'142':{'photo':1,'000':1},'swayed':{'their':1},'140':{'photo':1,'photos':1},'141':{'protective':1},'strokes':{'and':1,'of':2},'max':{'schultze':2},'accessory':{'factors':1},'mankind':{'given':1,'evolution':1,'though':1,'migrations':1,'.':3,'so':1,'at':1,'the':1,'or':1},'gill-plates.':{'illustration':1},'grow':{'down':1,'for':1,'older':1,'it':1,'large':1,'in':1,'out':1},'jellyfish':{'easily':1,'starfish':1,'is':1,'there':1,'it':1,'aurelia':1,'has':1,'with':1},'scrambling':{'on':1},'aimless':{'wandering':1},'neck':{'and':1,'passes':1,'of':1,'.':1,'vertebrae':1,'or':1},'johnson':{'and':2},'duckmole':{'and':2,'or':3},'tale':{'.':1},'idea--of':{'taking':1},'sun--measuring':{'the':1},'rarified':{'form':1},'deposit':{'on':1,'in':1,'their':1},'african':{'representative':1,'mudfish':1,'race':1,'snake':1,'the':1,'ape':1},'basket':{'a':1,'of':1,'euplectella':2,'on':1},'mottlings':{'especially':1},'proposal':{'.':1},'development.':{'continental':1},'shield':{':':1,'.':1},'cathedral':{'would':1,'each':1},'civilisation.':{'pleistocene':1,'before':1},'pointed':{'ear':1,'out':2},'wishing':{'to':1},'entity':{'just':1,'that':1,'.':1,'to':2,'which':2,'providing':1},'stability':{'and':1},'globe-fishes':{'which':1},'rings.':{'illustration':1},'planetesimals':{'into':1,'formed':1,'which':1},'pitch':{'.':1},'differs':{'from':3,'greatly':1},'tropisms':{'a':1,'obligatory':1,'play':1,'.':1},'mind--mind':{'in':1},'rhinoceros':{'had':1,'the':1,'bison':1,'irish':1},'ice-fields':{'of':1,'cleared':1},'police':{'dog':1},'monitor':{'varanus':2},'interesting':{'and':1,'because':1,'saving':1,'give':1,'is':1,'sidelight':1,'questions':1,'in':2,'birds':1,'subject':1,'information':1,'glimpse':1,'ways':1,'point':3,'to':16,'way':2,'living':1,'minor':1,'case':1,'that':1,'gradations':1,'archaic':1,'than':1,'condition':1,'recent':1,'chapter':1,'picture':1,'outcome':1,'consequences':1,'study':2,'work':1,'circumstance':1,'race':1,'greenish':1,'problem':1,'works':1,'discoveries':1,'fact':5},'yorkshire':{'stream':1},'consequential':{'punitive':1},'ours':{'would':1,'does':1,'judged':1,'but':1,'are':1},'main':{'layers':2,'use':1,'force':1,'methods':1,'primate':1,'motive-force':1,'lines':2,'processes--':1,'stem':2,'seat':1,'trends':1,'mass':2,'pg':1,'groups':1,'stems':1,'chapters--the':1,'line':14,'one':1,'types':1,'scientific':1},'captivated':{'the':1},'fire-mist':{'that':1},'sooner':{'or':2},'gregariousness':{'and':1},'begun.':{'splitting':1},'markings':{'and':1,'on':1},'leopards':{'238':1,'trained':1},'killed':{'on':1,'by':1,'in':1},'possess':{'a':2,'what':1,'well-developed':1,'.':1,'in':1,'the':3,'an':1},'stock--common':{'to':1},'obviates':{'any':1},'meets.':{'these':1},'thymus':{'gland':1},'careless':{'statement':1},'rock':{'formations.':1,'to':1,'of':1,'kangaroo':2,'record':5,'whence':1,'many':1,'dove':1,'or':1},'vogue':{'but':1},'sheep-ranches':{'were':1},'eyelid':{'is':1,'used':1,'in':1},'elephants':{'and':1,'what':1,'the':1,'is':1,'.':1},'water-bird':{'such':1},'treacherous':{'internal':1,'ooze':2},'tobogganing':{'on':1},'richly':{'endowed':1},'unlock':{'locks':1},'glaciation':{'had':1},'sifted':{'and':1,'again':1,'.':3,'for':1,'out':1},'telescoped':{'manner':1},'description':{'aeschylus':1,'from':1,'.':1},'canada':{'and':1,'about':1},'emerges':{'the':1,'from':1},'afghans':{'alpines':1},'greeks':{'applied':1,'of':1,'said':1,'thought':1},'interference':{'as':1,'with':1},'miles':{'and':1,'into':1,'deep':2,'an':1,'winding':1,'distant':1,'per':4,'in':13,'odd':1,'out':1,'away.':1,'from':5,'would':1,'away':9,'long':1,'.':9,'to':1,'above':3,';':1,'was':1,'across':1,'though':1,'coloured':1,'driven':1,'satellites':1,'a':17,'wide':1,'getting':1,'of':8,'the':2,'or':1,'at':1},'emerged':{'a':1,'on':1,'about':1,'rich':1,'in':1},'dioxide':{'and':1},'correct':{'path':1,'the':1},'assurance':{'the':1},'behaving':{'to':1},'earlier':{'a':1,'chapter':1,'form':1,'generation':1,'organisation':1,'page':1,'stages':1,'or':1},'telegraphy':{'and':1},'sideways':{'towards':1,'scooping':2},'atomism.':{'an':1},'electrically':{'and':1},'imaginable':{'.':1},'paralysing':{'effect':1},'surface-atoms':{'of':1},'existed.':{'even':1},'sunlight.':{'saturn':1},'cough':{'or':2},'orb':{'on':1},'advance':{'and':1,'towards':1,'of':3,'is':1,'in':2,'has':2},'grist':{'to':1},'derivation':{'from':1},'language':{'and':1,'logos':1,'of':1,'there':1,'to':1,'as':1,':':1},'thing':{'and':1,'we':1,'works':1,'to':3,'may':1,'is':1,'.':2,'did':1,'as':3,'existed.':1,'has':1,'yet':1,'happened':1},'invalidity':{'or':1},'2971.6':{'164.78':1},'alevin':{'encumbered':1},'assuredly':{'much':1},'waited':{'on':1,'in':1},'first':{'and':3,'discovered.':1,'telescope':1,'bird--was':1,'beholding':1,'animals':5,'preparation':1,'crop':1,'dynasty':1,'observed':1,'known':6,'animals--beginnings':2,'view':1,'sight':3,'such':1,'alternative':1,'amphibians.':1,'vital':1,'creatures':1,'terrestrial':1,'living':4,'plants--the':2,'one-toed':1,'organisms':1,'make':1,'there':3,'question':1,'three':2,'.':1,'to':3,'prism':1,'became':1,'reptiles':1,'finger':2,'time':6,'learned':1,'if':1,'was':1,'bird':2,'body':1,'be':2,'men':1,'wheat':1,'that':1,'mammal':1,'becomes':2,'voice--surely':1,'divergence':1,'use':1,'but':1,'step':2,'part':1,'sir':1,'amphibians':2,'atom':1,'fishes':1,'invasion':1,'printing':1,'one':1,'come':1,'bronze':1,'a':2,'great':5,'backboned':1,'impressive':1,'showed':1,'gale':1,'successes':1,'of':2,'books.':1,'formed':1,'discoveries':1,'thought':1,'plants':1,'definitely':1,'place':2,'evolved':1,'error':1,'fishes.':1,'found':1,'the':2,'quarter':1,'called':1,'two':1,'know':1},'dwelling':{'on':1},'americana':{'with':2},'discharges':{'at':1},'miocene':{'and':2,'n':1,'was':1,'or':1,'others':1},'arrhenius':{'svante':1},'amidst':{'the':1},'violet-light':{'waves':1},'specificity':{'which':1},'carry':{'them':1,'his':1,'many':1,'messages':1,'it':2,'us':1,'an':1,'their':2,'out':1},'sounds':{'and':2,'on':1,'become':1,'were':1,'except':1,'two':1,'are':1,'in':1,'such':1,'the':1,'.':1},'fiji':{'.':1},'rome':{'observed':1,'were':1},'discharged':{'by':2,'.':1},'interchange':{'of':2},'little':{'reptile':2,'secure':1,'family':1,'taste':1,'of':1,'is':2,'mud-turtle':1,'colony':2,'primitive':1,'evidence':1,'likely':1,'books':1,'creatures.':1,'in':3,'conical':1,'species':1,'lid':1,'glimpse':1,'books--an':1,'monkey':1,'plankton':1,'detail':1,'chemical':1,'lower':1,'doubt':4,'finger':1,'colony.':1,'units':1,'bubble':1,'over':1,'store':1,'more':1,'plate':1,'ball':1,'garden':1,'fish':1,'that':1,'structure':1,'mammals':1,'wax':1,'use':1,'glass':1,'ferment':1,'resemblance':1,'dull':1,'pool':1,'room':1,'building':1,'about':1,'freshwater':1,'like':1,'grains':1,'uneasy':1,'whether':1,'scraping':1,'patch':1,'green':1,'ten-miles-wide':1,'pockets':2,'pinch':1,'the':1,'piece':2,'book':1},'man--the':{'culmination':1,'fountain':1,'metal':1},'unduly':{'obscure':1},'parallel':{'to':2,'wires':1},'1a':{'fore-limb':1},'plains':{'and':3,'to':1,'were':1},'pockets.':{'in':1},'alfred':{'a':1,'russel':1},'speaking':{'of':2},'mining':{'no':1},'dived':{'and':1,'appropriately.':1,'disappeared':1},'american.':{'professor':1},'continuous':{'and':3,'natural':1,'relationship':1,'since':1,'gradations':1,'.':1,'current':1,'accretion':1,'night':1,'raft':1},'accurately':{'the':1,'measured':1},'crevice':{'of':1},'ridges.':{'illustration':1},'undoubtedly':{'great':1,'radio-active--then':1,'an':1},'splendid':{'failures':2},'11':{'feet':1,'the':1,'magnetism':1},'10':{'what':1,'ft':1,'photo':2,'professor':1,'.':1,'feet':1,'000':3,'uranus':1,'1910.':1},'13':{'is':1,'substitutes':1},'cracks':{'of':1},'15':{'matter':1,'from':1},'14':{'dissipation':1,'photo':1,'the':1,'you':1},'sailing':{'of':1,'round':1},'16':{'rise':1,'minutes':1,'until':1},'19':{'1911':2,'photo':2,'consists':1},'scraping':{'of':1},'coco-palm':{'for':1},'victorian':{'.':1},'protected':{'and':1,'as':1,'e.g':1},'fertilisation':{'may':1,'of':1,'it':1},'centigrade':{'below':1},'were':{'all':3,'shot':1,'being':2,'soon':1,'forests':1,'discovered':1,'introductions':1,'through':1,'handed':1,'jointed-footed':1,'still':2,'birds':1,'waiting':1,'teeming':1,'destroyed':3,'to':1,'microscopic':1,'dead.':1,'employed':1,'hidden':1,'surprised':1,'presently':1,'very':3,'wiser':1,'not':5,'hunted':1,'like':1,'presented':2,'always':2,'porous':1,'intrigued':1,'found':4,'entirely':1,'prompted':1,'somehow':1,'born':1,'sifted':1,'borne':1,'even':1,'established':2,'opened':1,'for':1,'wrought':1,'laid':3,'dominated':1,'probably':4,'neither':1,'involved':3,'fed':1,'free':1,'quite':1,'met':1,'experimenting':1,'imperfectly':1,'represented':1,'atoms':1,'beginning':1,'gained':1,'on':1,'about':1,'feeling':1,'evolved--destined':1,'indivisible':1,'broken':1,'many':2,'substituted':1,'streams':1,'usually':1,'symmetrical':1,'first':2,'composed':1,'raised':2,'afterwards':1,'slipped':1,'suddenly':1,'within':1,'marked':2,'due':1,'brought':2,'done':1,'suspended':1,'often':1,'ichthyosaurs':1,'given':1,'ancient':1,'from':1,'hunters':1,'three':1,'approximately':1,'.':1,'few':1,'much':1,'too':1,'fish-lizards':1,'taken':1,'reptiles':1,'minor':1,'composed.':1,'separated':1,'formed':4,'amphibians':2,'it':1,'overcrowded':1,'trying':1,'true':2,'expounded':1,'electrified':1,'made':6,'these':1,'originally':1,'created':1,'extraordinarily':1,'replaced':3,'evolved':2,'of':4,'prematurely':1,'more':1,'buried':1,'crowning':1,'almost':1,'composed--':1,'an':2,'entombed':1,'as':1,'at':2,'in':5,'bones':1,'sharp':1,'no':1,'breaking':1,'able':4,'continually':1,'eagerly':1,'also':4,'prospecting':1,'accumulating':1,'several':1,'rediscovered':1,'gaining':1,'living':2,'immersed':1,'after':1,'most':1,'connected':1,'rejected':1,'eaten':1,'fishes':2,'such':1,'twenty-nine':1,'a':2,'succeeded':1,'largely':1,'later':1,'magnified':1,'so':3,'the':11,'left':3,'once':3},'gigantic':{'flywheel':1,'eye':1,'streamers':1,'orbits.':1,'sun':1,'orbits':1,'.':1,'magnet':1,'glowing':1,'shreds':1,'bubbles':1,'intellect':1,'as':1,'size':2},'proofread':{'public':1},'1.':{'illustration':1},'awns':{'or':1},'coconut':{'palm':1,'from':1},'conjectural':{'.':1},'mundane':{'goal':1},'occupies':{'only':1,'more':2,'an':1},'lice':{'have':1},'entombed':{'in':1},'kurtus':{'carries':1},'metcalf':{'outline':1},'spectacle':{'again':1,'197':1,'is':1},'occupied':{'the':1,'by':2},'euclid':{'or':1},'hitherto':{'known':1,'unknown':1,'shut':1,'we':1,'the':1},'intruder.':{'when':1},'bavaria':{'and':1},'efficient':{'to':1,'answers':1,'they':1},'isolate':{'it':1},'potential':{'energy':3,'.':1},'interior':{'of':4,'is':1,'yet':1,'energy':1,'periodically':1},'performance':{'of':1,'was':1,'hundreds':1},'inveterate':{'enemies':1},'volplanes':{'in':1},'jungle':{'fowl':1,'of':1,'ends':1,'folk':1,'tribes':1},'201':{'photo':2},'200':{'well-marked':1,'cassowary':1},'203':{'jackdaw':1},'202':{'a':1,'the':1},'205':{'a':1},'norman':{'lockyer':2,'inorganic':1},'trace':{'of':5,'the':1,'some':1,'any':1},'206':{'.':1},'arguing':{'whether':1},'208':{'photo':1,'from':1},'correlation':{'of':1},'paid':{'a':1,'for':3,'within':1,'toll':1,'the':1,'by':1},'blackest':{'ignorance':1},'beta':{'and':2,'rays':3,'electrons':1},'sheets':{'of':1},'tract':{'of':2},'contrasts':{'as':1,'in':1,'between':1},'conspicuous':{'and':3,'on':1,'is':1,'material':1,'canines':1,'against':1,'60':1,'black':1,'during':1},'especially':{'among':1,'from':1,'for':1,'prominent.':1,'on':1,'of':1,'when':3,'as':1,'commercial':1,'in':4,'those':2,'look':1},'surprising':{'power':1,'that':2,'when':1,'as':1,'effects':1,'fact':1},'fills':{'the':1},'bustard':{'the':1},'hedgehog':{'mole':1},'alone.':{'the':1},'precise':{'origin':1,'needs':1,'unless':1,'scientific':1,'form-resemblance':1,'object':1,'mechanism':1,'anthropology':1,'time':1,'studies':1,'answers.':1,'vision':1},'grouselike':{'above':1},'show':{'intelligence':1,'evidence':1,'even':1,'gill-clefts--':1,'what':2,'no':2,'interesting':1,'definite':1,'.':1,'to':1,';':1,'that':9,'notable':1,'how':2,'not':1,'man':1,'a':4,'on':1,'great':2,'this':1,'arrested':1,'us':1,'face':1,'without':1,'artistic':1,'teeth':1,'the':6},'gill-cover.':{'the':1},'forbidding':{'by':1},'drawings':{'and':1,'over':1,'by':2},'uranus':{'and':1,'neptune':1,'is':1,'1781.9':1,'.':1},'saying':{'nothing':2,'.':1,'merely':1,':':2,'that':4},'threshold':{'of':1},'corner':{'and':1,'of':5,'near':1,'at':1},'gaseous.':{'now':1},'directions--an':{'alternating':1},'fend':{'for':1},'stormy':{'weather':1},'plume':{'or':1},'treasure':{'at':1},'storms':{'on':1,'.':1,'to':1,'manifest':1},'enough':{'even':1,'has':2,'for':2,'of':2,'when':1,'however':1,'.':1,'to':17,'in':1,'the':1,'air':1},'either':{'case':1,'solitary':1,'of':2,'packet':1,'plants':1,'in':1,'the':1,'with':1,'before':1},'black':{'and':2,'body':1,'quills':1,'tip':1,'spots':2,'.':2,'surroundings':1,'stuff':2,'marks':1,'tips':1,'patch':1,'or':1},'germs':{'of':1},'down-rushing':{'water':1},'pegged':{'down':1},'abeyance.':{'disappearance':1},'awareness':{'and':2,'of':2,'.':1},'single-chambered':{'shell':1},'bittern':{'and':2,'begin':2,'is':1},'contracts':{'and':1,'under':1},'persisting':{'in':1},'midriff':{'or':1},'unimportant':{'and':1,'elements':1,'bladder':1},'nearly':{'a':2,'all':5,'every':1,'thirty':1,'everything':1,'twenty':1,'three':1,'related':2,'up':1,'twice':1,'so':3,'4':1,'9':1,'186':1,'the':2,'any':1,'two':1},'distinctly':{'later':1},'conjunction':{'with':1},'secondary':{'bodies':1},'pollen-nucleus':{'of':1},'bearings':{'cannot':1},'median':{'section':2},'yield':{'us':1},'morning':{'and':1,'coat':1,'especially':1,'to':1},'stupid':{'as':1,'bird':1},'photographically':{'reduced':1},'kernel':{'of':1,'is':1,'divides':1},'declared':{'that':1},'milling':{'and':1},'seas':{'and':2,'many':1,'had':1,'.':1,'to':1,'became':1,'are':1,'were':1,'went':1,':':1,'phosphorescent':1},'seat':{'of':4},'relative':{'distances':2,'sizes':2,'peace':1,'to':1,'absence':1,'in':1,'fixity':1,'shortness':1,'beginning':1},'j.':{'thomson':2},'mud-nests':{'or':1},'mcgregor.':{'profile':2,'a':1,'photograph':1,'sand-pit':1,'piltdown':3,'restoration':1,'the':3},'unaltered':{'.':1},'sameness':{'and':1},'permeates':{'all':1},'steadfast':{'sign':1},'eoliths':{'.':1},'habits--experiments':{'in':1},'behind':{'and':1,'both':1,'them':1,'it--a':2,'it':2,'us':1,'.':2,'while':1,'the':5},'chimpanzees':{'photos':1,'233':1,'but':1,'in':1},'radiated':{'away':2,'by':1,'in':1},'accustomed':{'to':2},'reading':{'of':1,'the':1,'ourselves':1,'anything':1,'or':1},'across':{'a':3,'space':3,'it':2,'the':11,'its':1,'empty':1},'roentgen':{'discovered':2,'s':1},'deletions':{'to':1},'august':{'1922':1,'1924':1},'parent':{'on':1,'of':5,'colony':1,'s':2,'has':1,'until':1},'parental':{'care.':1,'call':1,'care':17},'ascribed':{'the':1},'sea.':{'the':3,'2':2,'conquest':1,'proterozoic':1,'land':1},'tree-lizards':{'tree-kangaroos':1},'killing':{'and':2,'out':1},'dates':{'we':1,'from':3,'except':1,'varying':1},'vaporous':{'matter':1},'feelers':{'whereas':1},'diameter.':{'the':1,'innumerable':1},'diamond.':{'as':1},'according':{'to':24},'disappointment':{'when':1},'among':{'strongly':1,'all':1,'aquatic':1,'simple':1,'domestic':1,'them':1,'spiders':1,'domesticated':1,'birds':1,'cuttlefishes':1,'terrestrial':1,'lizards':1,'animals--by':1,'other':1,'which':2,'plant':1,'mammals':1,'mammals.':1,'dissimilars':1,'animals':4,'monkeys':1,'plants':3,'backboned':1,'this':1,'cosmic':1,'sand':1,'kindred':2,'the':21},'stretches':{'of':3,'from':1},'mound-birds':{'of':1,'young':1},'terse':{'and':1},'function--we':{'may':1},'flower-vase':{'well':1},'parachutists':{'and':1,'climbers':1},'maintained':{'this':1,'that':2,'by':1,'in':1},'stretched':{'in':1},'spans':{'the':1},'associated':{'a':1,'files':1,'his':1,'is':1,'enlargement':1,'reduction':1,'in':3,'the':2,'with':17},'reason--lays':{'her':1},'technicalities':{'.':1,'in':1},'considering':{'the':3},'sensible':{'things':1},'millimetre':{'and':1,'is':1},'caricature':{'of':1},'capable':{'of':3},'one-celled':{'plants--paint':1,'marine':2,'organism':1,'animal':1,'animalcules':1},'conditions.':{'illustration':2},'wilkinson.':{'jackdaw':1,'two':1},'mark':{'races':1,'individuals':1,'.':1},'attaching':{'too':1},'marked.':{'it':1},'mars':{'and':7,'is':3,'it':1,'maintained':1,'jupiter':1,'at':1,'141.5':1,'in':1,'there':1,'29':1,'.':2,'to':1,'going':1,';':1,'showing':1,'on':1,'october':1,'as':1,'were':1,'--jupiter':1,'the':1,'makes':1,'are':1},'tree-shrews':{'tupaia':1,'tree-mice':1,'hedgehog':1},'fiftieth':{'trip':1},'educated':{'who':1},'nautilus.':{'keen':1},'offered':{'some':1,'by':2,'for':1},'suns.':{'our':1},'dangerous':{'and':1,'to':1,'motto':1,'days':1,'maladies':1},'gripped':{'and':1,'in':1},'hippolyte':{'of':1,'which':1},'cod-banks':{'is':1},'dramatic':{'discoveries':1},'wake':{'of':1},'it.':{'the':1,'there':1,'whereupon':1,'other':1,'sun-spots':1},'captivity':{'has':1,'.':1},'sound':{'and':1,'conception':1,'though':1,'of':3,'.':3,'travels':1,'cannot':1,'another':1,'consists':1,'has':1,'judgment':1,'or':1},'turtles':{'and':3,'lay':1,'have':1,'which':1},'cannonade':{'of':1},'humming-bird':{'moths':1},'promising':{'wild':1,'a':1,'as':1,'.':1},'awakened':{'from':1},'margin':{'of':3,'are':1,'interlock':1},'luidia':{'which':1},'eventually':{'there':1,'like':1,'formed':1,'it':1,'to':3,'succeed':1,'they':1,'the':1,'creep':1,'after':1},'characteristics':{'of':2,'which':1,'e.g':1},'sleeping':{'prawns':1,'sickness':5},'strain':{'and':1},'sudden':{'and':2,'protrusion':1,'throwing':1,'irruption':1,'irritation':1,'withdrawal':1,'beginning':1,'acquisition':1,'movement':1},'tse-tse':{'fly':3},'dangerously':{'.':1},'ferns':{'conifers':1},'jackdaw':{'is':1,'balancing':2},'everyday':{'functions':1,'life':1,'intellectual':1,'bodily':1,'routine':1,'conditions':1},'movements':{'and':7,'on':1,'by':2,'that':3,'of':7,'is':1,'should':1,'how':1,'as':1,'implied':1,'are':2,'which':2,'in':1,'.':1,'until':1},'bags':{'of':1},'different':{'and':1,'set':1,'physiological':1,'methods':1,'instruments':1,'wave-lengths':2,'ages':1,'metals':1,'fellow':1,'rate':1,'manner':1,'times.':1,'in':3,'kinds':9,'as':1,'colours':5,'functions':1,'rays':1,'from':7,'ways':3,'relations':1,'.':3,'forms':1,'parts':1,'rates':1,'sedimentary':1,'105':1,'degrees':2,'main':1,'sections':1,'temperature.':1,'tacks':2,'idea--of':1,'aspects':1,'substances':4,'solution':1,'lines.':1,'groups':1,'fishes':1,'world':2,'rivers':1,'types':3,'areas':1,'lengths':2,'sizes':1,'this':1,'habitat-zones':1,'countries':2,'lines':2,'haunts':1,'thicknesses':1,'patterns':1,'length':1,'levels':2,'velocities':1,'latitudes':1,'terms':1},'paw':{'and':1,'to':1,'in':1},'pay':{'a':1,'out':1,'no':1},'oven':{'at':1},'same':{'and':1,'impression':1,'macaque':1,'facility':1,'appearance':1,'is':7,'table':1,'primary':2,'general':1,'attitude':2,'mistakes':1,'in':1,'bones':1,'corner':1,'face':3,'speed':1,'disadvantage--a':1,'as':3,'size':1,'story':1,'rays':1,'temperature':2,'opaque':1,'interesting':1,'nature':1,'proportion':1,'.':2,'state':1,'experiment':1,'way':9,'must':1,'conditions':1,'side':2,'foundation':1,'sex':1,'animal':1,'power':1,'format':1,'nest':1,'material':1,'gas':2,'effect':1,'period':1,'moment':1,'everywhere':1,'waves':1,'stem':1,'distance.':1,'day':1,'change':1,'stage':1,'kind':3,'type':1,'lines':1,'shape':1,'element':1,'magnet':1,'thing':1,'place':1,'principle':1,'fundamental':1,'time':8,'species':1,'applies':1,'table.':1,'essential':1},'eggs--up':{'towards':1},'thinning':{'of':1},'speech':{'.':1},'arguments':{'on':1,'.':1},'--all':{'the':1},'played--for':{'better':1},'intermediary':{'associative':1},'movement.':{'under':1},'extended':{'on':1,'tail':1,'from':1,'the':1,'their':1},'73000':{'10':1},'prominences':{'22':1,'these':1,'of':1,'which':3,'seen':2,'shooting':1,'ever':1},'assist':{'in':1},'companion':{'and':1},'running':{'on':2,'from':1,'no':1,'birds':1,'water':1,'leap':1,'leaps':1,'down.':2,'across':1,'down':2},'dynamo.':{'by':1,'illustration':1},'driven':{'outward':1,'by':2},'is--should':{'evolve':1},'waves.':{'the':1},'ripening':{'hard':1},'break':{'out':1,'up':2,'one':1},'largely':{'a':2,'feed':1,'based':1,'due':2,'with':1,'by':1},'roughly':{'group':1},'spoonful':{'of':1},'objection':{'there':1},'frontispiece':{'laplace':1,'.':1},'bottle':{'containing':1,'upside':1},'repulsive':{'or':1},'consisted':{'of':5,'only':2,'in':1},'generalisation':{'that':1},'money':{'paid':2,'if':1},'adjustments':{'which':1},'egg-cell':{'a':1,'certain':1,'within':1,'.':3,'fertilised':1,'in':1,'with':2,'divides':1},'down-drifting':{'food':1},'aspect':{'of':5,'can':1},'multiples':{'of':1},'sprang':{'the':1,'from':4,'but':1},'pinkish':{'eggs':1},'beagle':{'voyage':1},'crocodiles':{'and':1,'a':1,'there':1,'bury':1},'dipper':{'and':1,'or':1},'4':{'and':4,'another':1,'our':1,'living':1,'depict':1,'from':1,'tentative':1,'there':1,'.':11,'1':1,'500':1,'chromosomes':3,'information':1,'forming':1,'000':1,'external':1,'by':2,'a':2,'likeness':1,'this':1,'neptune':1,'the':6,'drawing':1},'grating':{'instead':1,'is':1},'pupa':{'stage':1},'extensive':{'repertory.':1},'heavier':{'to':1,'the':1,'materials':2,'more':1,'atoms':1},'pill':{'fizzing':1},'grip':{'and':1,'the':3},'1914.':{'baby':1,'4':1,'nos':1},'bitterling':{'cannot':1,'rhodeus':2},'tenses':{'.':1},'dissected':{'out':1},'tissues':{'and':1,'no':1,'of':1,'.':1,'to':1,'are':1,'or':1},'sight.':{'the':1},'water-measurers':{'in':1},'long-haired':{'angoras':1},'disadvantageous':{'dints':1},'aiming':{'at':1},'blankets':{'otherwise':1},'thames':{'gravels':1},'vertically':{'through':1},'dingo':{'or':2},'identifying':{'a':1,'different':1,'substances':1},'brain-development':{';':1},'serves':{'as':5},'lightning':{'278':1,'of':1,'in':1,'.':1},'facing':{'towards':1,'page':1},'chamber':{'only':1,'that':1},'behaviour-variations':{'which':1},'nose':{'that':1},'spinthariscope':{'making':1},'ascends':{'to':1,'into':1},'hunterian':{'professor':1},'mimicry.':{'colour':1},'flattely':{'and':1},'reveals':{'to':1,'the':2,'about':1},'alternately':{'and':1},'titan':{'a':1},'ascend':{'to':1,'the':2},'second.':{'their':1,'the':2,'sir':1},'specified':{'in':2},'images':{'of':1,';':1},'pasture':{'.':2},'ascent':{'of':7,'.':2,'not':1,'the':1,'by':1,'170':1},'gross':{'profits':1},'entities':{'of':1,'really':1,'.':1,'in':1},'apprenticeship--an':{'apprenticeship':1},'bubbles.':{'illustration':1},'footing':{'on':1},'fluids':{'and':1,'.':1},'considers':{'is':1},'pioneer':{'scorpion':1,'backboned':1,'animal':1},'critical':{'scientific':1,'discussion':1,'to':1,'time':1,'velocity':1,'spirit':1,'testings':1},'lunar':{'dawn':1,'apennines':1},'expressing':{'themselves':1,'or':1,'judgments':1,'feelings':1},'pipes':{'from':1,'by':1},'aboriginal':{'races':1},'rooks':{'and':1,'nests':1,'deal':1},'measuring':{'the':1,'does':1,'from':1,'it':2},'prerogative.':{'the':1},'buckling':{'up':1},'seconds':{';':1,'later':1,'takes':1,'.':2},'manufactured':{'by':1},'each':{'and':1,'other.':2,'foot':1,'pole':1,'constituent':1,'limb':1,'subject':1,'standing':1,'variety':1,'distinct':1,'incipient':1,'flash':1,'spiral':1,'.':2,'cell':2,'to':1,'prism':1,'other':9,'brick':1,'is':2,'foot.':1,'body':1,'star':1,'sinks':1,'molecule':1,'kind':2,'electrified':1,'electron':1,'descending':1,'atom':2,'date':1,'article':1,'with':3,'case':1,'independently':1,'substance':1,'particle':2,'of':11,'age':1,'tenanted':1,'metal':1,'element':2,'wave-length':1,'shade':2,'about':3,'side':1,'limb.':1},'notable':{'differences':1,'was':1,'feature':3,'power':1},'unusual':{'circumstances':1},'notably':{'the':3,'to-day':1,'planarians':1,'those':1},'trials':{'was':1},'arithmetical':{'question':1},'refers':{'to':1,'in':1},'stock--some':{'of':1},'psychical':{'level.':1,'research':1},'staff.':{'please':1},'stations':{'.':1},'instantaneously':{'into':1,'.':1,'he':1},'fringe':{'round':1},'insect':{'living':1,'lived':1,'flight':1,'larvae':3,'may':1,'is':1,'.':1,'visitors':3,'s':6,'lighting':1,'are':1,'pierces':1,'has':1,'with':1},'mixes':{'with':1},'practical':{'proposal':1,'judgments':1,'interest':1,'disappearance':1},'pockets':{'on':2},'west':{'of':1,'indian':1,'salt':1,'at':1,'coast':1},'corals':{'and':1,'worms':1,'which':1},'lasting':{'power':1},'provisional':{'picture':1},'road':{'home':1},'cautions':{'to':1},'lands':{'and':1,'in':1},'fertile':{'soil':1,'land':1,'meadows':1},'sea-grass':{'a':1,'area.':1,'red':1},'spreading':{'over':1,'meadows':1},'bountiful':{'and':1},'mills.':{'sir':1,'professor':1},'haddon':{'a':2},'gambiense':{'very':1,'69':1},'einstein':{'s':1,'has':1,'the':1,'who':1},'shortening':{'of':2,'the':1},'bon':{'has':1},'shells':{'of':1,'keeping':1,'are':3,'like':1},'camouflaging':{'giving':2,'and':1,'but':1},'brute':{'associates.':1,'man':1},'appears':{'on':1,'melancholy':1,'that':2,'to':1,'therefore':1,'the':1,'or':1},'caterpillars':{'and':2,'of':1,'to':1,'through':1,'they':1,'fasten':1},'laboriously':{'manufacture':1,'taught':1},'deepened':{'interest':1},'granules':{'and':1,'are':2},'unsettled':{'parts':1},'strikes':{'these':1,'the':1,'it':1},'white.':{'and':1,'banded':1},'trouble--an':{'instance':1},'land.':{'ages':1,'illustration':1,'getting':1},'spice':{'of':1},'arranged':{'his':1,'in':5},'romantic':{'and':1},'reflex':{'arc':2,'actions':8,'.':1,'action.':1,'action':4,'response':1,'chains':1,'than':1},'vice':{'versa':1},'dordogne':{'galley':1},'arranges':{'the':1},'pre-cambrian':{'eras':1},'blackbird':{'a':1},'shell.':{'the':1,'sec':1},'mimicked.':{'the':1},'moles':{'freshwater':1,'are':1},'affection':{'for':1,'.':1},'celestial':{'objects':1},'deliberation':{'and':1},'travailing':{'becomes':1,';':1,'of':1},'fanwise':{'to':1},'deer':{'of':1,'rabbit':1},'body-making':{'is':1},'deep':{'and':1,'water':2,'cups':1,'retreat.':1,'waters':3,'isolated':1,'waters.':1,'dark':1,'reason':1,'so':1,'sea':6,'in':2,'sea--the':1,'borings':1,'cold':1,'difference':1,'lake':1,'lying':1},'general':{'and':1,'impression':1,'outlook':1,'glare':1,'features':1,'symmetry':1,'trend':1,'life':1,'statements':1,'information':1,'question':1,'ideas':7,'relations':1,'statement':1,'significance':1,'public':2,'conclusion':1,'direction':1,'terms':3,'way':5,'very':1,'reader':1,'agreement':1,'flattened':1,'astronomy':1,'outlines':1,'we':1,'colour':2,'lines':1,'rule':1,'method':1,'aim':1,'agreement.':1,'succession':1,'opinion':1,'fact':1},'imagination':{'to':1,'.':1,'of':2},'examine':{'one':1},'planets':{'and':5,'they':1,'back':1,'spinning':1,'including':1,'are':2,'in':1,'seem':1,'what':1,'from':1,'would':3,'.':4,'to':1,'drawn':2,'life':1,'showing':1,'but':1,'five':1,'besides':1,'put':3,'of':3,'together':1,'or':1,'venus':1,'round':1},'lifetime':{'will':1,'namely':1,'by':1,'.':1},'cables':{'but':1},'film':{'and':1,'of':3,'is':1,'cling':1,'on':1},'fill':{'every':3},'tedious':{'time':1},'again':{'and':6,'as':3,'are':1,'in':5,'from':1,'knowledge':1,'would':1,'there':3,'.':1,'to':2,'does':1,'recaptures':1,'meant':1,'be':1,'we':3,'after':1,'led':1,'elsewhere':1,'that':1,'becomes':1,'never':1,'but':1,'with':1,'for':1,'many':1,'the':5,'having':1},'gbnewby':{'pglaf.org':1},'retiring':{'disposition':1},'field':{'and':3,'around':1,'of':6,'is':2,'it':1,'.':2,'as':2,'book':1,'240':1,'seen':2},'prism':{'and':1,'we':2,'produces':1,'into':1,'.':3,'entering':1,'separates':1,'is':1},'unaccustomed':{'and':1},'salamanders':{'of':1},'carapaces':{'form':1},'lafayette':{'alsatian':1},'coughing':{'or':1},'shelter':{'and':1,'of':2,'with':1,'for':1},'planet.':{'so':1,'if':1},'deriving':{'their':1},'important':{'stones':1,'and':2,'because':1,'is':5,'idea':1,'general':1,'phase':1,'as':1,'in':2,'mill':1,'activity--that':1,'for':2,'to':6,'role':1,'parting':1,'was':1,'however':1,'part':4,'food-plants':1,'parasites':1,'than':1,'linkage':1,'acquisitions':1,'advance':1,'acquisition':1,'the':1,'fact':6},'itself.':{'forms':1,'of':1,'but':1,'in':1},'tackle':{'the':1},'rainbow-colour':{'.':1},'revolve':{'the':1,'round':2},'sun--a':{'kind':1},'sneeze':{'on':1,'.':1},'hoofed':{'mammals':2},'remote':{'aquatic':1,'star':1,'age':1,'antiquity':1,'future':1,'ancestors.':1,'the':1},'recapitulation':{'of':3},'casts':{'off':1},'innocent-looking':{'little':1},'burrow':{'becomes':1,'which':1,'in':1},'u':{'of':1,'the':1},'resembles':{'a':1},'ovary':{'.':1},'once':{'and':3,'adjusted':1,'useful':1,'one':1,'rotating':1,'understood':1,'in':8,'said':1,'.':1,'attained':1,'got':1,';':1,':':1,'was':2,'tell':1,'more':4,'dominant':1,'that':1,'very':2,'eight':1,'they':1,'represented':1,'a':2,'on':1,'made':1,'effective':1,'larger':1,'rule':1,'every':1,'pulled':1,'or':1},'starting':{'a':1,'new':2,'point':1,'of':1},'represent':{'the':1,'stars':1,'tentative':1},'pheasant':{'and':1,'for':1},'forget':{'the':1},'founder':{'of':1},'suns':{'many':2,'.':1,'in':1},'invariable':{'.':1},'worms':{'and':2,'like':1,'that':1,'sea-cucumbers':1,'of':1,'began':1,'but':1,'.':1,'notably':1,'to':3,'2':1,'starfishes':1,'were':1,'requires':1},'founded':{'on':1},'sunk':{'very':1,'into':1,'in':1},'cooperative':{'relations':1},'expressions':{'of':3,'have':1},'plodding':{'methods':1},'shattered':{'to':1},'red-hot':{'ball':1,'gas':2,'.':1},'brain-box':{'and':1},'inexhaustible':{'fountain':1,'floating':1,'stores':1},'former':{'.':1},'bushmen':{'.':1},'those':{'upper':1,'pieces':1,'produced':1,'excessively':1,'farther':1,'in':1,'fine':1,'whose':1,'two':1,'regions':1,'immense':1,'contained':1,'other':1,'which':3,'between':1,'open-sea':1,'we':2,'kinds':2,'elsewhere':1,'that':13,'mammals':1,'offered':1,'who':3,'problems':1,'provided':1,'now':1,'with':1,'sensational':1,'great':1,'made':1,'of':15,'days':1,'glittering':1,'called':1,'bodies':1,'at':1},'hideous':{'and':1},'turnips':{'devouring':1},'distorting':{'effect':1},'straightforward':{'.':1},'sitting':{'a':1,'among':1,'figure':1,'for':1,'156':1,'the':1},'worm.':{'the':1},'interglacial':{'period.':1,'period':1,'times':1,'times.':1,'.':1,'or':1},'sun.':{'a':1,'look':1,'this':1,'it':1,'illustration':1,'one':1,'to':1,'sec':1,'but':1,'our':1,'the':2,'laplace':1},'fall':{'a':1,'on':4,'casting':1,'is':2,'upon':2,'suggested':1,'together':1,'down':1,'without':1,'from':1,'into':4},'difference':{'and':2,'is':1,'between':4,'to':1,'saturates':1,'does':1,'in':2},'expulsive':{'force':1},'mild':{'current':1,'moist':1,'electric':1,'temperatures':1,'of':1},'forking':{'of':2},'washing':{'the':1},'benevolent':{'visitors':1},'skeletal':{'rod':1},'applicable':{'to':1,'state':1,'taxes':1},'grubs':{'and':1},'camouflaged.':{'the':1},'hollowed-out':{'cotton-reel':1},'inorganic':{'world':1,'evolution':7,'groaning':1},'economically':{';':1},'pterodactyl':{'and':1,'or':2,'wing':1},'range.':{'the':1},'selected.':{'illustration':1},'aristocrat':{'apple-trees':1},'zero':{'of':2},'perception':{'and':1,'of':1,'rapidity':1},'further':{'and':3,'slowing':1,'down':1,'books':1,'human':1,'out':1,'knowledge':1,'for':2,'opportunities':1,'experiment':1,'until':1,'revision':1,'advantage':1,'complicated':1,'with':1,'contraction':1,'inland':1,'heightened':1,'ahead':1,'found':1,'the':1,'discovery':1,'changes':1},'double-slide':{'plate':1,'plate-holder':1},'creatures':{'and':4,'appeared':1,'it':1,'sec':1,'are':3,'have':3,'in':2,'if':1,'living':1,'from':1,'varied':1,'to':1,'began':1,'there':1,'.':6,'superficially':1,'which':3,'return':1,'that':1,'may':2,'act':2,'upon':2,'but':1,'let':1,'penetrate':1,'not':1,'such':1,'with':3,'by':1,'a':1,'on':1,'like':3,'of':4,'make':2,'turn':1,'were':1,'dance':1,'the':2,'round':1},'cilia':{'shown':1,'when':1},'stood':{'in':1,'at':1,'round':1},'short-lived':{'fishes':1,'relic':1},'swamps':{'and':1,'low':1},'storks':{'and':1,'pelicans':1},'associate':{'certain':1,'the':1,'particular':1},'caffeine':{'and':1},'everlasting':{'hills.':1},'schoetensack':{'.':1},'movement':{'and':6,'all':1,'is':4,'at':1,'in':2,'251':1,'if':1,'from':1,'for':1,'recalling':1,'.':1,'which':1,';':1,'was':1,'but':1,'a':1,'on':1,'of':6,'creates':1,'can':1,'the':1,'or':1},'outgoing':{'tide':1},'malaria':{'rife':1,'respectively.':1,'from':1,'organism':2},'martians':{'draw':1},'compilation':{'of':1,'copyright':1},'calculates':{'that':1},'component':{'cells':1},'ranges':{'and':2},'favourable':{'for':1},'cylindrical':{'.':2},'operating':{'on':1},'capacities--limited':{'when':1},'standard':{'of':2,';':1},'advance--the':{'central':1},'search':{'of':1,'after':1,'for':1,'facility:':1,'.':2},'tortoise':{'and':1,'of':1,':':1,'in':1,'has':1},'ichneumon':{'grubs':1},'cock':{'with':1},'stretching':{'as':1,'from':1,'for':1},'gleams':{'of':2},'milky':{'way':15},'formation':{'of':7,'due':1,'ten':1,'in':1},'narrow':{'and':1,'core':2,'like':1,'zone':1,'crowded':1,'sheaf':1,'passage':2,'marshes':1},'beak-like':{'jaws':1},'pathological':{'variation':1},'splashes':{'in':1},'24.--the':{'great':1},'transit':{'instruments':1,'is':1,'no':1},'mastering':{'the':1},'africa':{'a':1,'and':1,'india':1,'but':1,'coloured':1,'to':1,'asia':2,';':1,'where':1},'fastening':{'them':1,'pieces':1},'most--control':{'freedom':1},'empties':{'are':1},'extinction':{'of':1,'in':1},'establish':{'themselves':2,'race':1},'readily':{'separated':1,'lifted':1,'because':1,'heard':1,'swamped':1,'classified':1,'utilised.':1,'evaporate':1,'.':1,'understood':1,'see':1,'seen':1,'captured':1},'eye':{'and':3,'sees':1,'is':1,'are':1,'in':1,'.':6,'birds':1,'there':1,'next':1,'to':1,'which':2,';':2,'has':1,'that':1,'may':1,'fell':1,'continued':1,'by':1,'these':1,'of':1,'can':1,'the':1,'glued':1},'uniformity':{'and':1},'distinct':{'and':2,'individuality':1,'elements':1,'from':2,'species.':1,'sensation':1,'ancestors--a':1,'as':1,'classes':1,'tails':1,'sparks':1,'species':1},'hillock':{'of':1},'wiped':{'out':1},'destination':{'and':1},'two':{'years':1,'straws':2,'fore-limbs':1,'fine':1,'feather-stars':1,'forms':1,'molecules':1,'main':2,'photographs':2,'moorhens':1,'doors':1,'very':1,'minute':1,'feet':3,'positions':1,'spiny':1,'humps':2,'lashes':1,'phenomena':1,'back':1,'elements':1,'magnets':1,'creatures':1,'fingers':2,'halves':1,'chimpanzees':1,'new':1,'revolved':1,'ends':2,'electricities':1,'answers':1,'atoms':2,'hours':3,'wave-motions':1,'terminals':1,'groups':4,'others':1,'quite':2,'come':1,'days':1,'opossums':2,'of':4,'months':2,'haunts':1,'extremes':1,'streams':1,'or':11,'comes':1,'reflected':1,'screens':1,'skeletons':1,'millions':1,'working':1,'spiral':1,'long':1,'.':3,'macaques':1,'stars':2,'which':1,'hundred':7,'fractions':1,'eyes':1,'inches':4,'painted':1,'thousand':3,'exactly':1,'races':1,'cases':2,'cells':1,'shelves':1,'classes':1,'minutes':1,'and':8,'suggestions':1,'metals':1,'pieces':2,'periods':1,'have':1,'in':1,'paths':1,'different':5,'perhaps':1,'things':1,'widely':1,'lithium':1,'centrosomes':1,'facts.':1,'wires':1,'kinds':6,'opposite':1,'eggs':1,'teeth':1,'sides':3,'types':3,'together':3,'chief':1,'points':3,'sets':2,'serious':1,'the':1,'bodies':2,'foetal':1},'comparing':{'these':1,'notes':1,'reptiles':1},'cultivation':{'of':1},'endowed':{'with':4,'monkeys':1},'raft':{'across':1},'ovules':{'within':1,'in':1},'lapland':{'.':1},'leisure.':{'along':1},'unlink':{'or':1},'ahead.':{'the':1},'diamond':{'the':1,'point':1,'267':1,'.':1},'staggering':{'.':1},'views--the':{'nature':1},'chimpanzee':{'and':3,'illustrating':2,'157':1,'sitting':2,'is':1,'there':1,'.':1,'gorilla':2,'s':2,'2':2,'238':1,'at':1,'the':1,'an':1,'called':1,'233':1},'magpies':{'coral-snakes':1},'controlling':{'his':1,'nerve-centres':1},'particular':{'they':1,'some':1,'paper':1,'substance.':1,'sounds':1,'things':2,'emotions':1,'colours':1,'instance':1,'state':1,'difficulties':1,'interest':1,'conditions':1,'crab':1,'combination':1,'men':1,'atoms':1,'words':1,'circumstances':1,'case':1,'kind':4,'spawning-pond':1,'items':1,'moorhen':1,'place':1,'piece':1,'order':1},'straight-haired':{'mongols':2},'it--radium.':{'that':1},'none':{'being':1,'of':6,'the':1,'knew':1,'.':1},'hour':{'passes':1,'later':1,'would':1,'radium':1,'after':1,'.':1,'at':1},'middle':{'and':1,'zone':1,'of':2,'pleistocene':1,'ages':1,'oligocene':1,'.':1,'eocene':1},'recall':{'the':3},'sucks':{'in':1,'its':1,'milk':1},'cochroaches':{'and':1},'guards':{'them':2,'the':1},'remain':{'true.':1,'to-day':1,'inert':1,'just':1,'very':1,'freely':1,'together':1,'quite':2,'coherent':1,'in':2,'latent':1,'ether':1,'glorious':1,'apart':1},'pressing':{'a':1},'taut':{';':1,'or':1,'membranes':1},'pink-flush':{'on':1},'nothing.':{'evolution':1,'it':1},'specialized':{'in':2},'marble':{'for':1},'deg':{'.':6},'stubborn':{'as':1},'compare':{'with':2,'the':1,'jupiter':1},'gravels':{'in':1},'share':{'of':2,'it':1,'appreciatively':1,'in':1},'shard':{'the':1},'sphere':{'of':1},'minimum':{'the':1,'without':1},'numbers':{'and':2,'go':1,'above':1,'of':4},'hours.':{'at':1},'sharp':{'mountain-top-like':1,'prickle':1,'mouth-parts':1,'teeth':1,'nip':1,'conical':1,'points':1},'robinson':{'showed':1},'needs':{'to':2,'with':1,'occurring':1},'awkward':{'situation':1,'alacrity':1,'feint':1},'receptacle':{'for':1},'1873-6':{'gave':1},'acts':{'on':1,'as':4,'upon':1,'in':1},'responsibilities':{'.':1},'procellaria':{'pelagica':2},'sacred':{'river-tortoises':1},'profiting':{'by':2},'stir':{'water':1},'ensemble':{'of':1},'indian':{'and':2,'islands':1,'macaque':1,'ocean':1},'advice':{'to':1},'genius.':{'illustration':1},'narrow-beaked':{'crab':1},'tangere':{'leave':1},'blood':{'and':1,'corpuscles':2,'from':1,'relationship':1,'of':5,'is':1,'never':1,'it':1,'throughout':1,'.':4,'to':1,'as':1,'goes':2,'injected':1,'the':1,'has':1,'bringing':1,'or':3},'polynesian':{'mariners':1},'coming':{'and':1,'from':1,'down':2,'to':1,'with':1,'by':1,'out':1},'bloom':{'with':1},'response':{'to':1,'the':1,'from':1},'alps':{'at':1},'reappeared':{'his':1},'crowded':{'meteors':1,'when':1,'with':1,'haunt':1,'difficult':1},'coat':{'to':1,'used':1,'helps':1},'eats':{'its':1},'dragon':{'the':1,'flying':1,'draco':1,'94':1},'coal':{'burns':1,'consider':1,'would':1,'supply':1,'derived':1,'deposits':1,'for':1,'which':1,'.':3,'or':1},'skilful':{'artificer':1},'playing':{'mammals':1,'is':1,'period':2,'possum':1,'the':1,'with':2},'covered':{'a':1,'great':1,'over':1,'all':1,'everything':1,'the':3},'chopped':{'earthworm':1},'infant':{'and':1,'s':1,'.':1,'about':1,'three':1},'rounded':{'skull':2},'winged':{'phase':1,'snails':1,'insect.':1},'much-disputed':{'lines':1},'hypertext':{'form':1},'quiet-looking':{'cloud':1},'lumpsucker':{'mounts':1,'guards':1},'through':{'and':2,'it':3,'one':1,'our':1,'any':2,'unthinkably':1,'space':1,'.':1,'which':3,'orange':1,'1.e.7':2,'them':3,'his':1,'trees':1,'estuaries':1,'every':1,'but':1,'denser':1,'contrasts':1,'an':4,'a':19,'stone':1,'glass':1,'these':2,'air':2,'this':2,'the':54,'stages':1,'its':3,'bodies':1},'lava':{'rising':1},'filters':{'and':1},'existence':{'what':1,'135':1,'of':6,'is':3,'it':1,'.':2,'namely':1,'without':1,'are':1,'animal':1,'in':2,';':1,'by':1,'as':1,'if':2},'visceral':{'clefts':2},'bell-like':{'blossoms':1},'soddy':{'has':1,'frederick':1,'have':1,'puts':1,'one':1},'24':{'the':1,'were':1},'25':{'and':1,'of':1,'trillions':1,'000':6},'26':{'and':1,'we':1,'000':2,'tons':1},'27':{'illustration:':1,'000':1},'thrilling':{'a':1,'story':1},'21':{'1914.':1,'.':1},'22':{'from':1,'would':1,'tons.':1,'yerkes':1,'miles':1,'2007':1},'sodium':{'is':1,'lines':1,'iron':2},'rigel':{'466':1},'physophora':{'hydrostatica':2},'28':{'the':1,'deg.-34':1,'mars':1},'29':{'1919':1,'a':1,'drawings':1,'1908':2,'1919.':1},'late':{'polished':1,'professor':3,'years':1,'autumn':1,'as':1,'triassic':1,'.':1},'detected':{'a':1,'anywhere':1},'microscopic':{'cilia':1,'burdens':1,'organisms':1,'food':1,'study':1,'globules':1,'fertilised':1,'animal':3,'each':1,'animals':1,'algae':1},'--and':{'that':1},'bugbear':{'it':1},'sheaves':{'in':1},'triumphantly':{'from':1},'beginnings.':{'our':1},'good':{'and':1,'atmosphere':1,'old':2,'deal':6,'reasons':1,'idea':1,'as':3,'seed':2,'in':1,'insulators':1,'will':1,'touches':1,'.':2,'instance':1,'samples':1,';':2,'conditions':1,'eyes':1,'send-off':2,'illustration':1,'reason':1,'restoration':1,'purpose':1,'pair':1,'many':1,'second':1,'example':2,'practical':1,'conductor--six':1,'temper':1,'heel':1},'seeking':{'rather':1,'automatically':1},'gardens.':{'the':1},'sappers':{'and':1},'noticing':{'the':1,'that':1},'walls':{'and':1,'of':6,'so':1,'are':1,'nor':1},'compound':{'reflex':2},'olcott':{'field':1},'detach':{'or':1},'struggling':{'too':1},'association':{'a':1,'established':1,'and':1,'of':2,'professor':1,'when':1,'to':1,'which':1,'between':1,'meeting':1},'limpet':{'s':1},'mystery':{'of':1,'they':1,'drowned':1,'.':1},'easily':{'tamed':1,'be':1,'acquiesce':1,'blown':1,'supported':1,'washed':1,'selected.':1,'called':1,'as':1,'disturbed':1,'part':1,'seen':1,'get':1,'find':1,'comply':1},'deteriorates':{'.':1},'fish-like':{'characters':1},'evade':{'the':3},'abdomen--for':{'the':1},'ashes':{'of':1},'habits':{'and':5,'all':1,'there':1,'.':2,'while':1,'which':1,';':1},'2a':{'orohippus':1},'repeating':{'the':1},'possession.':{'if':1},'exquisite':{'tactility':1,'refinements':1},'horsetail':{'and':1},'harm':{'in':1},'everyone':{'is':2,'who':2,'recognises':1,'knows':1},'mental':{'activities':1,'life':2,'endeavour':1,'ability':1,'inheritance':1,'pictures':1,'subtlety':1,'life;':1,'equipment':2,'experimenting':1,'health':1,'aspect':1,'activity':1,'images':1,'aspect.':1,'mill':1,'endowment':1,'side':2,'powers':1,'qualities':1},'hundred':{'and':2,'trillion':4,'varieties':1,'strokes':1,'of':1,'thousand':2,'million':4,'years':2,'ways':1,'planetoids':1,'degrees':2,'stars':1,'in':1,'miles':3,'the':1,'times':1,'odd':1,'generations.':1,'millions':1},'hare':{'willow':2,'it':1,'.':1,'may':1,'s':1,'in':2,'the':1,'or':1},'hard':{'and':2,'saying':1,'work':2,'times':1,'substratum':1,'to':4,'in':2,'legs':1,'or':1,'red':2},'idea':{'that':4,'of':13,'is':1,'but':1,'how':1,'has':1,'was':1,'or':1},'foxes':{'and':2,'stoats':1},'macmillan':{'the':2,'.':4},'oil':{'on':2,'from':1,'is':1,'upon':1,'down':1,'must':1},'schuchert':{'again:':1,'s':1},'connect':{'them':1},'ripple':{'of':1},'hart':{'the':1,'is':1},'antarctic':{'circle--which':1,'shore':1},'shoulders.':{'the':1},'flower':{'and':4,'puts':1,'is':1,'.':1,'basket':3,'collects':1},'associations.':{'there':1},'pigeon':{'a':1,'because':1,'212':2,'gliding':1,'is':1,'continues':1,'s':1,'but':1,'brooding':1,'carrier':1,'which':1},'acting':{'on':3,'upon':2},'49.4':{'rigel':1},'flowed':{'along':1},'print':{'editions':1},'three-quarter':{'days':1},'waterholes':{'full':1},'rejuvenescence':{'e.g':1},'circumstance':{'that':1},'dealt':{'with.':1,'with':6},'extraordinary':{'protrusion':1,'strength':1,'proceeding':1,'power':1,'variety':1,'educability':1,'things':2,'results':1,'vigour':1,'therefore':1,'interest':1,'outbursts':1,'properties':1,'adaptability':1},'terminals':{'thus':1,'.':1},'members':{'of':12,'at':1},'backed':{'by':3},'entrancing':{'interest.':1},'beginning':{'again':1,'for':1,'this':1,'of':35,'when':1,'it':1,'.':1,'to':5,'at':1,'in':2,'was':2,'with':2},'poles.':{'our':1,'there':1},'demands.':{'as':1},'snails':{'various':1,'or':1},'omit':{'one':1},'brain...':{'.':1},'audacity':{'to':1},'72-inch':{'reflector':1},'varanus':{'139':1,'the':1},'down--sometimes':{'dangerously':1},'exercising':{'the':1},'reinforced':{'by':1},'copper':{'and':1,'wires':1,'coin--smaller':1,'that':1,'immersed':1,'in':1,'together':1,'.':1,'age.':1,'wire':3,'zinc':2,'were':1,'beech':1,'age':1,'is':5,'came':1},'bullies':{'of':1},'disregarded':{'only':1},'instances':{'of':1,'where':1,'must':1},'7918':{'1':1},'done':{'is':1,'.':1,'to':1,'as':1,'with':1,'by':1},'vibrate':{'about':1,'.':1,'in':1},'climbing':{'grasping':1,'up':1},'cups':{'whereas':1},'island-universes':{'they':1},'family.':{'viviparity':1},'light-gatherer':{'.':1},'construct':{'a':2},'hollows':{'of':1},'obligatory':{'movements':1},'183':{'evolutionary':1},'assumption':{'of':2},'186':{'photograph':1,'nautilus':1,'shoebill':1,'000':7},'187':{'photo':1},'statement':{'will':1,'that':4,'often':1,'in':1},'185':{'000':1},'rates':{'.':1},'compartment':{'a':1,'b':1,'was':1},'too':{'faint':3,'plainly':1,'simple':1,'soon':2,'high':2,'inhospitable':1,'cold':3,'thick':1,'stingy':1,'easygoing':1,'little':1,'deeply':1,'there':1,'long':1,'hot':2,'much':6,'sheltered':1,'was':1,'complete':1,'shallow':1,'generous':1,'complicated':1,'closely':1,'precious':1,'great':1,'short':1,'large':1,'severe':1,'were':2,'small':2,'serious':1,'soft':1},'muscles':{'and':4,'of':2,'to':1,'going':1,'are':1,'which':1,'in':1,'than':1,'at':1},'travail':{'of':1},'lightest':{'hydrogen':1,'atom':2},'needle':{'on':1,'magnified.':1,'.':1},'park':{'in':1},'procession':{'of':3,'or':1},'part':{'the':1,'corresponding':1,'for':1,'vaporised':1,'of':54,'into':1,'in':3,'.':1,'to':3,'at':1,'under':1,'obscure':1,'with':4,'company':1},'parr':{'become':1,'about':1,'which':1},'prodigious':{'expulsive':1,'speed--and':1,'speed.':1,'outpour':1,'quantities':1,'age':1,'.':1,'scale.':1,'rapidity':2},'selenium-cell':{'which':1},'believe':{'that':11,'in':1,'an':1,'to':1,'were':1,'the':1,'by':1},'don.':{'it':1},'jump':{'at':1,'out':1},'supposes':{'that':2},'b':{'c':1,'that':1,'of':1,'showing':1,'there':1,'when':2,'it':1,'.':7,'in':1,'some':1,'alteration':1,'others':1},'parent--little':{'likely':1},'damages':{'even':1,'costs':1,'-':1},'clodd':{'story':1},'866':{'000':1},'recording':{'of':1},'dissection--or':{'screwing':1},'totteringly':{'for':1},'supposed':{'that':4,'dead':1,'to':4,'indication':1,'have':1,'the':1,'he':1},'messrs.':{'macmillan':3},'treated':{'merely':1},'anthropoid':{'embryo':1,'stock--common':1,'apes':7,'apes--the':3,'type.':1,'apes.':1,'ape':4},'rhacophorus':{'that':1},'efface':{'itself':1},'trifles':{'felted':1},'pre-existing':{'organisms':1},'ages':{'and':3,'set':1,'afterwards':1,'is':1,'sec':2,'in':1,'before':1,'living':1,'organisms':1,'there':1,'had':1,'.':4,'to':2,'which':3,';':2,'has':1,'was':1,'be':1,'we':1,'passed':6,'necessity':1,'along':1,'he':1,'ago':2,'many':1,'of':1,'the':3,'or':1},'left-handed':{'vortices':1},'egg.':{'very':1,'8':1,'3':1},'paltry':{'pigmies':1},'agee':{'when':1},'confirms':{'our':1},'fading':{'away':1},'paths':{'a':1,'of':1,'round':1,'pursued':1},'acid':{'and':1,'water':1,'indigo':1,'caffeine':1},'built':{'a':1,'and':1,'elastic':1,'on':1,'of':1,'up':10,'as':1,';':1,'with':1},'depending':{'upon':1},'trip':{'sideways':1,'which':1},'majority':{'of':7,'is':1,'are':1},'lifts':{'a':2,'the':1},'build':{'a':2,'up':5,'but':1},'deepening':{'hold':1},'sea-perches':{'live':1},'facts.':{'sec':1},'unpalatability':{'or':1},'easygoing':{'kind':1,'conditions':2,'the':1,'swimmers--for':1},'capillaries':{'of':1},'sciences.':{'the':1,'it':1},'eggs':{'and':5,'into':1,'are':2,'have':1,'in':7,'close':1,'during':1,'lie':1,'develop':3,'perhaps':1,'two':1,'.':5,'to':1,'only':1,'which':4,';':1,'77':1,'i.e':1,'with':1,'by':2,'a':1,'on':1,'of':2,'inside':2,'attached':1,'were':1,'or':4},'trains':{'lit':1,'of':1,'and':1},'salmon':{'spawn':2,'do':1,'in':1,'of':1,'is':1,'196':1,'surmounting':1,'leaping':2,'.':1,'1':1,'s':1,'keeps':1,'fry':1,'still':1,'was':1,'or':1,'as':2},'tail-feathers':{'braced':1},'took':{'origin':1,'a':1,'his':1,'longer':1,'advantage':2,'no':1,'flying':1,'up':1,'element':1,'as':1,'place':2,'so':1,'the':2},'depths':{'of':4,'showing':1,'119':1,';':1,'whence':1},'most':{'obdurate':1,'beautiful':2,'primitive':4,'debased':2,'remarkable':4,'people':4,'powerful':4,'valuable':1,'far-reaching':1,'multicellular':1,'bones':1,'inconspicuous':1,'diverse':1,'distant':3,'commonly':1,'abstruse':1,'intricate':1,'fishes':1,'birds':2,'resourceful':1,'impressive':2,'living':1,'salient':1,'daring':1,'patent':1,'interesting':2,'favour':1,'chemical':1,'to':1,'complex':1,'attractive':1,'laborious':1,'mammals':2,'mysterious':3,'promise.':1,'important':8,'difficult':1,'we':1,'popularly':1,'general':1,'scientific':1,'spectacular':2,'intimate':1,'successful':1,'familiar':1,'apparent':1,'convincing':1,'significant':1,'notably':1,'eminent':2,'part':1,'enduring':1,'recent':1,'authorities':1,'cases':9,'trying':1,'monkeys':1,'fascinating':2,'puzzling':1,'a':1,'land':1,'animals':2,'playsomest':1,'effective':2,'famous':1,'marvellous':1,'of':16,'signal':1,'countries':1,'metals':1,'enemies.':1,'distinguished':3,'project':1,'solid':2,'severe':1,'dramatic':1,'tempting':1,'distinctive':1,'ancient':3,'astonishing':1,'essential':1,'extraordinary':1},'petromyzon':{'marinus':2},'significant':{'as':1,'periods':1},'fluctuate':{'the':1},'branching':{'air-tubes':1},'transmissibility':{'of':1},'charitable':{'donations':1},'seething':{'foam':1,'mass':1,'vapours':1},'mammoth':{'drawn':2,'tube':1,'woolly':1,'age':1,'the':1},'weigh':{'a':2,'about':1,'only':1,'them':1,'approximately':1},'overcrowding':{'of':2},'organism':{'explores':1,'reproduced':1,'that':1,'may':1,'is':2,'acts':1,'which':1,';':1,'plays':1,'the':2,'its':1},'thomas':{'henry':2},'secrets.':{'the':1},'particularly':{'rich':1,'characteristic':1,'fond':1,'disposed':1,'important':1,'suited':1,'in':1,'memorable':1},'217':{'the':1},'obligations':{'and':1,'has':1},'fins':{'and':1,'on':1,'used':1,'of':1,'as':1,'taut':2},'scattered':{'the':1,'throughout':1,'was':1,'hither':1,'in':1},'converge':{'in':1},'wasted':{'in':1,'.':1},'shore-pool.':{'sec':1},'relation':{'to':3,'between':3},'carefully':{'just':1,'read':1,'there':1,'considered':1,'examine':1,'drawn':2},'212':{'photo':2},'amphibians.':{'as':1,'palaeozoic':1,'in':1},'fine':{'art':1,'crown':1,'results':1,'textbook':1,'powder':1,'suspended':1,'children':1,'creatures':1,'bulbs':1,'inequalities':1,'particles':2,'enough':1,'details':1,'vapour-like':1,'specimens':1,'product':1,'description':1,'brains':1,'time-recording':1,'translucent':1,'cross-striped':1,'photograph':1,'sections':1,'work':1,'balance':1,'example':1},'find':{'all':1,'some':1,'it':2,'in':3,'any':1,'out':4,'no':2,'two':1,'their':2,'enough':1,'much':1,'if':1,'reflex':1,'them':1,'that':11,'they':1,'included':1,'by':2,'a':4,'none':1,'these':2,'solid':1,'the':5},'downward-projecting':{'sharp':1},'giant':{'recently':1,'instruments':1,'spiral':3,'amphibians':1,'planet':1,'amoeba':1,'reptiles':2,'stars':1,'elephant':1,'whirlpools':1,'reptiles.':1},'double.':{'after':1},'depended':{'and':1,'on':1},'dividing':{'the':1,'into':2,'themselves':1,'as':1},'nervous':{'disturbance':1,'restlessness':1,'system.':1,'system':4,'excitement':1,'rhythm.':1},'bird--was':{'about':1},'distributed':{'old-fashioned':1,'project':1,'to':1,'proofreading':2,'in':1,'throughout':1,'by':1},'unhappy':{'over':1},'lockyer':{'sir':1,'detected':1,'pointed':1},'convoluted':{'.':1},'eruptions':{'at':1},'credulous':{'and':1},'8':{'and':1,'with':1,'there':1,'.':2,'in.':1,'other':1,'100':1,'minutes':2},'gills':{'again':1,'except':1,'.':3,'are':1,'which':2,';':3},'stringops':{'and':1},'merged':{'into':1},'indetal':{'is':1},'forreri':{'which':2},'dust':{'and':1,'no':1,'of':4,'.':2,'to':1,'at':1,'although':1,'in':5},'permission':{'and':1,'from':8,'for':1,'of':15,'.':1,'in':1},'express':{'a':2,'and':1,'the':1,'themselves':1,'or':1},'water-vole':{'and':1},'shore-pools':{'and':2,'makes':1,'in':1},'cheaper':{'.':1},'courage':{'and':1},'breast':{'pocket':1},'silk':{'tassel':4,'from':1,'handkerchief':1,'.':2,'threads':1,'across':1},'target':{'on':1},'transitional':{'experience':1,'between':1},'experiments.':{'illustration':1},'freedom.':{'the':1},'doubled':{'straw':1,'their':1,'over':1},'1825-95':{'86':1,'one':1},'common':{'and':1,'among':1,'habit':1,'is':1,'in':1,'at':2,'sense':1,'insectivore':1,'knowledge':1,'to':4,'chameleon':2,'foraminifer':2,'frog':1,'.':1,'hydra':1,'assumption':1,'animal':1,'chaffinch':1,'stock':1,'mud-skipper':1,'starfish':2,'centre':1,'showing':1,'ancestry--are':1,'shore-crab':2,'objects':2,'drone-fly':1,'from':1,'telescopes':1,'otter':2,'accident':1,'basis':1,'eel':3,'ancestry':1},'doubles':{'of':1},'experiments;':{'and':1},'immigrants':{'from':1},'tended':{'to':2},'disc-like':{'collection':1},'lion':{'.':1},'individual':{'is':1,'life':2,'at':1,'in':1,'movements':1,'from':1,'stands':1,'opportunities':1,'to':1,'stars':1,'has':1,'development':6,'variability':1,'plant':1,'hairs':1,'but':1,'atoms':1,'nurture':1,'types':1,'these':1,'work':1,'experience':3,'liberty':1,'project':2,'habits':1,'can':1,'the':1,'works':1,'ears':1},'starfishes':{'is':1,'spend':1,'sea-urchins':1},'medley':{'of':1},'long-fingered':{'pterodactyl':1},'tender':{'plant':1,'all':1},'forthcoming':{'for':1},'hole':{'and':2,'is':2,'before':1,'only':1,'in':1},'rays.':{'illustration':1},'gunnel':{'escape':1},'degree':{'of':12,'an':1,'which':1,'in':1,'not':1,'the':1,'.':1,'than':2},'halved':{'along':1},'please':{'read':1,'visit':1,'check':1},'splendidly':{'active':1},'halves':{'of':1,'the':1},'smallest':{'particle':2,'web-footed':1,'atom.':1,'french':1,'atom':2,'known':1},'planarians':{'and':1},'vascular':{'hood':2,'tufts':1},'to.':{'during':1},'mouthful':{'of':1},'donate':{'royalties':1,'section':1,'please':1},'sexual':{'reproduction':2},'beetling':{'ape-like':1,'eyebrows':1,'brows':1,'eyebrow':2},'historical':{'evolution':1,'succession':1,'or':1,'fact':1,'evidence':1},'masterful':{'more':1},'deliberately':{'selecting':1},'vanishing':{'mammals':1},'half-hour':{'longer':1},'reverse':{'the':1,'.':1},'journeyed':{'three':1},'annual':{'amount':1},'sons.':{'professor':1,'skeletons':1},'foreign':{'elements':1},'quadruped':{'.':1},'protopterus':{'91':1,'it':1},'elliot':{'fry':1},'point':{'and':1,'on':3,'we':1,'to':9,'that':1,'very':1,'of':9,'is':7,'though':1,'it':1,'.':5,'sound':1,'let':1,'the':3,'forty-five':1,'where':1,'out':1},'simple':{'protists':1,'and':2,'calculation':1,'instincts':1,'worms':1,'one':1,'multicellular':1,'as':1,'bibliographies':1,'creatures':3,'living':1,'many-celled':1,'one-celled':1,'there':1,'ideas':1,'process':1,'book':1,'electrical':1,'animal':1,'maze':2,';':1,'reflex':3,'sort':2,'experiment':1,'worm-types.':1,'that':1,'labyrinth':1,'but':2,'wave':1,'consideration':1,'cases':1,'flagellates':1,'outline':1,'tentatives':1,'form':1,'beginnings':1,'problem':1,'piece':1,'predatory':1},'unremitting':{'vibration':1},'smother':{'many':1},'knipe':{'s':6},'newborn':{'earth--the':1,'cuttlefish':1,'pigling':1},'electrons.':{'this':1,'when':1,'sec':1,'it':1,'illustration':1},'simply':{'a':1,'because':1,'that':2,'to':1,'thin':1,'with':1,'told':2},'unsuccessful':{'movements':1},'zeta':{'orionis':2},'throughout':{'and':1,'set':1,'that':1,'to':1,'the':13,'numerous':1,'its':1},'suppressing':{'useless':1},'expensive':{'and':1},'transformations':{'of':1},'meteorite':{'i.e':1,'or':1,'which':3},'create':{'fresh':1,'are':1,'or':2},'vertebrate':{'race':1,'at':1,'characters':1},'screened':{'the':1},'rivals':{'a':1,'in':2},'secret':{'of':6,'under':1,'from':1,'was':1,'phosphorus':1},'dropping':{'on':1},'stoat':{'becomes':1},'experiments--indications':{'of':1},'astonishment':{'a':1},'slips':{'down':1},'doles':{'of':1},'gas':{'and':3,'shot':1,'less':1,'expanding':1,'is':1,'it':1,'four':1,'as':1,'at':1,'in':3,'still':1,'would':1,'no':2,'there':1,'when':1,'.':2,'glowing':1,'which':1,';':1,'was':1,'be':1,'they':1,'absorbs':1,'about':1,'bill':1,'identified':1,'will':1,'were':1,'the':2,'cooled':1},'gap':{'to':1,'between':1},'vane':{'for':1},'waves--the':{'ultra-violet':1},'tupaia':{'began':1},'likened':{'our':1},'top--the':{'falling':1},'grains':{'of':2},'solid':{'body':2,'core':1,'and':1,'or':1,'liquid':1,'gold':1,'body.':1,'of':1,'could':1,'crust':2,'.':1,'substratum':1,'matter':1,'iron':1,'in':1,'earth':5,';':1,'earth--a':1,'the':1,'is':1,'ground':1},'tree-porcupines':{'and':1},'bill':{'and':1,'adapted':12,'where':1,'would':1},'eclipsed':{'when':1},'cluster':{'of':3,'is':1,'in':3},'plovers':{'lie':1},'replaced':{'by':9},'teaspoonful':{'of':1},'rhinoderma':{'of':1},'schultze':{'.':2},'eclipses':{'can':1},'manner':{'of':3,'away':1,'.':1,'born.':1,'at':1,'rarely':1},'youthful':{'stages':1},'adjusts':{'its':1},'debased':{'with':2},'century':{'we':1,'telescope':1,'that':2,'when':1,'.':4,'the':1,'was':1},'violently':{'and':3,'agitated':3},'metazoa':{'.':1},'regius':{'professor':1},'itself':{'and':3,'because':1,'is':3,'back':1,'an':1,'as':2,'registers':1,'through':1,'at':1,'in':5,'out':1,'again':1,'what':1,'for':1,'.':4,'to':6,'which':2,';':1,'millions':1,'until':1,'more':3,'tentatively':1,'that':1,'along':1,'with':3,'by':1,'he':1,'a':1,'on':1,'up':1,'the':2,'or':1},'atom--the':{'new':1},'saline':{'matter':2},'salina':{'that':1},'evading':{'this':1,'or':1},'discourse':{'.':2},'copying':{'and':1,'distributing':1,'displaying':1,'or':1},'leisurely':{'life':1},'ray':{'of':10,'lankester':4},'sapiens':{'the':1},'alertness.':{'ii':1},'non-digitate':{'paired':1},'eels':{'ascending':1,'are':1,'seem':1,'circumvent':1,'or':1,'illustrate':1},'keys':{'by':1},'leopard':{'is':1,'the':1},'deperet':{'transformation':1},'moment':{'a':1,'to':1,'.':1,'how':1,'s':1,'in':1,'the':3,'by':1},'purpose':{'and':1,'of':1,'is':1,'and--it':1,'here':1,'.':1,'they':1,'such':1,'the':1,'with':1},'timid':{'orioles':1},'circumvented':{'by':1,'.':1},'predecessors':{'rather':1,'of':2,'we':1},'gestures':{'and':1},'organically':{'enregistered':1},'task':{'of':1},'noli':{'me':1},'craves':{'for':1},'gambier':{'bolton.':6},'thoroughly':{'terrestrial':1,'aquatic':1,'aerial':1,'well':2,'it':1,'erect':1,'protected':1},'chemistry':{'and':1,'.':2},'spend':{'their':2,'much':1,'half':1},'examining':{'a':1},'matter.':{'a':1,'lockyer':1,'hitherto':1,'so':1,'another':1,'he':1},'snow':{'mouse':1,';':1,'upon':1,'or':1,'.':4},'profoundly':{'and':1,'influenced':1},'shape':{'and':2,'irresistibly':1,'from':1,'for':1,'that':1,'of':6,'they':1,'changes':1,'change':1},'atomic':{'theory':1,'weight':3,'energy':3,'weights':1,'numbers':1,'in':1,'reservoirs':1},'matter;':{'a':1},'alternative':{'reactions':1,'pathways':1,'but':1,'between':1},'unawares.':{'professor':1},'riki-tiki-tavi':{'which':1},'apes.':{'man':1},'timber':{'for':1},'letting':{'it':1},'superficial':{'differences':1,'work':1,'resemblance':1,'.':1},'cut':{'glass--the':1,'the':1,'up':1,'that':1},'developed.':{'nor':1},'alternate':{'directions--an':1,'format':1},'hereditarily':{'.':1},'source':{'may':1,'of':15,'which':1},'twig-insects':{'put':1},'follow.':{'since':1},'round-mouths':{'cyclostomes':1},'snap':{'at':1,'in':1},'hydrosphere.':{'formative':1},'ganglia':{'.':1},'excited':{';':1,'clucking':1},'silken':{'balloon.':1,'threads':1,'cocoon--the':1},'overhanging':{'bank':1},'big':{'and':1,'telescope':1,'spring':2,'canine':1,'sea-anemone':1,'brain':3,'as':1,'legacy':1,'simply':1,'seal':1,'toe.':1,'clock':1,'forehead':1,'toe':2,'robber-crab':2,'full':1,'brains':2,'lens':1,'with':1,'collar':1,'tree':1,'worm':1,'eyebrow':1,'seeds':1,'fact':5},'adventures.':{'there':1},'smallness':{'by':1},'far-fetched':{'and':1},'disappeared.':{'there':1},'life--a':{'progress':1},'bit':{'of':5},'stingless':{'.':1},'knock':{'over':1,'against':1},'photosphere--the':{'sun':1},'degenerated':{'in':1},'follows':{'a':1,'on':1,'from':2,'that':3,'an':1,'therefore':1,'the':1},'flux':{'and':1,'is':1,'in':1},'indication':{'of':2,'that':1},'beyond-blue':{'waves':1},'cotton-reel':{'as':1,'attached':2},'cloudlets':{'cannot':1,'come':1},'complicated.':{'sec':1},'gibbon.':{'bone':1},'valleys':{'.':1},'often':{'beautiful':1,'exhibit':1,'flies':1,'followed':1,'flapped':1,'pays':1,'overlooked':1,'float':1,'some':1,'libelled':1,'crop':1,'an':1,'say':1,'been':2,'vitally':1,'at':2,'in':2,'touch':1,'seen':1,'dug':1,'nests':1,'linked':1,'seems':1,'forced':1,'given':1,'from':1,'also':1,'apparently':1,'faint':1,'reminded':1,'outside':1,'expressed':1,'find':1,'attracted':1,'only':1,'complex':1,'easy':1,'buys':1,'got':1,'swims':1,'gets':1,'intelligent':1,'grows':1,'shows':1,'poor':1,'badly':1,'attended':1,'to':1,'make.':1,'very':3,'great':1,'safe':1,'about':2,'it':1,'saves':1,'succeed':1,'a':3,'become':1,'not':1,'associated':1,'revealed.':1,'subtle':1,'is':1,'fly':1,'and':1,'made':2,'created':1,'did':1,'of':1,'when':1,'with':4,'reads':1,'different':1,'adjust':1,'so':1,'.':1,'found':3,'lined':1,'involves':1,'referred':1},'absolutely':{'true':1,'essential':1},'hair-like':{'whilst':1},'triceratops':{':':2},'abundantly':{'these':1,'tenanted':1},'back':{'and':6,'into':1,'as':1,'at':1,'in':1,'our':1,'still':1,'again':2,'from':2,'for':1,'downwards':2,'.':1,'to':20,'which':1,';':1,'over':1,'becomes':1,'illustration':1,'125':1,'affording':1,'with':1,'by':3,'of':11,'sometimes':1,'became':1,'teeth':2,'the':1,'or':1},'evolution--there':{'is':1},'martian':{'day':2},'examples':{'of':5},'mirror':{'and':1,'for':1,'produces':1,'is':4,'.':1,'the':1,'than':1},'candle':{'but':1},'ourselves':{'to':2,'into':1,'here':2,'.':1,'how':1,'the':2,'quite':1},'pronounced':{'that':1},'crooked':{'stick':1},'condensed--who':{'can':1},'contacts':{'between':1},'affects':{'the':1},'per':{'hour':1,'second':3,'cent':5,'hour.':1,'step':1,'minute':1},'brain-case':{'of':2},'too--the':{'rabbit':1},'eliminate':{'useless':1},'king-crab':{'limulus':1},'peg':{'pulls':1},'11.--mars':{'october':1},'good.':{'bibliography':1},'scaly':{'fore-limbs':1,'covering':1},'stilt-like':{'legs':1},'life-history':{'of':7,'into':1,'.':1,'for':1,'to':1},'patient':{'with':1},'magnifies':{'this':1},'300':{'000':2,'chickens':1,'times':2},'peculiarly':{'interesting':1,'penetrating':1,'liable':1},'continuing':{'the':1,'.':1,'before':1},'fed':{'on':1,'when':1,'by':1,'.':1},'subconscious':{'cerebration':1},'more-pork':{'or':3},'flanks':{'and':1},'times--glacial':{'and':1},'feigning':{'death':3},'web-wing':{'of':1,'or':1},'nematodes':{'many':1},'piled':{'around':1},'ounce':{'or':1},'offshoot':{'is':1,'from':5},'consequently':{'the':1,'good':1,'changed.':1},'tree-loving':{'animals':1},'aliens':{'like':1},'night-light':{'noctiluca':1},'invading':{'the':1},'inhospitable':{'had':1},'gramme':{'of':1,'.':1},'relapses':{'to':1},'realisation':{'of':1},'deep-violet':{'light-waves':1,'waves':2},'ontario':{'about':1},'live-and-let-live':{'compromise':1},'plane.':{'the':1},'drosophila':{'among':1},'mudstones':{'and':2,'which':1},'trying--the':{'deep':1},'infected':{'with':1,'by':1},'manifested':{'by':1,'in':1},'checks':{'online':1},'forward':{'past':1,'to':2,'as':1,'by':1,'.':1},'examination':{'of':4},'adjusting':{'their':1,'its':1},'exterminated':{'the':1},'niagara':{'we':1,';':1,'are':1,'for':1,'falls':2},'boys':{'place':1},'quiescent':{'well-protected':1,'pupae':1},'hopes':{'that':1},'role':{'of':1,'in':2},'hipparion':{';':1},'directed':{'forwards':1},'blanketing':{'the':1},'non-existence':{'they':1},'rejection':{'of':1},'casein':{'which':1},'detachable':{'electrons':1},'generating':{'strong':1},'lungbooks':{'.':1},'planet':{'and':3,'on':1,'from':1,'around':1,'turns':1,'is':3,'after':1,'neptune':1,'but':2,'.':4,'will':1,'to':2,'s':1,'so':1,'always':1,'venus':2,'might':1,'the':1},'fitter':{'folk':1},'exploration':{'of':2},'planes':{'.':1},'water-bag':{'over':1},'groove':{'.':1},'sea-urchin':{'s':2,'which':1},'recognition':{'among':1,'of':2},'sort':{'and':1,'of':28,'when':1,'at':1,'may':1},'constant':{'interchange':1,'movement.':1,'temporary':1,'temperature':1,'state':2,'able':1,'spectrum':1,'effect':1,'amount':1,'in':1,'movement':1},'punnett':{'that':1},'expedition':{'1873-6':1},'metal':{'tags':1,'uranium':1,'globe':1,'that':1,'ages':1,'to':1,'ages.':1,'displays':1,'the':1,'vapour':1,'is':1,'vapours':1},'scarlet':{'solar':2},'single':{'word':2,'cubic':1,'molecule':1,'young':1,'feature':1,'cell':2,'prism':1,'electron':1,'grain':4,'gramme':1,'leaf':1,'atoms':1,'cell--a':1},'clever':{'synthetic':1,'associations':1,'dwarf':1,'things':2,'dog':2,'as':4,'in':1,'creatures':1},'curl':{'of':1},'dragging':{'effect':1},'prevail':{'.':1},'brethren':{'by':1},'corners':{'being':1,'of':3,'in':1},'biology.':{'the':1},'dimmed':{'by':1},'teemed':{'with':1},'confine':{'ourselves':1},'explaining':{'a':1,'positive':2,'the':1},'best--':{'a':1},'accidental':{'introductions':1,'discovery':1},'neck.':{'illustration':1},'heir':{'is':1},'surface--before':{'in':1},'prepared':{'chemical':1,'the':1,'spectrum':1},'lively.':{'illustration':1},'restoration':{'of':1,'by':3,'modelled':6,'shows':1},'relatives.':{'illustration':1},'utterly':{'dependent':1,'extinct':1,'beyond':1,'artificial':1},'fishes':{'and':5,'emerge':1,'appeared':1,'is':1,'191':1,'it':1,'as':1,'are':2,'in':2,'moreover':1,'saw':1,'before':1,'perhaps':1,'pay':1,'there':2,'had':1,'.':5,'to':2,'much':1,'which':3,'crustaceans':2,'probably':1,'was':1,'do':1,'we':1,'utilise':1,'that':1,'becomes':1,'males':1,'120':1,'cannot':1,'fishes':1,'such':1,'hold':1,'continued':1,'a':1,'like':3,'these':1,'of':1,'could':1,'will':1,'near':2,'were':3,'the':3},'stoppages':{'register':1},'desert':{'where':1},'worsted':{'instinctive':1,'mistake':1},'implies':{'a':2,'ability':1,'that':2,'rather':1,'certain':1,'becoming':1,'an':1,'complexity':1,'if':1},'vehicles':{'of':2},'speculations':{'.':1},'responded':{'to':1},'ascertained':{'is':1},'unhatched':{'crocodile':1,'or':1},'presenting':{'the':1},'ignoramus':{':':1},'failures':{'notably':1,'which':2,'that':1},'ready-made':{'capacities':1,'centres':1,'responses':1,'cleverness':1,'or':2},'tube':{'and':3,'a':1,'fertilises':1,'that':1,'of':1,'began':2,'258':1,'.':5,'bringing':1,'s':1,'as':1,'are':1,'which':1,'leading':1,'from':1,';':1,'with':1,'the':2,'is':1,'at':1},'discards':{'when':1},'tombs':{'that':1},'commoner':{'still':1,'sight':1},'telescope--the':{'largest':1},'served':{'as':3,'for':1,'an':1},'intricate':{'canal':1,'colony':2,'branches':1},'vicious':{'circle':1,'snaps':1},'disintegration':{'or':1,'that':1,'of':3,'.':1,'vital':1,'proceeds':1},'interlock':{'preventing':1},'compose':{'atoms':1},'peanut':{'and':1},'literary':{'archive':13},'blaze':{'of':1,'had':1,'means':1},'masculine':{'and':3,'features':1},'weather':{'conditions':1,'comes':1,'.':3},'gravel':{'and':1,'by':1,'.':1},'coal-field':{'.':1},'little-brain':{'type':5},'stupefying':{'effect':1},'random':{'.':1},'presently':{'the':2,'recognised':1,'what':1,'.':2},'listeth':{'and':1},'time-recording':{'machine':1},'putting':{'food':1,'themselves':1,'two':2},'aerolite.':{'sec':1},'intelligence--of':{'putting':1},'arrange':{'a':1,'themselves':1,'the':1},'severely':{'alone':1},'origin.':{'the':1,'we':1,'none':1,'7':1},'diverging':{'towards':2,'from':1},'shock':{'and':1,'or':1},'mottled':{'brown':1,'appearance':1},'penguins':{'come':1,'are':3},'murrayi':{'and':1},'believed.':{'sec':1},'unsatisfied':{'tendency':1},'orohippus':{'a':1,';':1},'bleeding':{'a':1},'crow':{'and':1,';':1},'other.':{'the':1,'there':1},'crop':{'of':2,'up--a':1,'up':2},'rivers':{'and':4,'from':1,'of':2,'but':1,'.':4,'to':1,'as':1,'in':2,'with':1,'or':1},'frog-mouth':{'sleeps':1},'insertion':{'of':2},'exuberant':{'radiation':1},'laws.':{'the':1},'nests':{'on':2,'or':1,'swaying':1},'pale-white':{'belt':1},'zest':{'with':1,'.':1},'giving':{'condensed':1,'animals':2,'these':1,'rise':4,'up':1,'us':1,'an':1,'birth':1,'off':2,'the':2,'out':1},'assisted':{'the':1},'fat':{'below':1,'.':1},'habituation':{'the':1},'paddle':{'of':1,'which':1},'access':{'to':10},'away--you':{'may':1},'crossed':{'by':1},'3a':{'mesohippus':1},'exercise':{'fifty-four':1},'rhodesian':{'cave-man':1,'man':4},'beasts':{'of':1,'have':1},'works--the':{'furnishings':1},'pelage':{'than':1},'outlying':{'electrons':3},'nimble':{'and':1},'river.':{'2':1},'intercept':{'some':1},'sink':{'and':1,'from':1,'away':1,'down':1,'to':3,'in':1,'beyond':1},'others':{'likewise':1,'as':2,'are':3,'have':2,'in':3,'rapidly':1,'for':1,'there':1,'.':4,'to':1,'which':1,'regard':1,'that':2,'read':1,'who':1,'such':1,'worked':1,'like':4,'thought':1,'suggests':1,'remain':1,'were':2,'at':1,'the':1,'weaves':1,'or':1,'climbers':1},'tremor':{'it':1,'.':1},'safer':{'to':1},'implicit':{'in':2},'widening':{'spread':1},'respiration':{'and':1,'than':1},'stalks':{'a':1,'which':1},'broken':{'and':2,'down':2,'off':2,'shells':1,'up':6,'.':1,'past':1,'their':1,'hill':2,'empties':1},'33':{'photo':2},'32':{'a':1,'comet':1,'600':1},'31':{'15':1,'735':1,'vast':1},'30':{'000-50':1,'1885':1,'000':2,'days':1},'37':{'photo':2},'alaska':{'and':1},'35':{'feet':1,'tons.':1,'000':1},'redbreast':{'and':1},'wasplike':{'which':1},'climb':{'on':1,'the':1,'up':1},'tubercles':{'on':1},'composed':{'of':13,'.':1},'named':{'coronium.':1,'the':1,'darwin':1,'20417.txt':1,'brown':1},'land-crab':{'birgus':1},'67.2':{'0.62':1},'sculling':{'and':1},'vulcanite':{'and':1},'decrease':{'of':1,'until':2,'in':1},'names':{'in':1},'oval':{'and':1,'than':1,'.':1},'tap':{'this':2},'lime':{'the':1,'64':1},'links':{'and':1,'to':1,'or':1},'readable':{'by':1,'form':1},'cretaceous':{'white':1,'there':1,'strata':1,'era':1,'period':2},'themselves':{'nearest':1,'into':3,'pass':1,'as':1,'are':3,'have':1,'in':6,'go':1,'if':1,'from':1,'.':5,'to':1,'adequate':1,'traceable':1,'then':1,'we':1,'very':1,'sufficient':1,'affording':1,'by':3,'whenever':1,'of':1,'up':1,'spontaneously':1,'unmistakably':1,'so':1,'energetically':1},'pre-arrangements':{'of':2,'we':1},'oily':{'water':1},'excitedly':{'.':1},'engender':{'where':1},'ancestral.':{'the':1},'myriads':{'of':1},'magnesium.':{'illustration':1},'proton':{'.':1},'train':{'travelling':1,'.':1},'indifferent':{'or':1},'batesian':{'after':1},'harvest':{'of':1,'at':1,'field':1},'elbow-room':{'for':1},'hints':{'of':1},'swooping':{'gull':1,'leaps':1,'87':1},'account':{'of':4,'has':1,'for':8},'understanding.':{'for':1},'f':{'.':7},'crickets':{'and':2},'pelicans':{'and':1},'non-radiant':{'matter':1},'closing':{'of':1,'words':2},'continuity':{'of':1},'experiential':{'learning.':1},'violence':{'.':1},'instinct--a':{'useful':1},'e.g.':{'nitrates':1},'proportions':{'on':2,'for':1},'reconstructed':{'from':2},'renewed':{'our':1},'mixture':{'of':2},'water.':{'the':2,'illustration':3,'in':1},'bones':{'and':2,'e.g':1,'of':2,'some':1,'.':1,'running':1,'slowly':1},'native':{'of':1},'daring':{'operations':1,'of':1},'democracy':{'.':1},'noises':{'does':1},'holds':{'a':1,'also':1,'its':1,'together':1,'in':1},'regions':{'of':3,'to-day.':1,'are':1,'or':1,'empty':1,'farther':1},'flood.':{'there':1,'sec':1},'lamp':{'and':1},'proceeded':{'far':1,'further':1},'called--it':{'will':1},'furnace':{'the':1,'like':1},'imprints':{'from':1},'says:':{'all':1,'they':1},'watery':{'with':1},'dull-red':{'heat':1},'gill-clefts':{'are':1,'they':1},'waters':{'and':1,'that':1,'afford':1,'of':5,'allows':1,'.':4,'under':2,'covered':2,'the':1,'beyond':1,'where':1,'quite':1},'philosophy':{'of':1},'collection':{'will':1,'of':4,'so':1,'are':1,'.':1},'mixed':{';':1,'all':1,'together':1},'them--simple':{'one-celled':1},'united':{'states':13,'states.':1},'preferred':{'to':1},'multiplication':{'of':4,'into':1,'takes':1,'covers':1},'soup-plate':{'but':1},'primers':{'beginning':1},'chasing':{'mates':1},'tethering':{'the':1},'bind':{'animals':1,'long':1},'lines':{'and':2,'it':1,'replace':1,'not':1,'as':1,'are':3,'have':1,'in':2,'birds':1,'would':1,'.':3,'to':2,'which':1,'drawn':1,'we':1,'they':1,'fishes':1,'he':1,'on':2,'of':7,'will':1,'placed':1,'became':1,'the':2},'correspond':{'to':4},'chief':{'among':1,'use':1,'kinds':1,'scientific':1,'importance':1,'executive':1,'theories':1,'four':1,'plains':2,'reason':1,'classes':2,'stocks':1},'counterbalances':{'its':1},'stony':{'meteorite':1},'subsequently':{'fed.':1,'ignored':1},'lined':{'with':2},'furnish':{'a':1,'the':2,'data':1},'motions.':{'sec':1},'africans':{'straight-haired':1},'lens.':{'a':1},'symbols':{'of':1,'help':1},'alacrity':{'towards':1,'with':1},'horns':{'but':1},'agricultural':{'pioneers':1},'bunch':{'of':4},'industries':{'of':1,'.':1},'bridges':{'the':1,'were':1,'he':1},'negotiated':{'he':1},'le':{'verrier':1,'bon':1},'lb':{'.':1},'la':{'chapelle-aux-saints':2},'labor':{'in':1},'age':{'and':4,'just':1,'it':1,'as':1,'in':5,'whereas':1,'seems':1,'.':4,'to':3,'which':1,';':2,'has':1,'was':1,'more':1,'that':1,'after':2,'amphibians':1,'by':1,'dates':1,'of':13,'could':1,'lasted':1,'without':1,'the':2},'squatting':{'figure':1},'marsh':{'and':2,'birds.':1,'.':1},'bridged':{'very':1},'diverts':{'.':1},'junction':{'of':1},'greater':{'distance':2,'distorting':1,'plasticity':1,'intelligence':1,'in':1,'antiquity--perhaps':1,'celandine':1,'resistance':1,'possibilities':1,'rate':1,'part':2,'mass':1,'compactness':1,'interest':2,'activity':1,'concentration':1,'than':7,'accuracy':1},'descendants':{'as':1,'to-day':1,'.':1},'faunas':{'of':1},'dam':{'of':1,'.':1},'gauging':{'their':1},'cock-paidle':{'probably':1,'or':1},'phagocytes':{'may':1,'which':1},'accumulates':{'a':1},'faunal':{'drift':1},'day':{'and':10,'is':3,'it':2,'comprised':1,'as':1,'are':1,'in':1,'seem':1,'from':1,'for':1,'rather':1,'when':3,'long':1,'.':7,'also':1,'therefore':1,'covered':1,';':1,'was':1,'we':2,'alighting':1,'becoming':2,'sink':1,'one':1,'by':2,'he':1,'of':1,'equal':2,'were':1,'the':2},'6.--solar':{'prominences':1},'least.':{'these':1},'radiant':{'heat':2,'matter.':1,'than':1,'element':1},'tenanted':{'and':1,'the':1,'to-day':1,'by':1},'identified':{'an':1,'by':2,'.':1},'blazing':{'star':1},'exploring':{'new':1,'the':1,'with':1,'habit':1},'slipping':{'down':2,'back':1},'harness':{'this':1,'and':1,'the':1},'integumentary':{'structures':1},'references':{'to':2},'giants.':{'thus':1},'jasper':{'did':1,'studied':1},'movement-controlling':{'organ':1},'vestigial':{'muscles':1,'structures':4,'third':1},'attendant':{'on':1,'field':1},'pivot':{'the':1,'through':2},'slumped':{'together':1},'tubular':{'sea-anemone':1,'shells':1},'suctorial':{'mouth':1,'tube-feet':1},'kids':{'and':1,'foals':1},'inch':{'and':2,'less':1,'of':3,'long':2,'.':6,'at':1,'in':7,'thick':3,'one':2,'or':1,'thick.':1},'wholly':{'of':1},'mate':{'and':1,'kith':1,'s':1,'has':1},'oriental':{'race':1},'technically':{'this':1,'called':1},'red':{'and':4,'fife':1,'spring':1,'deer':1,'yellow':1,'disc':1,'at':1,'tumultuous':1,'mouth.':1,'giant':1,'end':1,'sandstone':2,'.':3,'glowing':1,'stars':3,'orange':1,'star':3,'on':1,'prominences':1,'spot':1,'seaweeds':1,'ones':1,'blood':1,'waves':1,'fife--a':1,'card':1,'a':1,'worsted':2,'flames':3,'glory':1,'light':1,'region':1,'will':1,'calcutta':2,'the':1,'tinge':1,'or':3,'seaweed':1},'approached':{'too':1},'many-celled':{'wheel':1,'animals':1,'organism':1,'animal':1,'creature':1},'lizzie':{'had':1,'the':1,'never':1,'was':2,'s':1},'others--which':{'is':1},'discover':{'a':1,'that':2,'this':1,'differences':1,'some':3,'their':1,'how':1,'in':1,'the':2},'fourteen':{'hours':1,'days':2,'or':1},'coronium.':{'measuring':1,'we':1},'approaches':{'to':1,'the':3},'electricity--electric':{'current--the':1},'trends':{'of':1},'qui':{'vive':1},'likelihood':{'far':1,'the':2},'young--a':{'use':1},'backwards':{'and':1,'we':3,'for':1,'over':1,'when':1,'it':1},'yard':{'in':1},'mortar':{'of':2},'chicken':{'procellaria':2},'allied':{'to':4},'barriers':{'.':1,'must':1},'retain':{'a':1,'their':1},'mammal-like':{'and':1},'empire.':{'he':1},'south':{'sir':1,'poles.':1,'of':4,'africa.':1,'american':3,'pacific':1,'.':3,'pole':1,'poles':1,'in':1,'america':4},'predominate':{'over':1},'complete.':{'illustration':1},'rudely':{'dressed':1,'shaken':1},'finest':{'triumphs':1,'measurements':1,'exhibition':1,'gold':1},'braced':{'against':1},'investigated.':{'ether':1},'condensed;':{'but':1},'food-plants':{'of':1},'improvements':{'and':1,'like':1,'in':2},'sacs':{'which':1},'reached':{'a':1,'then':1,'about':1,'animals':1,'this':1,'their':1,'nearly':1,'immediately':1,'the':4,'its':1},'michelson':{'and':1},'humblest':{'living':2},'ancient':{'copper':1,'type.':1,'seas':3,'astronomer':1,'seashore':1,'human':1,'extinct':1,'times':1,'skeletons':1,'hunters':1,'crust':1,'peoples':1,'mediaeval':1,'life':1,'amphibians':1,'days.':1,'sea.':1,'than':1,'types':4,'days':2,'civilisations':2,'rocks':1,'beds':1},'sadly':{'impressed':1},'monkey':{'and':1,'has':1,'b':2,'that':1,'of':1,'there':1,'it':1,'an':1,'how':1,'s':3,'which':1,';':1,'.':2,'yet':1,'as':1},'guiana':{'82':1,'the':1},'all--the':{'atom':1},'ripples':{'measuring':1,'in':1},'hotter.':{'it':1},'nebular':{'theory.':2,'theory':2,'region':2,'theory--spiral':1,'gases':1,'hypothesis':4,'mass':1},'intermediate':{'positions':1,'layer':1,'between':1},'sky--this':{'we':1},'anatomises':{'the':1},'completed':{'a':1,'her':1},'acquire':{'kinetic':1,'the':1},'negro':{'and':1},'device--more':{'reflex':1},'environmental':{'sometimes':1},'slopes':{'down':1,'of':1},'plumage':{'like':1,'of':1,'is':1,'are':1,'makes':2,'or':1},'bodyguard':{'of':1},'furnishings':{'of':2},'kant':{'had':1},'shrapnel':{'which':1},'brusque':{'variations':2},'lizard-like':{'tail.':1,'tail':1},'depends':{'on':10,'all':1,'partly':1,'upon':4,'.':2,'to':1},'heavens.':{'of':1},'light':{'and':12,'emerging':1,'besides':1,'previously':1,'penetrates':1,'is':14,'coming':1,'reaches':1,'an':1,'visible':1,'as':1,'rings.':1,'are':4,'in':3,'consists':2,'our':1,'passes':2,'differ':2,'rays':1,'from':10,'tread':1,'would':1,'electricity':1,'travel':1,'there':1,'wave-lengths.':1,'sunlight':1,'.':14,'to':3,'returns':1,'production':1,'which':7,'according':1,'travelling':1,'has':3,'was':1,'into':1,'red':1,'more':1,'body':2,'then':1,'we':1,'283':1,'travelled':1,'that':4,'may':1,'becomes':1,'gathered':1,'emitted':1,'took':1,'but':2,'falls':2,'magnetism':1,'will':3,'falling':1,'waves':2,'i.e':1,'with':1,';':4,'upwards':1,'a':1,'on':9,'made':1,'takes':3,'of':20,'radiant':1,'depends':1,'against':1,'reduced':1,'travels':2,'without':2,'so':1,'can':1,'many':1,'the':4,'or':1,'comes':1},'lurching':{'movements':1},'flashes':{'of':1},'anthropologist':{'professor':1},'imaginative':{'range':1,'or':1,'minds':1},'involution':{'but':1},'wood-cock':{'which':1},'curves':{'of':1},'comfortable':{'far':1,'as':1},'tide':{'and':2,'the':2,'in':1,'or':1,'out':1},'corrupt':{'data':1},'comfortably':{'in':1},'astrophysical':{'observatory':3},'unlikely':{'that':2},'uganda':{'bug':1},'sporadic':{'and':1,'members':1},'throat':{'bulges':1},'curved':{'bodies.':1,'pillar':1,'on':1,'than':1,'fingers':1},'activity--that':{'of':1},'complete':{'and':1,'living':1,'proof':1,'stereoscopic':1,'reflection':1,'absorption':1,'.':2,'pace':1,'revolutions':1,'master':1,'fossil':1,'in':1,'one':1,'its':1,'change':1,'theory':2},'mic':{'.':1},'wits':{'and':1,';':1,'in':1,'when':1,'.':1},'gravity':{'pressure':1,'is':1,'.':1,'near':2,'the':1},'provokes':{'simple':1},'pectoral':{'fins':5,'muscles':1},'gliding':{'on':1,'from':2,'alligator-like':1,'one':1},'rediscovered':{'by':1},'jumna':{'doles':1},'unless':{'a':1,'we':2,'indeed':1,'there':2,'it':1,'they':1,'our':1,'the':3,'you':3},'trundles':{'about':1},'mathematician':{'leibnitz':1,'le':1,'can':2,'.':1},'mimics':{'they':1},'eight':{'large':1,'unbranched':1,'of':1,'months':1,'years':1,'feet':1,'sense-organs':1,'tons':1,'branched':1,'planets':2,'the':1},'peppered':{'moth':1},'cleverest':{'animals':1,'monkey':1},'sally':{'the':1,'some':1,'above':1},'plastic--a':{'generalised':1},'profoundest':{'of':1},'palaeolithic':{'and':1,'cave-men':2,'men':1,'culture':1,'peoples':1},'firelight':{'must':1},'inexorable':{'laws':1},'gullet':{'unbroken':1},'heartening':{'encouragement':1},'enthusiastic':{'.':1},'gather':{'to':1,'the':2,'round':1,'on':1},'request':{'of':1},'disease':{'and':1,'is':1,'after':1,'.':2},'animal--perhaps':{'the':1},'park.':{'profile':1,'side-view':1,'chimpanzee':3,'surface':1,'comparisons':1,'the':3},'artificially':{'and':1,'to':1,'it':1},'occasion':{'and':1,'on':1,'.':1,'suggested':1,'of':1},'normally':{'a':1,'concealed':1,'handed':1},'ten-armed':{'cuttlefish':2},'true.':{'if':1},'area.':{'swimmers':1,'it':1},'selection':{'of':3,'advantage':1},'kith':{'and':1},'text':{'to':1,'emits':1,'.':2},'supported':{'on':1,'in':1,'like':1,'by':1},'braking':{'action':1},'pinhead':{'brain':1},'continually':{'added':1,'being':2,'recuperate':1,'worn':1,'tends':1,'changing':1,'passing':1,'travelling':3},'thicker':{'fur':1},'staff':{'shows':1},'wear':{'and':1,'any':2},'knowledge':{'and':1,'be':1,'means':2,'respecting':1,'advances':1,'is':1,'there':1,'had':1,'it':1,'but':1,'.':2,'may':1,'that':2,'were':1,'extends':1,'of':13,'the':1,'has':1,'as':1,'more':1},'sparks':{'which':1},'scorpion':{'we':1},'luminescent':{'and':1,'animals':1},'body-making.':{'in':1},'insectivores':{'not':1,'and':1,'including':1},'fatiguing':{'exertions':1},'emitting':{'light':1,'rays':1},'wild.':{'two':1},'hand.':{'attempts':1,'cross-fertilisation':1,'half':1},'inferior':{'either':1},'equilibrium':{'positions':1,'has':1,'results':1,'otherwise':1},'photographs':{'we':1,'show':2,'of':1,'.':1,'fig':1,'taken':2,'by':1,'figs':1},'coin--smaller':{'than':1},'exceptional':{'and':1,'spring':1,'auroral':1,'in':1,'cases':2,'conditions':1},'beat':{'a':1,'things':1,'it':1},'photography':{'and':1},'bear':{'and':2,'on':1,'of':2,'straight':1,'illustration':1,'to':1,'numerous':1,'in':3,'the':1,'was':1},'perfection':{';':1,'is':1,'in':1,'by':1,'.':1},'swiftest':{'flywheel':1},'stigma':{'the':1},'striped':{'tiger':1,'muscles':1,'muscle':1},'halo':{'surrounding':1,'there':1,'such':1},'areas':{'and':1,'differ':1,'land':1,'corresponding':1,'was':1,'of':1,'.':1,'to':1,'at':1,'known':1,'where':1,'or':1},'crabs':{'and':1,'are':1,'that':1},'egg-laying':{'is':1,'.':1},'caves':{'unsunned':1,'in':1},'organ':{'of':3,'is':1,'called':1,'for':1,'.':1},'pglaf.org':{'fundraising':1,'for':1,'section':1,'.':1,'while':1,'donate':1},'fixes':{'a':1,'to':1,'sea-anemones':1},'shore-animals':{';':1,'e.g':1,'which':1,'have':1,'.':1},'eyebrow':{'ridges.':1,'ridges':6},'saturates':{'through':1},'excesses':{'of':1},'light--is':{'the':1},'gibson':{'gives':1},'cave-hyaena':{'mammoth':1},'farthest':{'out':1},'exists':{'because':1,'there':1,'only':1,'as':1,'in':2,'the':1},'universe--the':{'evolution':1,'solar':2},'national':{'physical':2},'flapped':{'very':1},'inextricably':{'interwoven':1},'carnivores':{'and':1},'intensity':{'of':4},'cenozoic':{'making':1,'began':1,'era':1,'or':1,'eras':1},'enhanced':{'by':2},'greece':{'and':2},'ruse':{'succeeded':1},'36.0':{'0.24':1},'shallows':{'.':1},'phases':{'of':1},'pedigree':{'of':1,'the':2,'.':2,'is':1,'must':1},'apparently':{'clever':1,'red-hot':1,'unconscious':1,'simple':1,'inexhaustible':1,'instantaneous':1,'in':1,'served':1,'you':1,'sluggish':1,'inevitable':1},'nebula':{'and':1,'what':1,'round':1,'march':2,'although':1,'of':1,'57':1,'we':1,'but':1,'.':2,'seen':2,'to':7,'need':1,'which':1,'in':8,'it':1,'revolving':1,'has':2,'laplace':1,'is':4},'difficulties':{'and':5,'may':1,'of':5,'is':1,'in':1,'when':1,'.':1,'are':3,'have':1,'were':1,'the':1},'routine':{'and':1,'cannot':1,'is':3,'.':1,'became':1,'so':2,'activity':1,'instinctive':1,'has':1,'metabolism':1},'progress':{'we':1,'towards':2,'unless':1,'demands.':1,'many':1,'is':1,'of':4,'.':5,'depends':1,'have':1,'in':3,';':1,'has':1,'was':1},'boundary':{'line':1,'lines':1},'janes':{'leonard':2},'various':{'distances':1,'methods':2,'elements.':1,'conditions.':1,'proportions':1,'intervals':1,'human':1,'subtle':1,'racial':1,'classes':1,'physical':1,'layers':1,'forms':5,'concrete':1,'ways':1,'interesting':1,'flying':1,'ways.':1,'colours':2,'parts':1,'electrical':1,'open-sea':1,'kinds':4,'bolts':1,'mammals':1,'atoms':1,'races':1,'fishes':1,'shore-haunts.':1,'stocks':1,'articles':1,'processes':1,'places':1,'departments':1,'theories':1,'lengths':2,'experiments':1,'formats':1,'stages':1,'other':1},'reproduced':{'in':3,'from':7,'below.':1,'by':18},'cauliflower':{'sticking':1,'and':1},'superior':{'to':1},'emitted':{'by':3},'deliver':{'insects':1},'willing':{'to':2,'is':1},'nightfall':{'hippolyte':1},'exist.':{'there':1,'some':1},'guiding':{'his':2},'sharply':{'away':1},'asunder':{'the':1},'freely':{'and':1,'available':1,'sharing':1,'distributed':1,'as':1,'suspended.':1,'shared':1,'round':1},'taking':{'a':1,'longer':1,'advantage':2,'it':1,'running':1,'place':2,'5':1,'the':2,'care':1},'equal':{'weight':1,'pieces':1,'to':7,'length':1,'perfection':1,'.':1},'attributed':{'this':1,'to':1},'pulp':{'.':1},'flesh-eating':{'and':1},'sexes':{'and':1,'wander':1},'wringing':{'the':1},'swim':{'much':1,'at':1,'against':1,'for':1},'conquered':{'and':1,'the':3,'one':1},'swallow':{'a':1},'temporal':{'or':1},'glorious':{'failures':1,'display':1},'otherwise':{'would':1,'there':1,'when':1,'quite':1,'the':3,'called':1},'basins':{':':1,'.':1},'acorn-shell':{'and':1},'heritable':{'novelties':1},'deflected':{'as':2},'unearthed':{'.':1},'pouring':{'floods':1,'out':2},'marett':{'r':1},'tremendous':{'energy':3,'movements':1,'question':1,'but':1,'movement':1},'everything--so':{'there':1},'muddy':{'feet':1,'precipitate':1},'copies':{'of':7},'armadillos':{'.':1},'migrate':{'about':1},'dogfish':{'have':1},'natans':{'stands':1},'curtain':{'of':1,'floating':1},'copied':{'and':1,'or':1},'sluggish.':{'animals':1},'home.':{'long':1},'herbage':{'fastening':1,'and':1,'by':1,'.':1},'composed.':{'the':1},'antlers':{'in':1},'arises':{'what':1,'from':1},'sex--emotions':{'of':1},'looked.':{'using':1},'essentially':{'a':1,'of':2,'the':1,'wrapped':1,'is--should':1},'assert':{'themselves':1},'finished':{'and':1},'angles':{'to':4,'which':1},'angler':{'of':1,'s':2},'fellow':{'short':1,'from':1},'food-canal':{'and':3,'a':1,'the':1,'muscular':1,'.':2},'arisen':{'as':1,'in':1,'from':1,'by':1,'.':1},'volunteer':{'support.':1},'homes':{'of':1,'from':1},'economised':{'reproduction':2},'splits':{'up':1},'article.':{'bibliography':1},'appearance':{'and':1,'we':1,'very':1,'of':5,'.':2,'habits':2,'cloaked':1,'which':1,'in':1},'value':{'.':1,'or':1,'in':1},'promotes':{'both':1},'dendrites':{'of':1},'amenity':{'.':1},'file':{'or':1,'should':1},'chaotic':{'molecular':1},'squid':{'in':2},'weighed':{'but':1},'arrangements':{'of':2,'for':1},'arabia':{'ceylon':1},'partner':{'s':1,'sea-anemones':2,'.':1},'tumbled':{'into':1},'watchful':{'mother':1},'physiologists':{'like':1},'locomotion;':{'new':1},'mid-europe':{'red':1},'jurassic.':{'for':1},'prognostications':{'as':1},'well-grown':{'fishes':1},'felted':{'together':1},'aquitania':{'is':1},'locomotion.':{'illustration':1},'twelfth':{'printing':1},'neolithic':{'age':1,'days':1,'community':1,'.':1,'culture':1,'men.':1,'times':1,'man':6},'material':{'and':2,'in':1,'which':4,'e.g':2,'things':2,'is':1,'of':2,'particles.':1,'particles':1,'studying':1,'aspect':1,'universe':5,'such':1,'throughout':2,'than':1,'resources':2},'soddy--as':{'any':1},'cubic':{'inch':2,'inches':2,'centimetre':2},'absent;':{'stars':1},'water-filled':{'quarry':1},'binoculars':{'is':1},'discredited':{'atomism.':1},'26.--a':{'spiral':1},'judgment':{'on':1},'buttonholes':{'at':1},'nevertheless':{'these':1,'all':1,'been':1,'master.':1},'pompilius':{'common':1},'weapon':{'on':1},'capella':{'49.4':1},'treacly':{'fluids':1},'thought':{'and':2,'even':1,'that':3,'of':2,'is':1,'it':1,'.':1,'to':1,'was':1,'they':1,'hydrogen':1},'exceedingly':{'small':2},'sets':{'of':3,'off':1,'up':1,'in':1},'comparisons':{'of':2},'wreckage':{'of':1},'arising':{'afresh':1},'latest':{'and':1,'measurements':1},'appropriately.':{'birds':1},'barking':{'down':1},'humdrum':{'non-plastic':1,'race':1},'executive':{'and':1},'domestic':{'pigeons':1,'rabbits':1,'dog':1},'harpy-eagle':{'216':1,'clean':1},'bivalves':{'and':1},'stored':{'may':1,'away':1,'up':2,'for':1},'books':{'may':1,'recommended':1,'now':1,'are':1,'.':1},'protecting':{'blanket':1,'them':1},'swimming-bells':{'and':1},'wrens--to':{'try':1},'one-toed':{'horse':1},'work.':{'1.e.4':1,'the':2,'there':1,'-':1,'first':1},'absorption':{'of':2,'was':1},'onward':{'.':1},'lake':{'and':1,'pond':1,'of':1,'constance':1,'city':1},'mathematically':{'satisfactory':1},'add':{'just':1},'work;':{'the':1},'slits':{'the':1},'spirals':{'present':1,'in':1},'warns':{'us':1},'280':{'wave':1,'in':1},'283':{'photo':1,'niagara':1},'282':{'the':2},'287':{'photo':2},'incarnations':{'and':1,'one':1},'resolved':{'into':1,'the':1,'in':1},'worlds':{'and':1,'in':3,'sec':1,'.':1},'hermonis':{'and':1},'refinements':{'are':1},'mutations':{'and':1,'then':1,'whatever':1},'royalty':{'fee':1,'payments':2},'98.8':{'arcturus':1},'elapses':{'between':1},'implements--knives':{'scrapers':1},'jupiter.':{'the':1},'audibly':{'when':1},'capacities':{'of':4,'work':1,'but':3,'are':1,'usually':1,';':1},'like':{'plaice':2,'deliberateness':1,'toads':1,'london':1,'fungas':1,'birds':1,'shuffling':1,'to':2,'insectivores':1,'very':1,'duckmole':1,'sandstones':1,'one':1,'minute':1,'patrick':1,'globe-fishes':1,'shapes':1,'sloths':1,'amoebae':1,'rats':2,'partridges':1,'sugars':1,'some':3,'sea-squirts':1,'jupiter':1,'our':5,'bark':1,'ourselves':1,'poisonous':1,'its':2,'asking':1,'trout':1,'volvox':1,'opening':1,'of':1,'carnivorous':1,'great':1,'flames':1,'many':1,'otters':1,'ants':1,'skunks':1,'chlorophyll':1,'house-flies':1,'mercury':1,'whales':1,'.':3,'white':1,'genesis':1,'pallas':1,'that':6,'centipedes':1,'coughing':1,'fountains':1,'glass':1,'those':1,'he':1,'this':2,'starts':1,'sea-anemones':1,'matter':4,'fallow':1,'silly':1,'were':1,'and':2,'rooks':1,'certain':1,'is':1,'it':2,'an':8,'as':1,'which':2,'skates':1,'but':1,'waves':1,'fishes':1,'ours.':1,'a':44,'wisps':1,'professor':2,'dog':1,'kipling':1,'so':1,'raindrops':1,'the':56,'brer':1},'success':{'and':1,'of':1,'is':1,'to':1,'as':1,'in':1,'has':1},'spiral.':{'thus':1,'but':1},'porous':{'like':1},'admitted':{'of':1,'that':5},'ozone':{';':1},'radio-active--then':{'we':1},'chick':{'does':1,'out':1},'works':{'and':1,'in':7,'its':1,'if':1,'even':1,'provided':1,'based':2,'harmless':1,'.':2,'to':1,'only':1,';':1,'unless':1,'that':2,'1.a':1,'from':1,'with':1,'by':2,'posted':1,'on':1,'possessed':1,'reports':1,'so':1,'mr':1,'calculated':1},'soft':{'food':1,'soil':1,'muddy':1,'tail':2,'.':1,'to':1,'enough':1,'parts':2,'moss':1,'browns':1,'silvery-looking':1,'abdomen--for':1},'heel':{'a':1,'of':2,'than':1},'italian':{'scientist':1},'accessible':{'by':1},'simple.':{'the':1},'propel':{'our':1},'alive':{'.':1,'at':1,'are':1},'hair':{'and':1,'is':1,'woolly-haired':1,'in':1,'the':1,';':1},'convey':{'an':1},'convex':{'curves':1},'proper':{'answer':1,'proportions':2,'number':1,'way':1,'time':1},'happens':{'for':1,'that':2,'certain':1,'is':1,'.':2,'in':1},'0.24':{'3030':1},'students':{'of':1},'masked':{'their':1,'by':2},'economical':{'reduction':1},'assuming':{'reasonably':1},'results.':{'fog':1,'but':1},'mind-body':{'at':1},'snuggle':{'under':1},'overcharged':{'with':1},'manifesting':{'itself':1},'noise':{'of':1,'.':1},'slight':{'changes':1,'as':1,'improvements':1,'keel':1,'fluttering':1,'clouding':1},'ever-lengthening':{'tail':1},'combative':{'creature':1},'stellar':{'universe.':1,'universe--the':1,'spectra':1,'system':1,'universe':5,'universes':1,'astronomy':1},'crossing':{'the':1},'host':{'of':1,'is':2,'s':1,'for':1,'.':1},'although':{'we':5,'modern':1,'thirsty':1,'all':1,'there':2,'great':1,'it':1,'at':1,'they':1,'mr':1,'small':2,'our':1,'the':8},'worthy':{'of':1},'periodically':{';':1,'bursts':1,'in':1,'pass':1},'christened':{'coronium.':1,'them':1,'electrons':1},'about':{'among':2,'seven':2,'because':1,'twenty-one':1,'ten':1,'on':3,'the':47,'energy':1,'within':1,'all':1,'10':1,'two':6,'60':1,'as':1,'two-thousandths':1,'sec':1,'35':1,'in':3,'our':2,'shooting':1,'its':1,'sun-spots':2,'six':3,'for':1,'eleven':1,'ways':1,'twenty':2,'there':1,'forty':1,'40':1,'.':2,'1':3,'their':1,'3':1,'5':3,'4':1,'which':3,'9':3,'electrons':1,'more':1,'twenty-five':1,'thirty-two':1,'500':1,'equilibrium':1,'life':2,'2-1':1,'an':2,'to':1,'580':1,'that':3,'very':1,'constantly':1,'after':1,'eighty':1,'new':1,'it':1,'them':1,'two-thirds':1,'variable':1,'100':1,'one':5,'with':3,'by':4,'elevations':1,'a':15,'four':2,'12':1,'48':1,'thirty':1,'twice':1,'we':2,'1842':1,'56':1,'half':2,'us':1,'project':2,'these':2,'donations':2,'three':5,'fundamental':1,'things':1,'nine':1,'800':1,'fifty':3},'quills':{'.':1},'branch-gripping':{'member':1,'.':1},'electron--the':{'electron':1},'certainty':{'and':1,'as':1,'has':1},'introduces':{'into':1},'preen':{'gland':1},'avoided.':{'when':1},'rock-record':{'which':1},'introduced':{'perhaps':1,'into':1,'by':1},'fitnesses':{'have':1},'ways':{'and':2,'we':1,'that':1,'of':10,'.':4,'as':1,'including':1,'in':7},'marshes':{'and':1,'fed':1,'resounded':1,'were':1},'dubois':{'in':1},'sense-organs':{'the':1,'round':1},'rhythmical':{'rise':1},'billions':{'of':3},'chemists':{'and':1,'said':1,'of':1,'who':1,'should':1,'physicists':1,'.':1},'guard':{'over':2,'is':1,'against':1},'female':{'or':1,'with':1,'where':1,'is':1,'only':1,'covers':1,'.':1,'s':1,'paper':1,'figures':1,'makes':1,'in':1,'carries':1,'stickleback':2,'yucca':1,'side':1,'at':1},'quickly':{'from':1,'that':1,'contracting':2,'as':1,'recognised':1,'moving':1,'in':1,'coiled':1,'than':2},'kallima':{'inachis':2,'conspicuously':1},'cross-fertilisation':{'of':1,'is':2},'minute.':{'in':1},'punics':{'and':1},'sticklebacks':{'are':1,'learned':1,'were':1,'live':1,'in':1},'ridge':{'for':1},'mazy':{'passages':1},'elastic':{'solid':1,'wings':1},'rushed':{'into':1},'outline':{'we':1,'like':1,'of':17,'is':2,'it':1,'will':1,'where':1,'its':1},'condense':{'it':1,'round':1},'rushes':{'on':1,'through':1,'round':1},'bees':{'and':4,'may':1,'richly':1,'which':1,';':1,'by':1},'development':{'and':1,'has':1,'often':1,'for':1,'of':18,'leaves':1,'should':1,'certain':2,'which':1,'in':1,'.':4,'is':2,'man':1},'biggest':{'gulf':1,'fact':1},'maze':{'and':1,'a':1,'in':1,'by':1,'.':1},'duffus.':{'cuckoo-spit':1,'chimpanzee':1},'woodpecker':{'inserted':1,'hammering':2},'mcgregor':{'from':2},'but':{'all':3,'particularly':1,'among':1,'able':1,'move':1,'worms':1,'bright':1,'its':4,'before':1,'also':1,'electricity':1,'agile':1,'enough':1,'evidences':1,'to':5,'only':3,'has':1,'giants':1,'eventually':2,'very':1,'sooner':1,'quickness':1,'they':19,'new':1,'not':5,'during':1,'now':2,'necessary':1,'like':1,'profound':1,'light-waves':1,'these':9,'she':2,'each':1,'because':1,'farthest':1,'some':4,'imply':1,'are':2,'our':2,'best':1,'even':4,'what':7,'for':2,'since':2,'remain':3,'birds':1,'behind':1,'difficulties':1,'between':1,'probably':1,'millions':1,'movement':1,'we':23,'eminently':1,'nature':1,'little':1,'here':2,'although':3,'others':1,'along':1,'contraction':1,'on':2,'about':1,'many':3,'omit':1,'usually':1,'adapted':1,'naturalists':1,'copper':1,'contains':1,'besides':1,'one':4,'learning':1,'your':1,'often':3,'startling':1,'given':1,'air-sacs':1,'would':1,'few':1,'positive':1,'devouring':1,'there':46,'three':1,'their':3,'was':3,'more':1,'survives':1,'lived':1,'that':4,'blindly':1,'careful':1,'with':1,'those':1,'he':6,'plants':1,'none':2,'whether':1,'science':2,'this':11,'will':2,'while':3,'of':2,'constant':1,'remained':1,'is':1,'it':74,'an':2,'as':7,'at':2,'in':16,'if':11,'different':1,'no':4,'perhaps':5,'when':10,'astronomers':1,'how':3,'another':1,'other':1,'which':2,'you':1,'relatively':1,'inconceivably':1,'ultimately':1,'most':2,'why':2,'man':5,'a':10,'expert':1,'slightly':1,'splendid':1,'enter':1,'the':90},'reminds':{'us':1},'repeated':{'trials':1,'over':1,'until':1,'but':1,'many':1},'billion.':{'illustration':1},'plague':{'of':1},'bug':{'closely':1,'actually':1},'versatile':{'life':1},'partially':{'eclipsed.':1,'reappeared':1,'collided':1,'landlocked':1,'dried-up':1},'constitute':{'light':1,'as':1,'heat':1,'matter':1},'wise':{'and':1,'saying':1,'enough':1},'glory':{'and':1,'that':1},'wish':{'to':1,'however':1,'they':1},'j':{'.':98},'variations':{'and':2,'often':1,'that':1,'are':4,'which':1,'in':3,'or':3},'lynx':{'and':1,'the':2},'minutes':{'and':1,'saving':1,'for':1,'hard':1,'.':5,'holding':1,'in':1,'the':1,';':1,'before':1},'squat':{';':1,'motionless':2},'supreme':{'synthesis':1},'rabbits':{'and':2,';':1,'.':1},'pin':{'s':2},'swimmers--for':{'there':1},'transfused':{'into':2},'reptiles.':{'triassic':1,'carboniferous':1,'permian':1,'illustration':1,'in':1},'well-defined':{'and':1,'hereditary':1},'periods':{'of':4,'but':1,'to':1,'in':1,'the':1,'if':1},'141.5':{'1.88':1},'our':{'planetary':1,'atmosphere':5,'boyhood':1,'flesh':1,'rooms':1,'human':1,'skin':1,'earth':6,'admiration.':1,'web':1,'knowledge':11,'conclusions':1,'energies':1,'dipper':1,'consideration':1,'views':3,'very':1,'oceans':1,'photograph':1,'dark':1,'coal-measures':1,'hands':1,'foot':1,'coal-fields':1,'problems.':1,'solid':1,'race':2,'common':2,'small':1,'telegraphic':1,'bone':1,'methods':1,'colossal':1,'legacy':1,'blues':2,'sun':8,'artificial':1,'moon':2,'finger':3,'new':1,'email':1,'universe.':2,'belief':1,'power':1,'attention':1,'craters':1,'stellar':2,'heads':1,'estimate':1,'cities':1,'hours':1,'great':2,'central':1,'water-oceans.':1,'universe':7,'days':2,'forbears':1,'physiological':1,'survey':1,'steadily':1,'successors':1,'whole':1,'first':2,'own':15,'point':1,'instruments':2,'primary':1,'system':6,'feet':1,'elder':1,'cultivated':1,'total':1,'kind':1,'mental':1,'little':1,'eye':1,'flying':1,'charts':1,'wonderful':2,'way':1,'time':1,'scope':1,'sort':1,'eyes':4,'shell':1,'gas':1,'appreciation':1,'solar':9,'present':1,'apprehension':1,'admiration':1,'comprehension.':1,'imagination.':1,'universe--astronomical':1,'future':1,'exploration':1,'life.':1,'problem':1,'average':1,'mud-fishes':1,'frogs':3,'modern':3,'mind':2,'metals':1,'general':1,'sudden':1,'experience':2,'orchards':1,'domesticated':1,'terrestrial':1,'ancestors':1,'winter':1,'conclusions.':1,'ideas':1,'food':1,'conceptions':1,'largest':1,'ordinary':2,'civilisation':1,'bells':1,'investigations':1,'senses':4,'milky':1,'hand':1,'shores':1,'most':2,'purpose':1,'predecessors':1,'age':1,'coal':1,'chief':1,'greatest':1,'trains':2},'paraguay':{'and':1},'mysteriously':{'regular':1,'from':2},'pit':{'the':1,'whence':1},'proceeds':{'to':1,'what':1,'the':1},'48':{'the':1,'ounces':1},'49':{'photo':1,'by':1},'corporation':{'organized':1},'44':{'photo':1},'fore-arm':{';':2,'.':1},'fruit-laden':{'branch':1},'detail':{'to':1,'so':1,'which':1,'such':1},'40':{'photo':1,'are':1,'tons.':1},'41':{'photo':1},'sandy':{'shores':1,'loess':1,'places':1},'tree-tops':{'express':1},'out':{'and':6,'among':1,'is':1,'into':1,'some':1,'as':4,'at':4,'in':12,'sounds':1,'still':1,'apparently':1,'its':5,'saline':1,'light-waves':1,'from':9,'for':3,'their':1,'1890':1,'there':1,'had':1,'three':1,'.':5,'to':4,'those':1,';':2,'pre-eminent':1,'until':1,'more':1,'we':1,'his':1,'that':6,'very':1,'measures':1,'about':1,'fat':1,'how':2,'heat':1,'waves':1,'during':1,'profitless':1,'with':2,'by':3,'vast':1,'he':1,'a':9,'on':2,'great':1,'like':1,'these':1,'of':54,'according':1,'whether':1,'streams':1,'the':9,'are':2},'quintillion':{'atoms':1},'conveys':{'that':1},'period.':{'illustration':1},'functionless':{'letters':1},'dilatable':{'sac':1},'variation':{'being':1,'of':2,';':1,'in':1},'enlargement':{'of':3},'d-e.':{'an':1},'death.':{'this':1},'astronomy':{'and':1,'be':1,'that':1,'this':1,'of':1,'.':9,'deals':1,'to':1,'as':1,'at':1,'which':1,'the':1,'has':1,'by':1,'are':1},'keane':{'a':1},'race--many':{'animal':1},'pupil':{'the':1},'4a':{'hypohippus':1},'limited':{'warranty':1,'right':2,'.':1,'to':3,'as':1,'extent':1,'than':1,'areas':2},'gossamer':{'forms':1,'the':1,'202':1,'spiders':2,'.':1},'oxygenation':{'and':1},'holman':{'matter':1},'comparatively':{'dry':1,'little':1,'everlasting':1,'shallow':1,'large':1,'few':1,'narrow':1,'recent':2},'dynasty':{'and':1},'neoceratodus':{'has':1,'by':1},'sleep':{'and':1,'the':1},'admiration.':{'sec':1},'poorly':{'developed':2},'belonged.':{'when':1},'flash.':{'it':1},'feeding':{'growing':1,'on':2,'purposes':1,'chiefly':1},'patches':{'of':1,'in':1,'on':1},'paris':{'also':1,'as':1},'34.':{'illustration':1},'ceylon':{'and':1,'the':1},'charles':{'darwin':4,'r':1,'e':1,'descent':1},'thinnest':{'vapours':1,'part':1,'parts':1,'.':1},'340':{'000':1},'whatsoever':{'we':1,'.':2},'caused':{'a':1,'though':1,'this':1,'when':1,'to':1,'in':2,'by':1},'elapsed':{'before':1},'comet--the':{'stellar':1},'risk':{'of':6},'arboreal':{'and':1,'life':5,'apprenticeship--an':1,'mammals':1,'evolution':1,'.':2,'insectivores':1,'habits':2,'apprenticeship--tentative':1,'mother':1,'apprenticeship':8,'marsupials':1},'dispense':{'energy':1,'with':2,'largely':1},'brackish':{'water':1,'swamp':1},'rise':{'and':1,'great':1,'enormously':1,'very':1,'of':8,'into':1,'.':2,'to':17,'in':1},'lurk':{'among':1},'hermon':{'there':1,'grass':1,'.':1},'every':{'ten':1,'laboratory':2,'house':1,'haunt':1,'one':1,'second':1,'human':1,'year':3,'corner':1,'element':2,'species':1,'physical':1,'now':2,'many-celled':3,'atom.':1,'addition':1,'question':1,'two':1,'port':1,'chemical':1,'few':1,'gramme':1,'other':2,'animal':3,'empty':1,'niche':3,'amateur':1,'form':1,'class':1,'gas':1,'possible':1,'killing':1,'protection':1,'atom':1,'vigorous':1,'hole':2,'twenty-thousandth':1,'opportunity':1,'day':4,'man':1,'kind':1,'substance':3,'instant':1,'third':2,'hour':1,'particle':3,'arc-lamp':1,'glowing':1,'introduction':1,'part':1,'bone':1,'time':1,'star':1,'side':4,'clap':1,'twenty-four':2},'gratification':{'of':1},'east.':{'illustration':1},'slipperiness':{'.':1},'monkeys':{'and':5,'is':1,'it':2,'sec':1,'at':1,'have':2,'securing':1,'.':3,'may':1,'other':1,'which':1,';':1,'semnopithecus':1,'learn':1,'but':1,'such':1,'than':1,'on':1,'leaving':1,'were':1,'very':1,'the':2,'where':1,'or':1,'are':2},'encounter':{'the':1},'discovers':{'the':1,'when':1},'school':{'in':1},'parrot':{'of':1,'s':2,'belongs':1,'which':1,'s-beak':1,'stringops':1},'conceive':{'of':2,'the':1,'then':1},'loess':{'of':1,'either':1,'sandy':1},'apprehension':{'so':1,'.':1},'hickson':{'s':1,'puts':1},'relics':{'of':3,'vestigial':1,'.':1},'venus':{'and':1,'flower':3,'67.2':1,'is':1,'s':1,'fly-trap':2,'earth':1,'the':3,'are':1},'humps':{'daily':1,'were':1},'degeneracy':{'in':1},'enjoy':{'pulling':1,'.':2},'veritable':{'museum':2,'physical':1},'zinc':{'and':8,'is':2,'sulphite':1,'which':1,'pass':1,'has':1},'faintest':{'stars':1},'infancy':{'is':1,'would':1},'estimates':{'which':1},'direct':{'and':2,'a':1,'knowledge':1,'descendants':1,'there':1,'competition':1,'passage':1,'to':1,'appropriate':1,'four-footed':1,'statement':1,'indirect':1,'traces':1,'or':1},'nail':{'and':1,'on':1,'as':1,'pulled':1},'yerkes':{'experimented':1,'observatory':1,'studied':1,'40-inch':4,'changed':1,'observatory.':9,'has':1,'refractor':2},'electricians':{'have':1},'street':{'a':1,'or':1},'infiltration':{'of':1},'estimated':{'to':2,'the':3,'fig':1,'that':2},'expressive':{'of':1},'shining':{'disc':1,'through':1},'blue':{'and':2,'box':1,'butterfly':1,'chequer':1,'fit':1,'in':1,'sky':6,'.':1,'hot':1,'disc':1,'green':1,'waves':1,'indigo':1,'the':1,':':1,'or':1,'reptiles':1},'change.':{'a':1,'sec':1},'hide':{'their':2},'pariasaurus':{':':2},'organisms':{'and':1,'to-day':1,'which':4,'of':1,'upon':1,'it':1,'.':1,'are':1,'have':2,'i.e':1,'found':1,'seem':1,'has':1},'solemn':{'occasion':1,'slowness':1},'beaten':{'into':2,'grain':1,'out':1},'revolves':{'round':2},'museum.':{'a':1,'meteorite':1,'carrier':2,'homing':1,'yellow-crowned':1},'liberty':{'.':1},'children':{'and':1,'who':1,'should':1},'characters.':{'in':1},'zoologists':{'with':1},'change;':{'variability--evolution':1},'conduct':{'man':1,'.':1,'in':1,'but':1,'demands':1},'ebbs':{'and':1},'supplies':{'of':1,'the':1,'.':1},'revolved':{'will':1,'on':1,'round':1},'reacts':{'cannot':1},'electricities':{'in':1},'unexhausted':{'possibilities':1},'hundreds':{'and':1,'of':15,'but':1},'seven-weeks-old':{'human':1},'resounded':{'to':1},'represented':{'as':2,'by':9,'for':1,'in':4},'path':{'followed':2,'of':6,'when':1,'marked':1,'round':2,'closely':1,'from':1,'the':1,'by':1,'if':1},'shortness':{'of':2},'through.':{'light':1},'digits':{'of':1,'on':1},'wood-snail':{'in':1},'earth--a':{'transition':1},'distinctness':{'.':1},'ventures':{'were':1},'tons.':{'the':2,'illustration':2},'leaves':{'and':3,'a':1,'or':1,'fanwise':1,'us':1,'one':1,'which':1,'the':1,'.':2,';':2},'settles':{'down':3},'mantis':{'on':1,'religiosa':2,'mantis':2},'mistake':{'to':2,'for':2,'but':1},'settled':{'down':2,'the':1,'within':1},'svante':{'worlds':1},'substances.':{'in':1},'stray':{'present-day':1,'erratic':1},'straw':{'looked':1,'as':1,'so':1},'plants--paint':{'the':1},'equipment.':{'1.f.2':1},'feelings':{'and':2,'such':1,'it':1,'in':1},'patience':{'and':2,'of':1,'were':1},'miles--eighteen':{'times':1},'anyhow':{'as':1},'greatness.':{'it':1},'ape-man--an':{'early':2},'scaffolding':{'but':1},'would':{'help':1,'do':2,'cover':1,'thus':1,'it':1,'one':1,'say':2,'cease':2,'have':15,'in':1,'go':1,'seem':4,'provoke':1,'yet':1,'witness':1,'doubtless':1,'certainly':1,'still':2,'appear':3,'lead':1,'also':1,'estimate':1,'disintegrate':1,'make':2,'unduly':1,'favour':1,'tend':3,'increase':1,'consistently':1,'only':1,'shiver':1,'take':12,'fade':1,'recover':1,'probably':1,'include':1,'cause':1,'shrink':2,'therefore':1,'then':2,'begin':2,'survive':1,'that':1,'mean--matter':1,'burn':1,'confer':1,'obtain':1,'evolve':1,'a':1,'fall':1,'not':9,'penetrate':1,'be':45,'tick':1,'fly':2,'on':1,'frequently':1,'give':3,'like':2,'tear':1,'require':2,'no':1,'account':1,'yield':1,'explode':1,'suppose':1,'contain':1,'become':1,'inevitably':1,'instantly':1,'mean':3},'palings':{'and':1},'distributing':{'a':1,'medium':1,'this':1,'performing':1,'or':1,'project':2,'any':1},'smelted':{'together':1},'romanes':{'used':2},'preserved':{'namely':1,'except':1},'musk':{'will':1,'in':1},'ages--for':{'britain':1},'beauty':{'became':1},'ll.d':{'.':2},'correspondingly':{'longer':1},'arms':{'and':3,'emerging':1,'into':1,'bear':1,'.':1,'which':1,'not':1,'or':1},'excellent':{'milling':1},'20417':{'produced':1,'language':1},'outdated':{'equipment':1},'off.':{'peculiarities':1},'me':{'alone':1,'tangere':1,'a':1,'that':2},'mc':{'the':1},'piltdown':{'man':6,'skull':5,'.':1},'parachuting--a':{'persistence':1},'henry':{'huxley':2},'appendage':{'which':1},'ernest':{'h':2,'rutherford':6},'my':{'own':1},'latitudes':{'appear':1},'clock-work':{'started':1,'so':1},'mud-fishes':{'do':1,';':1,'of':1,'are':1,'or':1},'decorative':{'plume':1},'ingenuity':{'patience':1,'has':1},'powerfulness':{'of':1},'orion':{'the':1,'40':1},'keep':{'them':1,'up':2,'two':1,'their':1,'time':1,'the':3,'themselves':1,'ebooks':1},'attract':{'them':1,'any':1},'returned':{'to':2,'.':1},'ones':{'and':1,'on':2,'about':1,'made':1,'develop':1,'is':2,'pass':1,'make':1,'.':2,'below':1,'are':5,'hatching':2,'in':1,'go':1,'such':1,'come':1,'creeping':1,'first':1},'progression--always':{'a':1},'end':{'all':1,'which':1,'being':1,'of':32,'were':1,'it':1,'against':1,'.':3,'to':2,'they':1,'in':1,'fishes':1,'the':1},'telephonic':{'communications':1},'returning':{'half':1},'intruders':{'with':1,'.':1},'damages.':{'if':1},'particulars':{';':1},'buns':{'without':1,'some':1,'ashore':1},'writers':{'have':1},'modernising':{'of':1},'widespread':{'and':2},'ancestor':{'of':2,'from':1},'badly':{'stung':1,'when':1,'agee':1},'poker':{'again':1,'into':1,'loses':1,'is':2,'in':1},'both.':{'monkeys':1},'scion':{'of':1},'mouths':{'of':2,'on':1},'erected':{'on':1},'invisible--just':{'as':1},'albumin':{'casein':1},'delicacy':{'in':1},'confirmed':{'as':1,'by':1},'lump':{'of':1},'jumping':{'out':2},'poked':{'it':1},'system--with':{'all':2},'leplay':{'school.':1},'amid':{'the':1,'green':1},'spout':{'.':1,'in':1},'hypotheses':{'and':1,'which':1},'perform':{'all':1,'distribute':1},'complexity':{'and':2,'of':3,'possible':1,'or':1},'upside':{'down':1},'eurypterids':{'or':1},'decreasing':{'coal':1},'diary':{'of':1,'is':1},'squirrel-like':{'marmosets':1},'unsteady':{'slippery':1},'flippers':{'which':1,'for':1},'recurrent':{'stimulus':1,'vicissitudes.':1},'untold':{'ages':1},'daughter-units':{'thus':1,'are':1,'that':1},'alternation':{'of':1},'orang':{'and':2,'notice':1,'is':1,'chimpanzee':2,'.':1,'will':1,'are':1,'the':2,'has':2,'than':1,'232':1},'underside':{'of':1},'inattentive.':{'of':1},'london':{'bridge':1,'the':1,'as':1,'zoological':1},'thesis':{'that':1},'terns':{'spending':1},'beside':{'it':1},'daughter-buds':{'go':1,'living':1},'borneo':{'living':1},'anolis':{'of':1},'expectations':{'there':1},'exhibits':{'a':1,'an':1},'writing':{'without':1,'from':1,'or':1},'destroyed':{'and':1,'for':1,'it':1,'but':1,'.':1,'to':1,'the':1,'was':1,'by':2},'trams':{'in':1},'fade':{'entirely':1},'400':{'000':1},'peopling':{'of':4},'centimetre':{'of':2},'250000':{'inch':1},'prevented':{'by':2},'direct-reading':{'spectroscope':2},'tree-stems':{'and':2},'revelations':{'of':2,'it':1,'to':1},'diseased':{'condition':1},'flotation':{'and':1},'skin-leaves':{'about':1},'shadows':{'are':1},'ingested':{'food':1},'swaying':{'on':1},'potatoes':{'settling':1},'water-fleas':{'and':1},'explode':{'and':1,'them':1},'instant':{'of':1,';':1,'it':1},'victory':{'is':1,'alike':1},'fitness':{'of':1,'for':1,'follows':1},'unit-bodies':{'.':1},'attained.':{'now':1},'notifies':{'you':1},'wariness':{'is':1},'flat-fish':{'has':1,'does':1,'like':1},'verrier':{'discovered':1},'provisions.':{'1.f.6':1},'emphasise':{'as':1},'member':{'and':1,'of':2,'.':2},'magnets':{'.':1},'defences':{'of':1},'clothe':{'itself':1},'depress':{'one':1},'gutenberg-tm.':{'1.e.5':1},'gibbon':{'and':1,'is':2,'orang':2,'which':1,'others':1},'driving':{'water':1,'away':1,'off':1,'the':1},'god':{'s':1},'washed':{'away.':1,'away':2,'down-stream.':1},'integrative':{';':1},'day.':{'there':1,'bibliography':1,'but':1},'laid':{'within':1,'it':1,'down':4,'in':2,'the':1,'or':1},'adjust':{'themselves':1},'millennium':{'b.c':2,'further':1,'after':1},'heavenly':{'body':1,'bodies':3},'got':{'possession':1,'a':4,'his':1,'from':1,'apparatus':1,'no':1,'very':1,'into':1,'loose':1,'it':2,'together':1,'the':3,'their':1,'started':1,'green':1,'nothing':1,'rid':2,'across':1,'films':1},'newly':{'born':1,'hatched':4},'twenty-five':{'trillion':1,'tons':1,'miles':1,'million':1},'independence':{'of':1},'splashed':{'into':1},'provide':{'access':1,'a':4,'volunteers':1,'in':1},'carcass':{';':1},'eternal':{'night':1,';':1,'night--relieved':1,'winter':1,'possible':1},'free':{'from':2,'for':1,'oxygen':1,'air':1,'if':1,'.':1,'access':1,'to':3,'future':1,'agents':1,'nitrogen':1,';':1,'hand':4,'distribution':3,'has':1,'intercrossing':1,'anyhow':1,'swimming':1},'carcase':{'of':1},'masterliness':{'of':1},'whereupon':{'the':1},'rain':{'of':1,'dissolving':1,'each':1,'began':1,'to':1},'biological':{'conditions':1,'idea':1,'necessity':1,'ideas--the':1},'calcareous':{'algae':1},'wanted':{'and':1,'.':2},'publication':{'of':1},'solution...':{'.':1},'grasses':{'and':1},'inexpensive':{'physiologically':1},'days':{'and':1,'old':2,'it':1,'in':2,'there':1,'when':1,'29':1,'.':5,'note':1,'to':2,'weeks':1,'then':1,'fourteen':1,'with':1,'he':1,'on':1,'longer':1,'of':5,'stand':1,'were':1,'following':1,'the':1},'rang':{'our':1,'up':1},'appeals':{'to':2},'possibility--involution':{'rather':1},'researches':{'have':1},'primary':{'reservoir':1,'occupations':1,'meaning':1,'emotions':1,'entity':2,'colours':3,'source':1,'reason':1,'atomic':1},'rank':{'mammals':1},'hearing':{'and':1,'this':1,'is':1,'.':1,'heard':1,'are':1,';':1,'has':1,'comes':1},'staying':{'power':1},'philosophical':{'dictum':1},'adopted':{'by':1},'scissors':{'fall.':1,'.':1},'redivides;':{'there':1},'mercury':{'the':2,'is':1,'it':1,'.':1,'s':2,'between':1,'venus':1,'36.0':1},'magnificent':{'spread':1},'toy':{'of':1},'discriminates':{'between':1},'top':{'with':1,'of':9,'end':1,'are':1},'sumatra':{'and':1},'heights':{'of':1,'holding':1,'above':1},'ton':{'of':1,'or':1,'to':1},'motility':{'are':1,'in':1},'wildly':{'down':1},'variational':{'uplifts':1},'unbroken':{'and':1,'silence':1},'toe':{'to':1,'is':1,'reaches':1},'instreaming':{'multitude':1},'tool':{'is':1,'in':1,'.':2},'brushes':{'off':1},'serve':{'to':1,'as':3,'its':1},'conspicuously':{'as':1,'coloured':1},'190':{'photo':1,'the':1},'western':{'and':1},'injected':{'into':1},'mankind--notably':{'the':1},'frankly':{'answered':1},'divisible':{'into':1},'immaterial':{'.':1},'cogged':{'wheel':1},'classes':{'of':2,'into':1,'called':1,'so':1,'which':1,'orders':1},'flame':{'shattered':1,'is':1,'was':1},'hearing.':{'instinctive':1,'power':1},'bridge':{'the':1,'for':1},'donkey':{'grazing':1},'fashion':{'so':1,'of':1,'with':1,'.':2},'handkerchief':{'.':1},'ran':{'riot':1},'progressing.':{'b':1},'agility':{'.':1,'that':1},'raw':{'material':1,'materials':3},'rat':{'or':1},'regulate':{'what':1,'growth':1,'the':1},'leafy':{'surroundings':1},'relatively':{'poor':2,'great':1,'slow':1,'easygoing':1,'less':2,'cooler':1,'shallow':4,'well':1,'uniform':1,'naked':1,'simple':1,'safe':1,'short':1,'larger':1,'small':1,'recent':2,'more':2},'reminding':{'him':1,'one':1},'-':{'of':1,'you':5,'except':1,'if':1},'isolated':{'ponds':1,'from':1,'northern':1,'here':1,'districts':1,'alpine':1},'thorough':{'aeration':1},'curly-haired':{'australian':1},'perigord':{'mentone':1},'rodents':{'and':1,'are':1},'hatch':{'inside':1,'from':1,'out':1},'world.':{'besides':1,'it':1,'illustration':1,'but':1,'another':1,'if':1,'physical':1},'effectiveness':{'of':1},'douching':{'with':1},'beta-rays':{'from':1},'propitious':{'environment':1},'greatest':{'mathematical':1,'distance':1,'accuracy':1,'reflector':1,'density':1,'of':4,'prominences':1,'triumphs':1,'instrument':1,'physicists':1,'in':1,'authorities':1,'were--the':1,'scientific':1},'though':{'it':9,'in':1,'still':1,'its':1,'there':1,'their':1,'other':1,'more':1,'we':3,'viviparous':1,'that':1,'very':1,'most':1,'they':5,'not':1,'now':1,'man':1,'a':1,'this':1,'many':1,'these':1,'the':9},'picturesquely':{'the':1},'leaf.':{'illustration':1},'tree-snakes':{'tree-lizards':1},'swampy':{'low':1},'glimpses':{'of':1},'plays--the':{'reindeer':1},'plenty':{'of':4},'coil':{'of':3,'is':1,'thus':1},'coin':{'and':1,'through':1},'parting':{'of':1},'glow':{'as':1,'made':1,'with':3,'into':1,'.':2},'lift':{'a':1,'it':1,'sea-urchins':1},'flow':{'of':10,'is':2,'in':1,'or':1,'.':1},'spencer':{'formulated':1},'unwary':{'person':1},'curie':{'and':1,'was':1},'orderly':{'hierarchy':1},'reputation':{'of':1,';':1,'for':1},'gratefully':{'accepted':1},'constance':{'or':1},'chariot':{'and':1},'bait':{'and':1},'spikelets':{'in':1},'manifestation':{'of':3,'in':1},'solutions':{'are':2},'nerve-cells':{'and':4,'an':1,'in':1,'.':1},'mingle':{'with':1},'observatory.':{'a':3,'giant':1,'star':1,'diagram':1,'meteorite':1,'3':1,'jupiter':1,'fig':10,'solar':1,'mars':1,'the':4,'100-inch':1},'endowment':{'of':2,'.':1},'availability':{'of':1},'founded.':{'if':1},'spite':{'of':6},'flat-fishes':{'we':1,'like':1},'situations':{';':1,'which':1},'institution':{'of':1,'at':1,'for':1},'turkestan':{'and':1},'fifty-foot':{'beach':2},'disgust':{'.':1},'gods':{'.':1},'lodge':{'reminds':1,'has':1,'sir':1},'announce':{'every':1},'insect-visitors--began':{'to':1},'borrowed':{'house':1,'shell':1},'waltz':{'round':1},'solution.':{'imitation':1},'nerve-cell.':{'7':1},'watch':{'a':4,'.':1},'fluid':{'water':1,'the':2,'that':1,'was':1,'.':1},'system--regions':{'of':1},'existence--which':{'includes':1},'shutting':{'out':1},'tuberculosis':{'.':1},'despite':{'these':1},'report':{'1914.':1,'1915.':4,'1917.':3,'1917':1,'1914':1},'knocks':{'it':1},'wavy-haired':{'pre-dravidians':1},'gutenberg-tm':{'and':1,'web':1,'license.':1,'concept':2,'name':1,'license':7,'is':1,'work':5,'trademark':4,'s':1,'collection':2,'mission':2,'project':1,'depends':1,'including':1,'works.':2,'works':3,'electronic':18,'ebooks':2},'beads':{'screw':1},'to-day--the':{'elk':1},'countries':{'a':1,'of':1,'there':1,'are':1,'.':1},'rowing':{'and':1},'taken--the':{'emergence':1},'public':{'is':1,'would':1,'support':1,'domain':8},'twice':{'.':1,'as':2,'they':1,'during':1,'the':2,'or':1},'progress.':{'vi':1,'sec':1,'conquering':1},'automatic':{'machine':2,'internal':1,'machine.':1},'farther':{'and':3,'away.':1,'from':2,'away':2,'back':2,'in':1,'north':1},'new.':{'the':1,'illustration':1},'swept':{'down':1,'away':1,'slowly':1,'out':1},'habit':{'a':1,'and':1,'may':1,'of':8,'some':1,'amongst':1,'which':1,'has':1},'nut':{'and':2,'drop':1},'send-off':{'in':2},'retreat.':{'the':1,'another':1},'resist':{'such':1,'the':1,'snapping':1},'t.':{'hobhouse':1},'sea-squirts':{'and':1,';':1,'which':1},'life-preserving':{'value':1},'volans':{'of':1,'which':1},'disturbing':{'influence':2},'discriminating':{'and':1,'quality':1},'combustion':{'is':2,'as':2,'it':1},'capacity':{'and':1,'about':1,'for':3,'that':1,'of':1,'is':1,'.':2,'in':1,'the':1},'ranged':{'one':1},'paternal':{'origin':1,'and':1,'care':1},'mud':{'and':3,'getting':1,'encasements':1,'when':1,'.':2,'that':1,'or':1},'wave-lengths.':{'light-waves':1,'light--visible':1},'finger':{'and':3,'on':1,'from':2,'would':1,'joints':1,'.':1,'usually':1,';':1},'monkeyish':{'features':1},'367':{'000':1},'stored-up':{'energy':1},'approach':{'of':1,'the':2,'160':1,'by':1,'us':1},'discovery':{'and':1,'has':2,'that':2,'of':29,'site':2,'to':1,'which':1,'in':1,'go':1,':':1},'guesses':{'as':1,'or':1},'elk':{'and':2,'the':1},'confusion':{'of':1},'incarnation':{'to':1},'weak':{'and':1,'breakage':1,'keel':1,'plane':1,'one':1},'however':{'composed':1,'and':1,'there':4,'is':1,'it':4,'say':2,'another':1,'in':1,'if':1,'different':1,'acknowledge':2,'interesting':1,'faint':1,'long':1,'by':3,'to':1,'only':2,'slowly':1,'take':1,'that':8,'continuous':1,'what':1,'following':1,'they':2,'not':1,'with':1,'than':1,'a':2,'on':1,'this':1,'enabled':1,'as':1,'so':2,'things':1,'small':1,'the':7},'sand-crab':{'takes':1},'larynx':{'.':1},'aquarium':{'.':1},'consists':{'almost':1,'of':11,'essentially':2,'chiefly':1},'flowering':{'plants':7,'plant':1,'plants.':1},'newt':{'or':1},'improve':{'the':1},'protect':{'the':3},'rhythms':{'.':1},'irregular':{'stretches':1,'speck':1},'jelly':{'about':1,'.':1},'threads':{'used':1,'secreted':3,'of':4,'.':1,'sink':1,'the':2,'are':1},'expense':{'to':1},'frequenting':{'forests':1},'diversity.':{'thus':1},'goodrich':{'evolution':1},'discolorations':{'produced':1},'starling':{'and':1},'majestic':{'spirals':1},'trust':{'.':1},'utilised.':{'indeed':1},'colour-scheme':{'of':1},'influence.':{'illustration':1},'phyllopteryx':{'has':1},'cockroaches':{'to':1,'.':1},'been':{'unified':1,'shot':1,'able':6,'pointed':1,'named':1,'profoundly':1,'attempts':2,'elevated':1,'mentioned':1,'wrought':1,'subjected':1,'written':3,'to':3,'detected':1,'going':3,'transformed':1,'attained':1,'emitting':1,'fancied':1,'unravelled':1,'secured.':1,'very':4,'familiar':2,'reconverted':1,'got':1,'vastly':1,'hitherto':1,'adventurous':1,'rotating':1,'lost':1,'banished':1,'dulled':1,'traced':2,'retrogressions':1,'solved':3,'slipping':1,'found':9,'discussing':2,'interbreeding':1,'achieved':1,'some':1,'briefly':1,'understood':1,'invaded':1,'added':2,'sifted':1,'estimated':1,'borne':1,'established':1,'shown':2,'said':4,'witnessed':1,'beaten':1,'expressed':1,'laid':1,'progress':1,'burned':1,'induced':1,'numerous':1,'blotched':1,'demonstrated':1,'recently':3,'opening':1,'analysed':1,'broken':1,'drawn':1,'colonised':2,'christened':1,'suggested':4,'on':1,'great':1,'buckled':1,'many':1,'greatly':1,'introduced':1,'reached.':1,'examining':1,'raised':1,'followed':1,'adepts':1,'hewn':1,'explained':1,'one':3,'brought':1,'visible':1,'done':1,'capacious':1,'.':1,'given':1,'invented':1,'flaws':1,'weathered':1,'exposed':1,'noticed':2,'smelted':1,'much':2,'slowly':1,'taken':2,'fortuitous':1,'more':1,'life':1,'gaseous':1,'discovered':1,'enough':1,'successful':2,'registered':1,'tested':1,'part':1,'known':7,'suspected':1,'worked':1,'true':1,'chequered':1,'applied':1,'made':10,'abandoned':1,'impatiently':1,'regularised':1,'evolved':3,'pumped':1,'propounded':1,'making':1,'called':1,'and':1,'resolved':1,'proved':1,'indicated':1,'exhausted':1,'turned':1,'an':3,'as':2,'at':3,'in':4,'seen':1,'constricted':1,'clearly':1,'if':1,'different':2,'no':1,'emancipated':1,'that':2,'generally':2,'handed':1,'any':2,'hot':1,'speeding':1,'digged':1,'fostered':1,'used':2,'tried':2,'confirmed':1,'prepared':1,'moving':1,'throughout':1,'measured':1,'recent':1,'a':11,'stupendous':1,'described':2,'slightly':1,'calculated':2,'required':1,'becoming':1,'thought':1,'dissolved':1,'so':4,'the':7},'legend':{'of':1},'were.':{'the':1},'spread':{'and':1,'from':1,'of':3,'over':2,'until':1,'underneath':1,'to':2,'through':2,'table':1,'public':1,'out':3},'expected':{'when':1},'poker.':{'they':1},'pallas':{'s':1},'pecked':{'at':2},'bladder':{'growing':1},'uncommon':{'on':1},'gaboon':{'in':2},'proportional':{'to':1},'catch':{'this':1,'small':1,'the':1},'own--a':{'fore-limb':1},'ancestors.':{'given':1},'deeps':{'the':1,'3':1,'are':1},'5a':{'merychippus':1},'lessen':{'the':1},'n':{'is':1,'.':5},'ape':{'and':2,'frequenting':1,'or':1,'for':1,'.':1,'s':1,'s.':1,'man':2,'agree':1,'at':1},'fallow':{'deer':1},'gave':{'off':6,'of':1,'rise':2,'most':1,'place':1,'the':3},'precede':{'the':1},'natives':{'of':1},'cyclones':{'.':1},'cast':{'.':1,'aside':1,'by':2},'jellyfishes':{'the':1,'swimming-bells':1,'worms':1},'expenses':{'including':2},'experts':{'should':1},'decanter':{'for':1},'www.pglaf.org.':{'section':1},'significance--called':{'the':1},'containing':{'a':3,'meat':1,'liquid':1,'very':1,'say':1,'the':1,'more':1},'headley':{'life':1},'circumventing':{'the':1},'suggest':{'the':4,'that':3},'underwood.':{'boiling':1,'the':1},'sollas':{'w':1},'linked':{'to':1,'together':1},'forehead':{'and':2,'a':1,'the':1,'without':1,'beetling':1},'utilitarian':{'in':1},'complex':{'and':2,'fur':1,'of':2,'problems':2,'.':3,'forms':1,'as':1,'nucleus':1,'brains':1},'gambian':{'mud-fish':2},'advances':{'the':3,'that':1,'but':1,'came':1,'in':2},'scapula':{'or':1},'snow-line':{'.':1},'several':{'millions':1,'colours':2,'kinds':1,'centuries':1,'cells':1,'sometimes':1,'human':1,'times':1,'hours':2,'enregistered':1,'complex':1,'printed':1,'molecules':1,'cases':1,'years':1,'thousands':1,'other':1,'transparent':1,'more':1},'satellite':{'of':1},'peaks':{'.':1},'pick':{'them':1,'up':2,'out':1},'constantly--either':{'spontaneously':1},'mouse-pupil':{'with':1},'characters':{'even':1,'of':1,'is':1,'.':1,'such':1,'swarming':1},'darwin.':{'illustration':1},'cycle':{'thread':1},'mentioning':{'birds':1},'tassel':{'being':1,'discharged':2,'branches':1,'electrified':2,'strikes':1},'staving':{'off':1},'paralysed':{'and':2},'possessed':{'of':1,'by':1,'in':2},'boxes':{'golden':1,'similar':1,'difficult':1},'rock-pool':{'where':1},'wide-awake':{'more':1},'mother':{'and':7,'digs':1,'for':1,'places':1,'that':1,'may':1,'of':1,'orang':1,'spider':1,'carey':2,'s':2,'so':1,'are':1,'tramps':1,'earth':1,'.':2},'unification':{'but':1},'jean':{'brownian':1},'photosphere.':{'above--that':1},'possesses':{'.':1,'an':1},'seasonal':{'colour-change':2,'change':1},'food-supply':{'.':2},'departed':{'from':2},'mending':{'of':1,';':1},'harmonise':{'with':2},'eye-hole':{'of':1},'partridge':{'sitting':1},'foundation.':{'-':1},'rivulets':{'and':1},'tailless':{'cat':1},'insectivore':{'stock':1},'evolution.':{'we':1,'metcalf':1,'parasitism':1,'this':1,'hutchinson':1,'illustration':1,'mccabe':1,'v':1,'the':1,'darwin':1,'iii':1,'osborn':1},'vibration':{'increased.':1,'of':1,';':1,'.':1},'master-key':{'that':1},'leibnitz':{'s':1,'who':1},'triangular-shaped':{'piece':1},'apart':{'and':1,'from':14,'of':3,'continuing':1,'.':2,'the':2},'interprets':{'be':1},'humanity':{'of':1,'into':1,'.':1},'foot.':{'there':1},'casting':{'themselves':1},'tracheae':{'.':1},'breaks':{'making':1,'off':2,'up':1,'across':1,'under':1},'sussex':{'and':1,'weald--hinted':1,'in':1},'vulture':{'is':1},'chitin':{'which':1,'.':1},'flattish':{'web':1},'expels':{'vitiated':1},'descending':{'element':1},'judge':{'the':1,'animals':1},'burns':{'the':1,'without':1},'advanced':{'and':1,'again':1,'life':1,'knowledge':1,'.':1,'to':1,'than':1},'foster-parent':{'to':1},'melting':{'ice.':1,'ice':1},'appearing':{'and':1,'on':1,'more':1},'angoras':{'and':1},'gift':{'follows':1},'55':{'cubic':1},'57':{'photo':2},'gifted':{'a':1},'50':{'states':1,'000':1},'53':{'the':1},'52':{'inches':1},'specific':{'gravity':2,'permission':1},'gristly':{'fishes':2,'rod':1},'mosquito':{'is':1,'introduces':1},'fixity':{'of':1},'56':{'photo':2,'lb':1},'outpour':{'of':1},'over-anxious':{'on':1},'successfully':{'applied':1,'by':1},'sponge':{'121':1,'illustration':1,'.':1,'to':1,'densely':1,'which':1,'has':1,'or':2},'clawed':{'mammals':1},'cessation':{'of':1},'finger-posts':{'for':1},'indirect':{'consequential':1,'interference':1,'in':1},'guess':{'and':1,'what':1},'tracheate':{'arthropods':1},'intellect':{'who':1,'which':3},'rapidity':{'and':1,'of':1,';':1,'illustrating':1,'.':1},'first--began':{'to':1},'drowned':{'himself':1},'proceeding':{'to':1,'is':1,'in':1},'rhine':{'and':1},'hibernates':{'but':1},'self-effacing':{'flat-fishes':1},'ear':{'and':1,'a':1,'of':2,'well':1,'marked':1,'to':1,'below':1,'which':1,'in':1,'has':1,'160':1,'came':1},'ice':{'and':1,'when':1,'is':1,'ages':4,'it':1,'.':2,'age.':2,'age':5,'287':1,'travel':1},'everything':{'and':1,'appeals':1,'that':1,'is':1,'as':1,'depends':1,'in':1,'not':1,';':1,'teemed':1},'loins':{'of':1},'select':{'a':1,'the':3},'seals.':{'almost':1},'cord':{'and':1,'lies':1,'the':1,'then':1},'core':{'to':2,'is':1,'254':1,'illustration':1,'left':1},'antiquity--perhaps':{'30':1},'disappeared':{'and':1,'from':1,'leaving':1,'somewhat':1,'.':1,'with':1},'littoral':{'animals':1,'haunts':1,'zone':1,'area':3},'permitted':{'by':2},'chapter':{'on':1,':':1,'give':1,'is':1,'in':7,'one':1,'to':1,'how':2,'.':1,'has':1,'was':1,'more':1},'limitation':{'of':2,'set':1,'permitted':1,'in':1},'attacks':{'the':1},'plum':{'and':1},'spikelet-bearing':{'axis':1},'burbank':{'such':1},'plunging':{'into':1},'coiled':{'round':1,'up':1},'steadily':{'accumulating':1,'through':1,'radiating':1,'decreasing':1},'efforts':{'project':1,'of':1,'and':1,'her':1},'alga':{'like':1,'which':1},'sept':{'.':1},'osborn':{'h':2,'s':4,'points':2,'calls':1},'antique':{'types':1},'primitive':{'animals':1,'nebulae':1,'instrument':1,'insects':1,'constituents':1,'men':3,'mammals':2,'.':3,'forms':1,'bushmen':1,'heat':1,'races':1,'bolt':1,'culture':1,'peoples':1,'mammal':1,'collaterals':1,'creatures':1,'type':1,'types':2,'man':2},'cracking':{'the':1},'presence':{'of':4,'.':1},'orders':{'of':2,'families':1,'like':1},'puzzle':{'in':1},'visible':{'and':2,'on':2,'all':2,'from':1,'266':1,'light':1,'radium':1,'spots':1,'.':2,'to':3,'surface':3,'suspended':1,'in':1,'tens':1,'by':1,'at':2},'bath':{'nor':1},'finely':{'developed':1},'bats':{'certainly':1,'for':1,'.':2,';':1,'volplaning':1,'or':1,'involves':1},'existed':{'.':1},'rely':{'to':1},'weald--hinted':{'at':1},'outbreaks':{'on':1,'of':1},'indispensable':{'as':1,'role':1,'sociality':1,'if':1},'sneezing':{'and':1},'transform':{'mechanical':1},'sunlight':{'and':1,'for':2,'is':2,'reflected':1,'to':2,'can':2,'which':3,'in':2,'has':1,'into':1,'are':1,'he':1},'why':{'a':1,'do':1,'we':1,'animals':1,'they':1,'for':1,'this':1,'is':2,'there':1,'some':1,'it':2,'should':4,'most':1,'so':1,'iron':1,'not':1,'our':1,'the':2,'he':1},'stuck':{'together':1},'tacks':{'of':2},'partridges':{'respond':1},'metabolism':{'.':1},'synthesis':{'the':1},'round.':{'c':1,'in':1},'head':{'and':2,'weighted':1,'from':1,'just':1,'157':1,'of':6,'is':2,'after':1,'downwards':1,'to':1,'when':1,'65':1,'they':1,'the':1,'with':1,';':1,'shows':1},'medium':{'and':1,'on':1,'we':1,'that':1,'of':3,'called':1,'through':1,'a':1,'you':1,'throughout':1,'with':2,'or':1},'amateur':{'knows':1},'hydrogen--which':{'consists':1},'java.':{'2':1},'wireless':{'he':1,'telegraphy':1},'heat':{'and':9,'because':1,'being':1,'is':4,'as':1,'are':1,'in':2,'our':1,'.':9,'is--substitutes':1,'rays':1,'from':4,'for':1,'to':2,'there':1,'had':1,'continually':1,'how':1,'only':1,'radiated':1,';':3,'has':1,'energy':12,'that':1,'becomes':1,'introduce':1,'heat':1,'radiations':1,'by':1,'like':2,'on':2,'would':1,'of':4,'could':1,'chiefly':2,'so':1,'light':1,'the':1,'changes':1,'or':2},'silvery-looking':{'light':1},'hear':{'a':1,'about':1,'the':1,'it':1},'satisfactorily':{'accounted':1},'heap':{'it':1},'manoeuvres':{'she':1},'removed':{'all':1,'in':1,'from':1,'.':1},'donate.':{'international':1},'luxuriant':{'vegetation':1},'admiration':{';':1},'indo-china':{'china':1},'portions':{'and':1,'reached':1,'of':1},'consequences':{'may':1,'.':2,'to':1,'as':1,'follow.':1,'have':1},'born':{'a':1,'and':1,'like':1,'of':1,'in':1,'.':1,'as':1,'so':1,'child':1},'bids':{'fair':1},'vivo':{'as':1},'meteorites.':{'every':1},'undeniable':{'endeavour':1,'apartness':1},'disturbances':{'and':1,'of':3,'we':1,'are':1,'man':1},'prematurely':{'and':1},'brightly':{'illumined':2,'but':1,'coloured':3},'furs':{'.':1},'roamed':{'many':1},'escape':{'the':4,'.':1,'from':3,'between':1},'everest':{'would':1},'0.62':{'7700':1},'scotia':{'voyage':1},'universes.':{'illustration':1},'shines':{'through':1},'entellus':{'venture':1},'furl':{'if':1},'constructed':{'to':1,';':1,'from':1},'looked':{'a':1,'upon':1,'at':1,'like':1},'planets--venus--is':{'there':1},'inborn':{'inspirations':1,'predispositions':2,'novelties':1,'engrained':1,'repertory':1,'capacities':2,'pre-arrangements':1,'efficiencies':1,'impulse':1,'in':1,'not':1,';':1,'changes':1,'or':1,'powers':1},'no':{'atmosphere':1,'less':3,'lack':1,'resistance':1,'commoner':1,'hibernation':1,'facts':1,'nearer':1,'glimpse':1,'effort':1,'better':1,'tail':1,'other':3,'warrant':2,'real':1,'sound':1,'return':1,'animal':1,'descendants':1,'trees':1,'figment':1,'instinctive':2,'difference':2,'twilight':1,'bigger':1,'particle':1,'success':1,'yucca':1,'cry':1,'eel':1,'indication':1,'nerves':1,'bulky':1,'scenery':1,'right':1,'hard':1,'idea':1,'sign':1,'cost':2,'escape':1,'employment':1,'bacteria':1,'enemies':1,'blue':1,'living':2,'thoroughfare':1,'steadfast':1,'opening':1,'definite':2,'spur':1,'kidneys':1,'movement':1,'body':1,'noise':1,'cleverer':1,'power':1,'parental':1,'attention':1,'use':3,'twinkling':1,'difficulty':2,'reason':4,'chapter':1,'restrictions':2,'great':1,'actual':1,'feelers':1,'certainty':1,'transition':1,'motion':1,'connection':1,'place':1,'nervous':1,'successors':1,'transit':1,'one':16,'such':6,'sounds':1,'scent':1,'ether':1,'landscape':1,'exertions':1,'jugglery':1,'additional':1,'union':1,'discrimination':1,'doubt':28,'positive':1,'interest':1,'more':5,'remedies':1,'life':2,'tissues':1,'way':1,'reaction':2,'training':1,'direct':2,'adult':1,'true':1,'plants':2,'animals':2,'conception':1,'cells':1,'air':1,'individual':1,'risks':1,'chlorophyll-possessing':1,'proof':2,'larger':3,'deliberation':1,'lock':1,'modern':3,'mind':1,'mining':1,'evidence':4,'chin':1,'sense':1,'ready':1,'floating':1,'organs':1,'check':1,'winter':1,'depth':1,'chemical':1,'vital':1,'branch':1,'intelligent':1,'plant':1,'star':1,'crowding':1,'trace':3,'backbone':1,'vicious':1,'prohibition':1,'pouch':1,'representations':1,'slums':1,'man':1,'diffusion':1,'longer':8,'rotting':1,'light':2,'shore':1,'fresh':1},'whereas':{'on':1,'lead':1,'these':1,'in':2,'others':1,'the':3},'tip':{'of':5,'t':1,'to':2,'.':1},'perfected':{'on':1,'scientific':1,'by':1},'tin':{'with':1},'setting':{'apart':3,'forth':1,'in':1},'sobral':{'brazil':1,'brazil.':1},'globigerinid':{'foraminifera':1},'investigations':{'in':1},'papers':{'and':1,'the':1},'pipa':{'the':1,'americana':2},'picture':{'represents':1,'these':1,'of':11,'is':1,'acts':1,'an':1,'the':2,'with':1,'shows':1},'ceasing.':{'where':1},'worm-types.':{'among':1},'toad':{'and':1,'winds':1,'s':1,'pipa':3,'looks':1},'preceding':{'state':1,'neanderthal':2,'the':1},'uniformly':{'around':1},'emission':{'came':1},'flower-perfumed':{'nor':1},'leonard':{'johnson':2},'ridges':{'and':3,'the':2,'which':1},'dullest':{'red':1},'discharge':{'takes':1,'of':3,'travels':1,'through':1,'in':4,'with':1},'suffused':{'with':3},'thorax':{'.':1},'buller':{'s':1},'to-day':{'and':2,'is':2,'as':1,'are':2,'in':1,'there':1,'.':13,'attack':1,'recapitulates':1,':':1,'mostly':1,'that':2,'very':1,'after':1,'but':1,'such':1,'by':1,'104':1,'a':2,'about':1,'of':2,'shall':1},'longer':{'be':2,'what':1,'redolent':1,'than':7,'in':1,'deny':1,'or':1,'to':3,'because':1,'at':1,'waves':1,'the':1,'.':1,'emit':1},'n.':{'america.':1},'1800':{'of':1},'vigorously':{'.':1,'continued':1,'for':1,'that':1},'changed':{'and':1,'by':1,'from':1,'but':1,'.':1,'in':1,'the':3,'its':1},'hypohippus':{';':1},'serious':{'and':1,'errors':1,'business':1,'nervous':1,'friction':1,'responsibilities':1,'difficulties':1},'nuclei':{'then':1,'within':1},'undoubted':{'but':1},'remarkable':{'plants':1,'and':2,'bony':1,'physical':1,'knowledge':2,'success':2,'habit':2,'appearance':2,'metamorphosis':1,'combination':1,'results':1,'discovery':2,'except':1,'power':3,'exuberance':1,'perfection':1,'words':1,'locomotor':1,'.':2,'sucking':1},'varying':{'forms':2,'nature':1,'notably':1,'magnitude--and':1,'degrees':1,'situation':1,'with':1},'rod':{'which':1,'.':1},'focus':{'of':1,'whence':1,'within':1},'leads':{'to':2,'one':1,'us':2,'on':1},'inspirations':{'of':1},'computation':{'.':1},'coyote':{'.':1},'jointed-footed':{'invaders':1,'animals':1},'dragon-flies':{'and':2,'are':1},'displaying':{'the':1,'performing':2,'or':1},'tucking':{'it':1},'injure':{'their':1},'doom':{'by':1},'books--an':{'outline':1},'essentials':{'of':1},'ascidians':{'and':1},'fahr.':{'due':1},'metallurgists':{'and':1},'passage':{'from':6,'of':3,'is':2,'onward':1,'direct':1,'in':2},'environment':{'and':4,'we':2,'adaptations':1,'where':1,'acts':1,'.':3,'to':1,'113':1,'which':1,'making':1,';':1,'education':1,'with':1},'charge':{'and':1,'on':1,'anything':1,'for':1,'was':1,'of':3,'to':1,'a':3,'with':1},'promoting':{'the':1,'free':1},'discovering':{'new':1},'hammers':{'on':1,'until':1,'it':1},'ulna':{'of':1,'bone':1},'advantage':{'for':1,'may':2,'of':7,'over':2,'here':1,';':1,'was':1,'is':1},'coot':{'swims':1},'exalted':{'powers--man':2},'inspiriting':{'picture':1},'fleece':{'cutting':1},'untenable':{';':1},'nesting':{'behaviour':1},'refractive':{'granules':1},'regular.':{'now':1},'roving':{'animal':1},'cool':{'and':1,'mass':1,'gas':1},'annihilated':{'distance':1},'clouds':{'of':3,'which':1,'in':1},'impressive':{'triumphs':1,'picture':1,'nebula':1},'level':{'and':1,'on':3,'of':5,'is':1,'there':1,'up':1,'.':3,'at':1,'the':1,';':1,'man':1},'sedimentary':{'rocks':6},'hawaii':{'to':1},'cloudy':{'precipitate':1},'standards':{'is':1,'are':1},'starlit':{'night':1},'slouching':{'gait':1},'vicissitudes':{'due':1},'quick':{'to':5,'or':1},'lever':{'against':1},'accumulation':{'of':2},'bull-terrier':{'called':1},'illustrating':{'the':5,'walking':2,'animal':1},'trend':{'of':3},'becquerel':{'brought':1,'was':1},'obsolete':{'old':1},'inland':{'and':1,'the':1,'than':1},'widened':{'and':1},'invaded':{'age':1,'by':1},'dried':{'and':1,'up':4},'hair.':{'the':1},'trent':{'the':1,'291':1,'290':1,'an':1},'danger-note':{'.':1},'bacteria':{'and':1,'serving':1,'that':1,'of':2,'though':1,'.':1,'can':1,'have':1,'in':1},'substitute':{'the':1},'spectral':{'lines':1},'water-plants':{';':1},'stands':{'about':1,'unique':1,'by':2,'apart':1},'stomach.':{'4':1},'structure--the':{'remains':1},'extinct.':{'unfortunately':1,'others':1},'paragraph':{'1.f.3':3,'1.e.1.':1,'to':1,'1.e':1,'f3':1,'1.e.8':1,'1.c':1,'1.e.8.':1,'1.e.1':1},'goes':{'on':6,'back':1,'leaving':1,'down':1,'to':4,'as':1,'without':1,'through':1},'bearers':{'and':1},'illimitable':{'.':1},'morgan':{'observed':1,'s':1,'who':1,'was':1},'intelligent.':{'sec':1},'ninety-nine':{'cases':1},'mean--matter':{'ether':1},'evolution-idea':{'to':1,'is':2,'has':1},'water':{'and':15,'brightly':1,'because':1,'furnished':1,'being':1,'is':5,'spider':1,'held':1,'as':2,'owing':1,'through':1,'are':1,'in':5,'earth':1,'out':2,'even':1,'will':1,'from':4,'would':2,'to':8,'remains':1,'began':1,'that':4,'28':1,'.':28,'how':1,'only':1,'offers':1,'which':2,';':5,'gets':1,'was':1,'into':2,'do':1,'than':1,'though':1,'may':1,'but':3,'gently':1,'flows':1,'came':1,'rises':1,'with':2,'by':1,'nor':1,'a':2,'on':3,'periodically':1,'has':1,'animals':1,'for':4,'you':1,'fills':1,'did':1,'of':2,'seldom':1,'vigorously':1,'occurs':1,'sometimes':1,'where':1,'near':1,'became':1,'so':1,'can':2,'were':1,'at':3,'beneath':1,'disappears':1,'or':2,'comes':1,'first':1},'meteorites':{'is':1,'it':1,'every':1,'are':1,'have':1,'enter':1,'or':1},'generation.':{'the':1,'they':1},'twentieth':{'trial':1},'groups':{'of':4,'are':2,'drifting':1},'cyril':{'crossland':1},'dissipated':{'as':2,'the':1,'.':1},'cork':{'she':1,'out':1},'f.r.s.':{'conservator':1},'one--of':{'protective':1},'pearly':{'nautilus':7,'nautilus.':1},'bygone':{'ages':1},'thirty':{'miles':1,'million':4,'stars':1,'deep':1,'years':4},'healthy':{'lives':1},'chalmers':{'mitchell':1},'blotch':{'on':1},'sex--beginning':{'of':2},'stomachs':{'of':1},'descended':{'and':1,'from':6},'weird':{'ways':1,'peaks':1},'illustrations.':{'1':1},'say--of':{'various':1},'emerge':{'the':2,'before':1,'from':1,'as':1,'in':1},'credited':{'with':1},'threes':{'and':1},'semang':{'and':1},'swallowed':{'and':1,'by':1,'one':1},'crisis':{'in':1},'wings.':{'vi':1},'bulbs':{'on':1},'russell':{'has':1,'sons.':2},'atom.':{'how':1,'the':1,'like':1,'an':1},'percept':{'of':1},'prey':{'of':1,'by':1,'working':1,'.':3},'memory':{'of':1},'negroes':{'and':1},'lycosa':{'lying':1},'australian':{'and':1,'mudfish':1,'race':1,'more-pork':2,'frilled':2,'the':1,'species':1},'diagrams':{'of':1},'conductor':{'of':1},'bristle-tails':{'show':1},'fuel':{'.':1},'flapping':{'their':1},'southwards':{'following':1,'.':1},'sequoia':{'or':1},'cases':{'is':2,'within':1,'it':4,'purely':1,'at':1,'in':3,'yet':1,'its':1,'out':2,'no':1,'rather':1,'there':2,'two':1,'.':3,'to':1,'supplanted':1,'much':1,'which':1,'under':1,'relatively':1,'be':1,'we':2,'that':2,'stow':1,'however':4,'they':1,'measured':1,'than':1,'like':1,'especially':1,'e.g':3,'this':1,'of':3,'the':9,'where':3},'andalusia':{'arabia':1},'autumn':{'gales':1,';':1,'or':1,'they':1},'diagram.':{'the':1},'collision':{'with':2},'thousands':{'being':1,'of':17,'but':1},'reflux':{'of':1},'modified':{'and':1,'for':2},'means.':{'sec':1},'handle.':{'in':1},'districts':{'here':1,'.':1},'jetsam':{'that':1},'female-producing':{'egg':1},'wrong:':{'hence':1},'fauna':{'of':5,'is':1,'there':1,'namely':1,'.':1,'contemp':1,'as':2,'does':1,'bodily':1},'attain':{'a':1},'streak':{'of':1},'hutchinson':{'h':1},'wrist-bones':{'with':1},'stream':{'and':1,'sometimes':1,'gripping':1,'seeking':1,'of':7,'there':1,'some':1,'.':1,'relative':1,'that':1,'going':1,'the':1,'with':1,'or':1,'ought':1,'through.':1},'irruption':{'of':1},'supra-renal':{'and':1,'.':1},'and--it':{'smells':1},'coal--dissipation':{'of':1},'amalgams':{'and':1},'stroke':{'of':4},'performed':{'viewed':1},'octopus.':{'shifts':1},'flora.':{'the':1},'provoke':{'new':1,'them':1},'hydrogen':{'and':3,'uniting':1,'19':1,'travel':1,'atom':1,'gas':4,'.':2,'to':1,'rising':2,'at':3,'were':1,'so':1,'was':1},'requirements':{'of':1,'we':1,'are':1,'.':1},'white-hot.':{'they':1},'mole':{'and':1},'secured':{'in':1},'eloquent':{'vestige':1,'anticipation':1,'detail':1,'instance':1,'in':1,'than':1},'innumerable':{'tons':1,'methods':1,'minute':1},'fishes--a':{'very':1},'ginkgos':{'and':1},'vital':{'and':1,'activities':1,'processes':2,'power':1,'importance':2,'inter-relations':2,'than':1,'to':1,'connection':1,'interest':1,'activity':1,'laboratory':1,'process':1,'sounds':1,'economy':1},'fourth':{'and':1,'great':2,'haunt':1,'ice':1,'state':3,'printing':1,'millennium':1,'glacial':1},'speaks':{'of':1},'reactions.':{'3':1},'secures':{'the':1},'unutterably':{'stupid':1},'information':{'is':2,'about':6,'can':1},'digesting':{'intruding':1,'them':1},'larmor':{'suggested':1},'eighty':{'figures--bison':1,'distinct':1,'different':1,'miles':1,'million':1},'unawares':{'.':1},'apprenticeship':{'and':2,'often':1,'of':1,'since':1,'.':1,'to':1,'at':1,'in':1,'during':2,'the':1},'eighth':{'printing':1},'branches':{'and':1,'down':1,'still':1,'that':1,'of':6,'in':1,'.':2,'will':1,'gives':2,'firmly':1,'at':1,'hanging':1,'must':1,'come':1,'or':2,'out':1},'drained':{'swamps':1},'commodity':{'on':1},'joint':{'to':1},'enemies.':{'when':1,'if':1},'branched':{'and':2},'lagoon':{'and':1},'water-oceans.':{'in':1},'lamented':{'the':1},'imagining':{'how':1},'estuary':{'and':1},'furnished':{'the':1,'them':1,'an':1},'constituents':{'may':1,'and':1,'.':1,'of':1},'mainly':{'composed':1,'among':1,'arboreal':1,'vegetarian':1,'to':1,'in':2,'vertical;':1,'by':1},'discharging':{'them':1,'sepia':1},'ocean-troughs':{'and':1},'furnishes':{'a':2},'ducklings':{'catch':1},'motions':{'would':1,'of':2,'can':1,'which':1,'along':1,'are':1},'weather.':{'there':2},'side--a':{'mobility':1},'pre-eminent':{'as':1,'e.g':1},'pterodactyls':{'varied':1,'could':1,'had':1,'birds':2,'by':1,'gave':1},'supplemented':{'the':1},'emmer':{'which':1},'wallace':{'maintained':1,'was':1,'darwinism.':1},'organisation':{'than':1},'mantle':{'of':1,'as':1},'offers':{'to':2,'the':1,'grave':1,'an':1},'marvels':{'the':1},'meridian':{'while':1,'.':1},'whirlpool':{'of':1,'or':1},'employment':{'of':2},'pre-dravidians.':{'the':1},'obtaining':{'a':2,'considerable':1},'motion.':{'the':2},'photograph.':{'illustration':2},'evolution':{'and':2,'particularly':1,'is':13,'states':1,'as':1,'are':1,'in':8,'home':1,'if':2,'from':1,'no':1,'remains':1,'there':3,'.':12,'current':1,'to':4,'that':2,'going':11,'fig':1,'which':2,';':1,'has':6,'was':6,'real':1,'we':1,'led':1,'theory':3,'means':1,'but':3,'quite':1,'not':1,'animals':1,'1917':1,'chequered':1,'a':1,':':1,'implies':1,'especially':1,'practically':1,'of':54,'introductory':1,'53':1,'element':2,'will':1,'so':1,'agoing.':1,'though':1,'the':4},'delighted':{'darwin.':1},'underneath':{'things':1,'the':2,'her':1,'.':1},'expertness':{'the':1},'conquer':{'every':2,'for':1},'browns':{'and':1},'sowing':{'and':1,'but':1},'term':{'race':1,'commensalism':1},'name':{'given':1,'from':2,'for':1,'of':1,'cock-paidle':1,'electrons':1,'which':1,'mare.':1,'associated':1,'primates':1},'civilisation':{'of':1,'is':1,'there':1,'here':1,'.':1,'depends':2,'the':1,'more':1},'advent':{'of':1},'possibilities':{'and':1,'of':3,'.':1,'are':1,'in':1,'probably':1},'realise':{'of':1,'the':3,'what':1,'that':3},'telegraphic':{'and':1},'individually':{'and':1},'weighted':{'with':1},'gape':{'and':1,'two':1},'woodpeckers':{'are':1},'sprinkle':{'iron':1},'catching':{'and':2,'small':4,'the':2,'with':1,'some':1},'begun':{'to':1,'before':1,'some':1,'.':1},'distributor':{'under':1},'tumultuous':{'surging':1},'y.s.':{'which':1,'.':1},'ultimately':{'composed':1,'the':1,'dispensed':1},'intercourse':{'and':1,'.':1},'factors':{'and':1,'would':1,'that':2,'of':2,'which':1,'in':5,'the':1},'profit':{'a':1,'by':2,'501':1},'these--which':{'illustrate':1},'attracted':{'to':1,'one':1},'parallax':{'the':1},'kent':{'dating':1,'but':1,'cro-magnon':1},'picture-logic':{'which':1},'overflowing':{'waters':1},'eagle':{'lifts':1,'or':1},'--the':{'mind':1,'planets--venus--is':1},'performing':{'distributing':1,'other':1,'displaying':1,'chimpanzee':1,'copying':1},'theory':{'is':7,'as':1,'sec':1,'in':1,'bears':1,'.':1,'which':3,';':1,'has':1,'was':1,'more':1,'we':1,'provides':1,'that':5,'1796':1,'but':2,'vividly':1,'nor':1,'a':1,'implies':1,'of':16,'or':1},'stimuli.':{'animals':1},'interpose':{'when':1},'ascertain':{'how':1},'electrified':{'270':1,'and':1,'the':1,'with':1,'will':1},'gizzard--certainly':{'the':1},'explorers':{'of':1},'reptiles--snakes':{'lizards':1},'importance.':{'difficulties':1,'sec':1},'www.pgdp.net':{'updated':1,'illustration':1},'corroborating':{'individual':1},'motion':{'and':2,';':2,'would':1,'was':1,'whether':1,'of':3,'is':2,'within':1,'or':1,'to':1,'as':2,'than':1,'in':1,'into':1,'the':1,'.':3,'ever':1,'kinetic':1,'are':1},'turn':{'on':1,'form':1,'stiff':1,'of':3,'is':1,'it':1,'the':2,'to':4,'are':1,'in':1,'into':1,'making':1,'white':1,'with':1,'round':1,'becomes':1,'once':1},'butterflies':{'allied':1,'are':3},'place':{'and':2,'is':1,'inaccessible':1,'it':1,'itself':1,'in':1,'end':1,'for':3,'remains':1,'there':2,'favouring':1,'preventing':1,'to':4,'work;':1,';':1,'let':1,'by':1,'a':1,'on':1,'of':9,'work':1,'sea-anemones':1,'the':1,'where':1,'or':1},'retreating':{'forehead':1},'swing':{'of':1,'to':1},'deep-sea':{'life':1,'animals':2,'fish':3,'sponge':2,'corals.':1,'are':1,'fishes':2,'fauna':1},'gradually.':{'when':1},'close-set':{'eyes':1},'saucers':{'.':1},'weakling':{'it':1},'origin':{'and':3,'of':19,'is':1,'there':1,'direct':1,'are':1,'the':1},'pelican':{'s':2},'surviving':{'the':1,'symbol':1},'revenue':{'service':1},'faculty':{'in':1,'if':1},'greatest.':{'v':1},'soaring':{'upward':1},'them--':{'melanocetus':1},'array':{'of':1},'field-voles':{'perhaps':1},'george':{'h':1},'millions':{'of':39,'the':1,'is':1,'.':1},'gertrude':{'white':1},'given':{'because':1,'over':1,'sense-presentation':1,'as':2,'in':1,'.':1,'to':8,'illustrations':1,'conditions':1,'variability':1,'away--you':1,'sufficient':1,'rise':1,'but':1,'part':1,'an':2,'by':2,'a':5,'off':1,'up':1,'us':2,'place':2,'the':3},'necessarily':{'be':1,'progressive':1,'keep':1,'progressive;':1,'cooling':1,'difficult':1},'persons.':{'the':1},'marine.':{'in':1},'croaking-sacs':{'which':1},'trillion':{'100':1,'miles':5,'revolutions':1,'molecules':1,'waves':1},'tides--origin':{'of':1},'plastic':{'and':3,'appreciation':1,'stock--some':1},'stimulation':{'proves':1},'hardwood':{'forests':1},'returns':{'to':1,'.':1},'virgil':{'refers':1},'fortuitous':{'.':1},'legally':{'required':1},'white':{'and':1,'polar':1,'one':2,'hair':1,'ermine':1,'in':1,'dress':1,'surfaces':1,'winter':1,'except':1,'.':2,'surroundings':1,'combine':1,'stars':2,'cross':1,'save':1,'body':1,'then':1,'star':1,'of':1,'but':1,'pigment':1,'heat':2,'wake':1,'pelage':1,'background':1,'remarks':1,'with':1,'by':1,'card':1,'plumage':1,'fur':1,'coat':1,'colour':1,'will':2,'s':1,'mass':1,'light':9,'blackbird':1,'the':1,'or':1,'blood':1},'anguilla':{'vulgaris':1,'vulgalis':1},'farthing--contains':{'an':1},'gives':{'a':7,'rise':1,'up':1,'us':5,'.':1,'place':1,'the':2},'sex-call':{';':1,'.':1},'million.':{'there':1},'hug':{'the':1},'aurelia':{'.':1},'centipedes':{'and':2,'millipedes':1,'spiders':1},'hum':{'comparable':1},'circulated':{'round':1},'released':{'from':1},'suspended.':{'the':1},'freeze':{'throughout':1},'holder':{'found':1,'the':1,'.':1,'your':1,'on':1},'intrinsically':{'too':1},'population':{'consists':1,'of':5,'could':1,'contains':1,'.':1},'eohippus':{'about':1,';':1},'unfortunately':{'the':1,'we':1},'require':{'a':1,'extension':1,'no':1,'fifty':1,'to':3,'much':1,'such':1,'intelligent':1},'pigmy':{'representatives':1},'modelled':{'by':6},'computer':{'virus':1,'codes':1},'ooze':{'likewise':1,'so':1,'of':1},'aesthetic':{'reasons':1},'proteins':{'e.g':1},'1.e.9.':{'1.e.8':1,'1.e.3':1},'earth.':{'a':1,'we':1,'is':1,'it':1,'illustration':1,'making':1,'the':1,'establishment':1},'and':{'discards':1,'all':10,'pheasant':1,'consider':1,'caused':1,'stems':1,'results':1,'foul':1,'four':1,'crocodile':1,'avalanche':1,'debris':1,'broader':1,'dainty':1,'go':3,'honour.':1,'nematodes':1,'decisions':1,'causes':2,'skeleton':1,'hold':4,'depend':1,'hunting':1,'educable':1,'shrinkage':1,'father':1,'young':4,'send':1,'squirrels':2,'to':29,'finally':5,'reptiles':1,'skill.':1,'stable':1,'portentous':1,'hammers':1,'cochroaches':1,'sent':1,'ulna':1,'activities':1,'protective':1,'presently':1,'club-moss':1,'very':4,'einstein--the':1,'miners':1,'wave':1,'interglacial':1,'coal-measures':1,'fall':2,'mixing':1,'more.':1,'soles':1,'monkeys':2,'minute':2,'respiratory':1,'baking':1,'parrot':1,'ceased':1,'tear':1,'michael':1,'joined':1,'culminating':2,'large':1,'these':13,'sand':1,'guiding':1,'small':2,'venus':1,'mammoth.':1,'snails':1,'round':1,'degeneracy':1,'favoured':1,'smaller':2,'illustrating':1,'ten':1,'concise':1,'imagination.':1,'becquerel':1,'measurable':1,'seas.':1,'second':2,'notwithstanding':1,'further':1,'nests':1,'perish':1,'even':12,'established':2,'what':10,'stood':1,'constitution':2,'voluminous':1,'giving':1,'storks':1,'fingers':1,'emotions':1,'hereditary':1,'white-hot':1,'salamanders':1,'above':2,'new':5,'3a':1,'cycad':1,'guinea-pigs':1,'bird':2,'alertness':1,'scenery':1,'brain-case':2,'toes':5,'malaria':1,'gathered':1,'concepts':1,'here':2,'hundreds':2,'water':8,'reported':1,'humidity.':1,'let':3,'others':12,'lull.':2,'strong':2,'anchoring':1,'extreme':1,'dry':3,'great':1,'substance':1,'broken':1,'technical':1,'employees':2,'whine':1,'36':1,'animals--the':1,'apes':5,'credit':1,'smoke':1,'browsing':1,'bettered':1,'weird':1,'otters':1,'makes':1,'beautiful.':1,'sticking':1,'control':1,'adjustable':1,'love':2,'waves--light--what':1,'family':1,'distributed':2,'bathers':1,'feelings':1,'peahen':1,'retires':1,'preparatory':1,'comets--millions':1,'sugar':1,'herring':1,'select':1,'ape':1,'standing':1,'use':1,'from':10,'takes':1,'working':1,'distinct':1,'positive':1,'continuous':1,'give':3,'two':6,'trilobites.':1,'distributing':1,'ocean-basins.':1,'live':2,'touched':1,'untie':1,'therefore':6,'taken':2,'tell':1,'more':23,'brings':2,'habits--the':1,'about':1,'chimpanzee':2,'jellyfishes':1,'magnesium.':1,'carrying':2,'big':1,'rabbit':1,'lawlessly':1,'hjort':1,'tearing':2,'must':1,'swooping':2,'metazoa':1,'animals':15,'fro.':1,'this':23,'work':2,'sucks':2,'london':1,'guards':2,'diverse':1,'crickets':1,'can':2,'mr':1,'knocked':1,'making':2,'fauna':1,'scatter':2,'mud-fishes':1,'beautiful':1,'sinking':2,'squat':1,'escapes':1,'of':27,'share':1,'purposes':1,'accept':1,'pieces':1,'parachute':1,'heard':1,'rise':1,'masterfulness':1,'bones':1,'every':4,'provoke':1,'hydrogen':1,'offspring':2,'salts':5,'firmly':1,'sir':1,'winter':2,'decaying':1,'telephonic':1,'rather':1,'breaking':2,'gannets':1,'oligocene':1,'species':1,'fishes--a':1,'cycads':2,'hot':1,'occasionally':1,'aerates':1,'animal':1,'elephant':1,'relinquished':1,'willing--has':1,'expresses':1,'oceans':1,'maternal':1,'utilise':3,'inconceivably':2,'may':7,'digesting':2,'burrowing':1,'after':3,'southern':2,'permanent':2,'produce':1,'space.':1,'curiosity':2,'coming':1,'such':2,'flourish':2,'grow':2,'lids':1,'man':4,'a':67,'short':1,'calves':1,'remember':1,'third':2,'pithecanthropus':1,'light':6,'register':1,'descends':1,'think':1,'eye':2,'perhaps':5,'complexity':2,'gloomy':1,'so':35,'silence':1,'back--till':1,'reflux':1,'first':1,'moulton.':1,'make':1,'furnish':1,'grasshoppers':1,'digested':1,'help':1,'furnished':1,'unpalatable':3,'indeed':1,'over':5,'altogether':1,'orang':1,'soon':1,'years':2,'produced':1,'bounding':1,'toads':3,'thinner':1,'including':1,'looks':1,'drifters':1,'cuts':3,'mottlings':1,'still':1,'its':17,'roots':1,'before':2,'chemical':2,'26':1,'27':1,'curly':1,'thence':1,'willow':1,'mites':1,'coarser':1,'forms':2,'saturn--the':1,'absence':1,'dogfish':1,'marsh':1,'dwarfs':1,'hind-limb':1,'societies':1,'admirable':1,'no':12,'formosa':1,'finer':1,'then':22,'evening':1,'return':2,'fourth':1,'seeking':1,'africa.':1,'saltatory':1,'inter-relations':1,'kin.':1,'giraffe':2,'elephants.':1,'they':26,'not':5,'now':1,'lifelong':1,'smoothness':1,'down':2,'obviates':1,'bluffing':1,'rocky':1,'oxygen':1,'mathematician':1,'hunterian':1,'proteins':1,'identified':1,'composition':1,'explode':1,'did':1,'someone':1,'habits':2,'2a':1,'realise':1,'each':3,'veins':1,'feeds':1,'higher':4,'erratic':1,'lively':1,'enigmatic':1,'reactions':1,'clams':1,'matthew.':2,'snakes':3,'weight':1,'elephants':3,'there':42,'energy':8,'hard':1,'prolonged':1,'tobogganing':1,'unlock':1,'catching':4,'fewer':1,'primates':1,'year':2,'our':4,'beyond':2,'primitive':4,'conspicuous.':1,'out':2,'living':1,'opened':1,'present':2,'since':3,'research':1,'looking':1,'transforming':1,'laid':1,'mate':1,'pool':1,'got':4,'get':1,'receiving':1,'cause':1,'caucasian':1,'red':1,'shows':2,'buds':1,'turning':1,'inert':1,'telescoped':1,'horse':2,'decay.':1,'quite':1,'backboneless':1,'reason':1,'complicated':1,'splashes':1,'besides':1,'backed':2,'animals;':1,'cattle':1,'steering':1,'swimming':2,'lifts':1,'delight':1,'importance.':1,'organic':1,'mortar':2,'could':2,'put':3,'success':1,'keep':1,'motion':3,'turn':1,'butterflies':1,'massive':1,'withering':1,'hence':1,'stone':1,'pterosaurs':1,'zoophyte':1,'throws':1,'south':3,'toads--it':1,'knots':1,'copper':2,'finest':1,'possessing':1,'waves':2,'delicately':1,'one':7,'feet':1,'will':4,'unexpected':1,'disappearing':1,'another':7,'carry':2,'gripping':1,'blows':1,'ways':1,'earthworms':1,'size':2,'sheep':1,'continental':1,'given':3,'tadpoles':1,'monkey':1,'similarly':1,'apple.':1,'opportunity':1,'caught':1,'relations':1,'plastic':1,'1a':1,'their':23,'2':6,'wasps':4,'motility':1,'democracy':1,'embryology':1,'anatomises':1,'dogs':3,'opening':1,'gives':1,'muscles':1,'imperfect':1,'starfish':1,'that':57,'brains':1,'needle':1,'screwing':1,'bees.':1,'folded':1,'part':2,'because':2,'cereal':1,'manipulation':1,'rivers':3,'white':3,'explodes':1,'lays':2,'distance':1,'kind':1,'legs':1,'meteors':1,'looting':1,'showed':1,'depressed':1,'sea-squirts':1,'vocal':1,'instincts--of':1,'project':1,'matter':1,'future':1,'magnesium':1,'iron':1,'arboreal':1,'starfishes':1,'hailstones':1,'proofread':1,'dusty':1,'anthropoid':2,'extracting':1,'manatees':1,'dust--that':1,'sea':1,'7a':1,'violets':1,'gate-posts':1,'modern':1,'mind':4,'lice':1,'bugs':1,'disguise--other':1,'gentle':1,'say':1,'have':4,'need':1,'vigorous':1,'fishes':1,'clearly':1,'relatively':1,'forced':1,'strength':1,'built':1,'-':1,'peculiarities':1,'also':8,'fitting':1,'internal':1,'take':1,'which':5,'deepening':1,'swims':1,'foot--an':1,'surfaces':1,'begin':1,'shallow':1,'lion':1,'though':2,'any':5,'proving':1,'who':1,'fishermen;':1,'falls':2,'creek':1,'most':5,'microbic':1,'eight':1,'printed':1,'nothing':1,'foothold':2,'measured':2,'why':4,'behaviour.':1,'mineral':1,'feminine':2,'mobile':2,'pulled':1,'backwards':1,'sometimes':5,'hungry':1,'absorbing':1,'solemn':1,'dissolved':1,'reflecting':1,'electrons':3,'punting':1,'hurled':1,'distinctive':1,'velocity':1,'europe.':1,'physics':1,'molluscs':1,'repeatedly':1,'precise':3,'saying':2,'permeable':1,'selection':1,'one-eighth':1,'show':1,'insects':3,'disappear.':1,'scattered':1,'fifty':2,'discovered':1,'bring':2,'attempts':1,'fiord':1,'seaweed':1,'carefully':2,'corner':2,'continually':1,'find':1,'slow.':1,'sea-snakes':1,'sharks':1,'nearer':1,'judgments':1,'quaint':1,'varied':1,'heavily':1,'grotesque':1,'gouging':1,'should':1,'surroundings':2,'only':4,'going':1,'black':1,'deepest':1,'molecules':4,'germs':1,'uppermost':1,'pegged':1,'rice':1,'local':1,'do':2,'his':5,'means':1,'beat':1,'tissues':1,'leisure':1,'famous':1,'explosively':1,'rest':1,'lighter':1,'swiftest':1,'combinations':1,'instinctive':1,'thomson':1,'dr':1,'falling':1,'endless':1,'birds.':1,'playful':1,'evolution':1,'progressive':1,'alacrity':1,'exactitude':1,'kidneys':1,'rowing':1,'mathematicians':1,'eyebrow':1,'segregating':1,'she':1,'quaternary':1,'eventually':3,'through':1,'fixed':1,'farther':3,'body':1,'bars':1,'official':1,'predicts':1,'seas':2,'intelligence':1,'radium':2,'bears':1,'bolivia.':1,'decided':1,'cenozoic':1,'sea-serpents':1,'snow-capped':1,'violet':2,'collects':1,'frequency':1,'pliocene':1,'best':1,'sameness':1,'pebbles':1,'closes':1,'combustion':1,'brave':1,'inequalities':1,'plasticity':2,'rugged':1,'pattern':2,'away':1,'trilobite':1,'stealthy':1,'gaseous.':1,'weapons':1,'north-west':2,'3':5,'mind.':1,'various':1,'gases':1,'closed':1,'between':2,'progress':1,'open-sea':1,'timber':1,'birds':4,'beasts':1,'crookes':1,'we':37,'men':1,'explosive':1,'parental':1,'importance':1,'sole':2,'industrious':1,'craters':2,'fishermen':1,'saturn':4,'death':3,'drew':1,'energy--may':1,'proterozoic':1,'invisible':3,'carbon':1,'carnivorous':1,'come':2,'bronze':1,'c':2,'enables':3,'cox':1,'mongol':1,'borneo':1,'according':2,'attributed':1,'sea-urchin':1,'became':2,'figures':1,'wringing':1,'everything.':1,'loose':1,'comes':1,'unconvincing':1,'wade':1,'stretches':1,'diversity.':1,'simple':3,'structure':2,'fitness':1,'ganymede':1,'america':1,'lake':1,'moreover':1,'extinct':1,'suppressing':1,'ether':1,'better':1,'steamships':1,'described':1,'raise':2,'one-celled':1,'travailing':3,'fro':2,'three':3,'been':1,'jerks':1,'immense':1,'willing':2,'slowly':1,'sponges':1,'likewise':1,'degrees':1,'herbage':2,'spacious':1,'6a':1,'caterpillars.':1,'partly':5,'success.':1,'lakelets':1,'turned':2,'conifers':1,'mammals.':1,'amphibians':2,'drainpipes':1,'made':3,'kids':1,'demand':1,'sifting--the':1,'worked':1,'left-handed':1,'food-canal':1,'mammals--with':1,'spain':1,'inconspicuous':2,'plants':3,'tide':1,'heavier':2,'uncertain':1,'caucasians':1,'frozen':1,'leave':1,'sex':1,'as':16,'morley':1,'air':1,'growth.':1,'calcium':1,'while':1,'lichen':1,'cannot':3,'many':11,'wild':1,'valleys':1,'voice':1,'toothed':1,'leaves':1,'at':6,'comets':2,'streams':1,'palings':1,'almost':2,'soil':1,'is':33,'thus':7,'it':79,'expenses':2,'weighed':1,'trilobites':1,'against':2,'knocks':1,'in':42,'beaver':1,'vanish':1,'currents':1,'if':13,'different':1,'feebler':1,'cools':1,'inquire':1,'muscle-cells':4,'granted':1,'bat':1,'fading':1,'cultivated':3,'unity':1,'complex':1,'grand':1,'vegetable':1,'joy.':1,'gorging':1,'engravings.':1,'day':1,'difficult':2,'development':1,'alertness.':1,'used':1,'see':2,'planting':1,'comprehensive':1,'blue-greens':1,'blue':2,'hotter':1,'drives':1,'flows':1,'hand':1,'director':1,'much':1,'moving':1,'purpose':1,'dark':3,'brussels':1,'timid':1,'climb':1,'warming':1,'cycle':1,'poultry':1,'race-continuing':1,'narrow':1,'off':1,'modes':1,'cliff-loving':1,'changes':2,'variety':1,'neptune':2,'without':4,'severe':1,'rome':1,'trains':1,'position':1,'the':357,'chemistry':2,'drawing':2,'heaps':1,'indigo':1,'birth':1,'just':2,'flesh':1,'being':1,'uranium':1,'licensed':1,'distribute':3,'adjusted':1,'actions':1,'disguise':1,'violent':1,'radio-activity':1,'distant':1,'circling':1,'human':3,'touch':1,'useful':1,'skill':1,'yet':11,'captured':1,'addresses':2,'migration':1,'superficial':2,'enters':1,'evolution.':1,'legitimately':1,'far-reaching':1,'had':2,'melanocetus':1,'undulating':1,'crocodiles':1,'lets':1,'potential':1,'4':2,'easy':1,'hind':1,'usage':1,'hydrosphere.':1,'has':3,'5a':1,'peanuts':1,'good-humoured':1,'australia':1,'rodents':1,'depends':2,'transitional':1,'bristle-tails':1,'babylonia':1,'discontinue':1,'absorptive':1,'regard':1,'early':1,'sparrows':1,'ultra-violet':1,'facial':1,'dreamt':1,'grape-sugar':1,'redistributing':1,'string':1,'apart':2,'loss':1,'phenomena':1,'tail':1,'stingless':1,'lost':1,'ill':1,'cooler':1,'beyond-blue':1,'reduces':1,'sizes':1,'tend':1,'loses':1,'harmonising':1,'donations':3,'electro-magnetic':1,'night':2,'nerves':1,'downward':1,'disorder':1,'dentition':2,'newton':1,'portuguese':1,'performing':1,'old':1,'often':8,'habitat':1,'scents.':1,'hair-like':1,'difficulties':1,'some':15,'back':3,'pacific':3,'mosquitoes':1,'ideals':1,'understood':1,'therein':1,'towards':1,'jupiter':2,'convex':1,'duration':1,'diving':2,'bruising':1,'recognition':1,'feeling':1,'einstein':1,'dimensions':1,'for':5,'broad':1,'ice':1,'moon':5,'when':13,'critical':1,'passion':1,'meaningful':1,'conquering':1,'starch':1,'27-1':1,'nose':1,'limitations':2,'be':1,'depressions':1,'novelties':1,'selecting':1,'combative':1,'lakes':1,'expansion':1,'pressure':1,'enregistering':1,'fullest':1,'although':2,'become':6,'drawn':3,'stows':1,'repair':1,'by':14,'hearing':2,'on':9,'mammoths':1,'energetically':1,'would':1,'branch-gripping':1,'temper':1,'reappear':2,'theirs':1,'moths':1,'side':1,'cockroaches':2,'whence':1,'spreads':1,'three-quarter':1,'piled':1,'little-changed':1,'gamma':3,'plan':1,'heavy':1,'rats':1,'baboons':1,'sea-grass':1,'trademark':1,'into':2,'good':1,'habituations':1,'intellectual':1,'negative':7,'chemists':2,'spinal':1,'everyone':3,'bats':2,'rapid':1,'sow':1,'formidable':1,'financial':1,'error':5,'cross-fertilisation':1,'mental':2,'arctic':2,'deep-violet':1,'sticklebacks':1,'expositor':1,'chrysanthemum':1,'well-developed':1,'flying':4,'vigour':1,'fast':1,'reflectors':1,'rushes':1,'mudstones':2,'bees':5,'caterpillars':1,'physicists':1,'stars':3,'spring':1,'molecular':1,'wonderfully':1,'was':3,'fish':1,'naturally':1,'endeavour.':1,'deepened':1,'form':4,'kittens':1,'mammals':14,'spirit':1,'magnetism':1,'analyse':1,'within':2,'wireless':1,'mysterious':1,'heat':5,'brain':1,'competition':1,'flexible':1,'fastened':1,'ear':1,'with':15,'eat':1,'he':14,'balancing':1,'pull':1,'swamp':1,'places':1,'whether':1,'dangerous':2,'two-spined':1,'hind-limbs':2,'social':2,'up':1,'sticklebacks.':1,'foresight':2,'placed':2,'growth':1,'those':4,'shape':1,'how':7,'acting':1,'distribution':2,'piece':1,'similar':5,'professor':3,'storing':2,'proud':1,'constant':2,'mimicry--the':1,'taste':1,'certain':1,'measure':1,'porcelain':1,'deep':1,'an':11,'proper':2,'female':1,'senses':1,'periods':2,'planets':1,'crystals':2,'domesticated':1,'are':16,'struggled':1,'again':1,'functions':1,'ancestors':1,'readjustments':1,'entirely':1,'charitable':1,'mantises':1,'thither':2,'power':1,'other':21,'5':1,'adventure':1,'holding':3,'becomes':1,'u':1,'you':4,'smell':1,'chemist':1,'horsetails':1,'gaining':1,'consequent':1,'formed':1,'ordovician':1,'accidental':1,'shelter':1,'uniformly':1,'inherently':1,'planarian':1,'runs':3,'walton':1,'insect':1,'marshes':1,'scores':1,'lasso':1,'stocks':1,'carries':1,'died':2,'began':5,'your':1,'independently':1,'breaks':2,'faster':1,'sperm-cells':3,'practically':3,'controlled':1,'dog':1,'mme':1,'persistent':1,'walked':1,'gorilla':2,'ensuring':1,'redivides;':1,'conveying':1,'time':1,'fresh':1,'indirectly':1,'chimpanzee--and':1,'4a':1},'sea-gooseberries':{'which':1},'spectroscope:':{'it':1},'froth':{'which':1},'silvanus':{'p':1},'ant':{'to':2,'the':1,'has':1,'where':1,'.':1},'spectroscope.':{'we':1},'fall.':{'we':1},'mates':{'.':1},'any':{'woodwork':1,'money':2,'alternative':1,'snout':1,'hint':1,'alternate':1,'had':1,'permanent':1,'very':1,'pigment':1,'provision':1,'day':1,'condition':1,'sufficiently':1,'bad':1,'inherent':1,'disclaimer':1,'nitrogenous':1,'people':1,'idea':1,'rate':2,'distributor':1,'living':2,'mud':1,'body':1,'scientific':1,'use':3,'understanding':1,'protection':1,'collection':1,'monkey':1,'on':1,'substance':3,'country':1,'length':1,'suggestion':1,'copper':1,'statements':1,'point':1,'character':1,'one':3,'learning':1,'fees':1,'quality':1,'given':1,'additional':1,'zoologist':1,'cooling':1,'way':3,'suit':1,'white':1,'waste':1,'type':1,'more':2,'files':1,'hydrosphere':1,'muscles':1,'corresponding':1,'statement':1,'form':1,'ordinary':1,'apparent':2,'direct':1,'part':2,'virtue':1,'particular':2,'copy':1,'case':8,'kind':4,'word':1,'hour':1,'work':2,'project':3,'record':1,'of':3,'age':1,'sense':1,'influence':1,'defect':1,'agent':1,'rigorous':1,'in':1,'binary':1,'angle':1,'member':1,'other':16,'you':1,'star':1,'trace':1,'rain':1,'purpose.':1,'moment':2,'purpose':1,'necessity':1,'conscious':1,'light':1,'colour':1,'person':1,'time':1,'representation':1,'volunteers':1,'irregularity':1},'confirmation':{'of':2},'transcription':{'errors':1},'ideas':{'and':4,'meant':1,'what':1,'of':8,'is':1,'when':1,'but':2,'.':4,'are':1,'in':3,';':1,'or':1},'form-resemblance':{'for':1},'sciences':{'study':1,'forcing':1},'emphasis':{'on':1},'mesohippus':{'about':1,';':1},'fracture':{'of':1},'thermometer':{'seem':1},'resembling':{'a':1,'in':1},'shafts.':{'then':1},'primaries':{'pr':1},'inky':{'darkness':1},'sure':{'on':1,'that':2,'of':1,'but':1,'.':2,'effectiveness':1},'multiple':{'of':1,'pedigree':1},'nebulae--the':{'birth':1},'azores':{'or':1},'indelible':{'stamp':2},'harmonious':{'mingling':1},'clearer':{'to':2},'falls':{'on':1,'about':1,'of':4,'obliquely':1,'as':1,'they':1,'the':2,'286':1,'more':1},'hincks':{'astronomy':1},'boiling':{'a':2,'of':1,'point.':1,'ocean':1},'donation':{'methods':1},'multiply':{'quickly':1},'cleared':{'off':1},'spectroscopist':{'is':1},'dried-up':{'and':1},'study.':{'i':1},'thigh-bone':{'and':2,'indicates':1},'considered':{'what':1,'opaque':1,'only':1,'.':2,'also':1,'as':1,'they':1,'by':1},'proud':{'as':1,'.':1,'that':1},'science.':{'these':1,'the':1,'bibliography':1,'it':1,'illustration':1},'hungry':{'sharp-eyed':1,'hermit-crabs':1,'animals':1,'eyes':1},'idea.':{'what':1},'vulgaris':{'200':1},'prout':{'suggested':1},'quantity':{'of':7,';':1,'.':2},'detective':{'story':1},'pans':{'of':1,'as':1},'permeable':{'materials':1,'so':1},'spaced':{'from':1,'with':1},'solar':{'atmosphere':1,'observer':1,'system.':4,'phenomena':2,'prominences':4,'eclipse':3,'system':34,'surface':1,'system--regions':1,'electrons':1,'envelope':1,'spectrum':3,'system--with':2,'tides':1},'radiation.':{'that':1},'inshore':{'waters':1},'hustler':{'given':1},'homology':{'essential':2},'protrusion':{'of':2},'gulf':{'was':1,'in':1},'richness':{'of':1},'gull':{'with':1},'written':{'a':1,'confirmation':1,'recently':1,'explanation':2,'.':1,'in':2,'with':1,'by':1},'crime':{'and':1},'double-breather':{'dipnoan':1,'showing':1},'wood':{'jones':1,'of':1,'or':3,'but':1},'believing':{'that':1},'dreaded':{'it':1},'lighted':{'gas':1},'closed':{'the':1,'with':1,'in':1},'ink-bags':{'are':1,'.':1},'masking':{'the':1,'for':1},'expectation':{'of':2},'space.':{'many':1,'the':1},'bolometer':{'which':1},'radiations':{'the':1,'he':1},'vive':{'ready':1},'space;':{'and':1},'antler':{'or':1},'telescopes.':{'telescopes':1},'reveal':{'to':1,'the':1,'his':1},'reality--the':{'life':1},'aluminum':{'in':1},'floods':{'to':1,'or':1,'of':1},'naked':{'eye':2,'with':1,'body.':1},'scots':{'name':1},'bison':{'and':2,'delicately':2,'above':1,'.':1},'big-brained':{'modernised':1,'skulls':1,'extremely':1,'chimpanzee':1},'pouch;':{'while':1},'fainter':{'of':1},'borings':{'might':1},'orioles':{'.':1},'discussing':{'telescopes':1,'.':1},'ignored':{'.':1},'beholding':{'they':1},'encourages':{'us':1},'foetal':{'membrane':1,'membranes':1},'stars--or':{'rather':1},'1920':{'in':1},'1921':{'attention':1,'176-177':1,'.':4,'in':2,'the':1,'meeting':1},'1922':{'by':1,'third':1,'sixth':1,'seventh':1,'ninth':1,'twelfth':1,'second':1,'eleventh':1,'fourth':1,'tenth':1,'eighth':1,'fifth':1},'disarranged':{'.':1},'enregistered.':{'in':1},'obliging':{'in':1},'collects':{'a':1,'pollen':1,'some':1},'violates':{'the':1},'encouraged':{'by':1},'surfaces':{'and':1,'hooky':1,'for':1,'of':2,'reflect':1,'in':1,'such':2},'fails':{'to':1},'invoked':{'to':1},'crystal':{'we':1,'between':1},'federal':{'tax':1,'laws':1},'subsequent':{'research':1,'eras':1,'stage':1},'birds--intelligence':{'co-operating':1},'weapons':{'and':1,'or':1},'north-west':{'australia':2},'outside':{'and':1,'we':1,'his':1,'scientific':1,'these':1,'of':2,'it':1,'himself':1,'influences':1,'our':1,'nothing':1,'world':2,'the':6},'ages.':{'illustration':1},'hiss':{'.':1},'crookes':{'and':1,'sir':1,'experimented':1,'talked':1,'tube.':1,'tube':1,'had':1,'preferred':1,'247':1,'used':1,'but':1,'in':1,'really':1,'tubes':1,'at':1},'multiplied':{'by':1},'tylor':{'e':1},'hundredth':{'but':1},'originated':{'a':1,'from':1,'by':1,'in':1},'one-mile':{'thickness':1},'densely':{'packed':1},'kea':{'or':1,'parrot':1},'multiplies':{'by':1,'in':1},'coma':{'berenices':2},'oxalic':{'acid':1},'cities':{'150':1,'because':1,'.':1,'to':1,'of':1},'come':{'and':1,'nearest':1,'into':4,'back':3,'in':2,'mysteriously':1,'out':2,'from':2,'for':1,'next':1,'to':13,'under':1,'more':1,'up-stream.':1,'presently':1,'nutritive':1,'those':1,'a':1,'about':2,'up':2,'together':3,'near':2,'.':1},'reaction':{'of':2,'between':1,'at':1,'or':1},'pests':{'were':1},'successes':{'but':1,'.':1},'primus':{'berry':1},'23':{'photo':2,'saturn':1,'1914':2,'000':1},'water-ouzel--a':{'bird':1},'quiet':{'upper':1,'unobtrusive':1},'contract':{'.':1,'except':1,'it':1},'energies':{'light':1},'berry':{'the':1},'equatorials':{'and':1,'.':1},'railway':{'siding':1,'trucks':1},'utterance':{'to':1},'surface.':{'this':1,'open-sea':1},'radio-activity':{';':1,'has':4,'we':1,'were':1},'afterwards':{'found':1,'recommence':1,'it':2,'words':1,'requires':1},'bricks':{'of':2,'out':1,'are':2,'each':1},'course.':{'this':1},'employee':{'of':1},'colony':{'of':10,'is':2,'.':1,'are':1,';':1,'south':1},'period':{'often':1,'is':2,'as':1,'including':1,'in':2,'before':2,'perhaps':1,'there':2,'when':1,'.':1,'peopling':1,'which':1,'reptiles':1,';':1,'has':1,'was':7,'we':2,'that':5,'rise':5,'during':1,'a':1,'land':1,'showed':1,'e.g':1,'of':16,'either':1,'through':1,'the':5,'90':1,'first':2},'6.':{'enregistered':1},'satisfaction':{'and':1,'in':1,'.':1},'61':{'diagram':1,'a':1},'62':{'feet':1,'inches':1},'64':{'from':1},'straws.':{'the':1},'67':{'miles':1,'000':2},'68':{'photo':1},'69':{'green':1,'reproduced':1,'proterospongia':1},'pod':{'.':1},'skeletons':{'of':5,'are':1},'noisy':{'with':1},'song-thrush':{'when':1,'takes':1},'blend':{'into':1},'pilgrims':{'for':1},'deposited':{'as':1,'in':1},'cords':{'stretched':1,'.':1},'hardly':{'even':1,'be':6,'needs':1,'necessary':2,'pauses':1,'conceive':1,'seems':1,'change':1,'imagine':1,'counts':1,'tenable':1,'inferior':1,'too':1},'500':{'pounds':1,'000':4,'to':1,'miles':1,'fathoms':3,'yards':1,'extinct':1,'deg':1},'501':{'c':2},'6a':{'hipparion':1},'direction':{'towards':1,'whereby':2,'that':1,'of':6,'is':1,'when':1,'.':2,'as':1,'contrary':1,'in':4,'taken':1,';':1},'forecloses':{'the':1},'robbed':{'of':1},'radiates':{'heat':1},'tiger':{'begins':1,'the':1},'implied':{'a':3,'getting':1,'many':1,'.':4,'including':1,'in':2,'an':3,'was':1,'warranties':1},'sea-horses':{'phyllopteryx':1},'eaters':{'in':1},'attentive':{'persistent':1},'squirrels':{'quickly':1,'which':1,'.':1},'robber':{'crab':1},'paying':{'any':1,'copyright':1},'specialised':{'member':1,'instincts':1},'caucasians':{'we':1,'include':1},'mount':{'on':1,'wilson':16,'hermon':2,'everest':1},'twigs':{'very':1},'life;':{'precise':1},'premature':{'to':1},'vegetation--an':{'awkward':1},'slippery':{'bridge':1},'life.':{'origin':1,'wallace':1,'similarly':1,'many':1,'there':1,'wherever':1,'it':1,'illustration':1,'sec':2,'they':1,'volunteers':1,'if':1},'mound':{'.':1},'hunts':{'small':1,'vigorously':1},'focussed':{'on':1},'trackless':{'waste':1},'another--to':{'pass':1},'person.':{'besides':1},'someone':{'not':1,'said':1},'anti-bodies':{'which':1},'unsounded':{'i.e':1},'uncatchable':{'in':1},'meals.':{'there':1},'helmet':{'or':1,'.':1},'revolutions':{'a':1,'round':1},'author':{':':1},'alphabet':{'of':2,'the':1},'granted':{'tax':1,'but':1},'skips':{'the':1,'about':1},'knowable':{'way':1},'motley':{'crowd--we':1,'into':1},'a-b.':{'newer':1},'buys':{'a':1},'implement.':{'on':1},'generated':{':':1},'status':{'of':2,'with':1,'by':1},'wall-like':{'formation':1},'males':{'six':1,'especially':1,'that':1},'disadvantages':{'for':1},'pays.':{'when':1},'nest':{'and':2,'or':2,'to':1,'else':1,'of':3,'into':1,'191':1,'.':2,'how':1,'while':1,'which':2,'in':5,';':1,'several':1,'with':2,'the':6,'is':1,'out':1},'insects.':{'whether':1,'mesozoic':1,'devonian':1},'tree-toad':{'whose':1},'drives':{'off':2},'weed':{'120':1,'.':1},'director':{'of':1,'gbnewby':1},'persons':{'bearing':1,';':1,'is':1},'arose':{'and':1,'what':1,'we':1,'.':1,'as':1,'races':1,'various':1,'the':3,'or':1},'changing':{'natural':1,'energy':1,'process':1,'colour':1,'conditions':1,'its':1},'implements':{'a':1,'instruments':1,'were':1,'or':1,'.':1},'marsh.':{'the':1,'six':1},'perennial':{'tendency':1},'safely':{'be':1,'away':1},'shift.':{'we':1},'magical':{'glass':1,'way':1},'without':{'saying':1,'seeing':1,'being':2,'intelligence':1,'ceasing.':1,'an':2,'as':1,'at':1,'further':1,'domesticated':1,'any':6,'heat--forms':1,'trying':1,'thinking':1,'there':1,'.':4,'doing':1,'charge':1,'much':1,'too':1,'fatiguing':1,'prominently':1,'reading':1,'measuring':1,'mentioning':1,'them':2,'committing':1,'permission':1,'sufficient':1,'significance':1,'noticing':1,'free':1,'heat':2,'a':3,'supposing':1,'disparagement':1,'complying':1,'trouble--an':1,'conspicuous':1,'sacrificing':1,'paying':2,'wide':1,'that':1,'getting':1,'stimulus':1,'this':1,'fertilisation':1,'the':7,'having':1},'model':{'of':2,'is':1,'by':4,'seen':1},'reward':{'and':1,'of':1},'bodies':{'and':1,'certain':1,'held':1,'are':3,'in':1,'whose':1,'would':1,'had':1,'.':1,'behave':1,'which':1,'has':1,'we':1,'dependent':1,'acquire':1,'but':1,'fall':1,'represented':1,'i.e':1,'with':1,'like':1,'considered':1,'of':2,'up':2,'the':2,'having':1},'justify':{'themselves':1,'the':2,'all':1},'clog':{'the':1},'when':{'and':1,'this':4,'all':1,'full-grown':1,'dealing':1,'it':34,'competition':1,'one':3,'appropriate':1,'jupiter':1,'something':1,'human':1,'in':2,'seen':1,'cold':2,'abundant':1,'its':1,'even':1,'compared':2,'to':1,'observing':1,'caught':2,'there':6,'young':2,'sunlight':1,'birds':2,'needed':1,'only':3,'bombarded':1,'sponges':1,'lizzie':1,'tens':1,'you':3,'he':9,'resting':1,'we':31,'his':1,'scientific':1,'parental':1,'liberated':1,'however':2,'atoms':1,'water':1,'moving':2,'two':2,'they':16,'put':1,'an':7,'with':1,'man':3,'a':19,'great':1,'revolved':1,'animals':1,'these':2,'of':1,'professor':1,'applied':1,'she':2,'baits':1,'enough':1,'small':1,'hot.':1,'the':82,'grass':1,'at':1},'guided':{'astronomers':1},'actions':{'and':4,'among':1,'show':1,'becoming':1,'but':1,'.':4,'cease':1,'are':1,'which':2,'living':1,';':1},'violent':{'and':1,'death':1,'end':3,'disturbances':1,'agitation':1,'motion':3,'discharge':1,'movement':1},'cease':{'to':1,'is':1,'in':1,'using':1},'anamnia':{'the':1},'mongoose':{'riki-tiki-tavi':1},'differentiation':{'of':1,'.':1},'polish':{'wife':1},'colonise':{'the':2},'captured':{'a':2,'arm':1,'for':1,'.':1},'blow':{'from':1},'gentleness':{';':1},'widest':{'and':1,'array':1,'variety':1},'hint':{'of':5},'--from':{'unicellular':1},'rose':{'and':1,'on':1,'above':1,'in':1},'favouring':{'certain':1,'the':1},'except':{'about':1,'for':3,'that':6,'electricity':1,'when':1,'in':8,'upon':1,'to':1,'as':1,'red':1,'violet':1,'the':7,'those':1,'man':1},'great.':{'illustration':1},'lets':{'it':1},'interested':{'in':1},'samples':{'of':1},'hind':{'part':1,'end':1,'.':1},'engulfed':{'.':1},'stagnant':{'lifeless':1},'nekton':{'and':1},'sociality':{'.':1},'men-of-war':{';':1},'kingdom':{'we':1,'of':1,'.':2,'not':1,'the':1,'where':1},'crustaceans':{'and':3,'lamp-shells':1,'insects':1,'insect':2,'can':1,'which':2,';':1},'confines':{'the':1},'action.':{'what':1},'confined':{'to':2,'so':1,'our':1},'characteristically':{'vital':1},'shore-haunts.':{'following':1},'accepted':{'theory':1,'that':1,'it':1,'but':1,'which':1,'in':1},'left-hand':{'photograph':2,'side':1},'acute':{'senses':1,'especially':1},'standstill':{'that':1},'particle':{'that':1,'of':8,'is':1,'which':1,'becomes':1,'was':1},'harmonising':{'the':1},'patrick':{'sheriff':1},'reduces':{'to':1,'friction':1},'multifarious':{'tasks':1},'sieves':{'with':1,'by':1},'sternly':{'regulated':1},'petrie':{'has':1},'donations':{'received':1,'from':2,'1':1,'to':4,'can':1,'in':2,'or':1,'are':2},'always':{'new.':1,'human':1,'being':1,'have':1,'in':5,'ring':1,'giving':1,'regarded':1,'had':1,'tend':1,'presents':1,'to':2,'setting':1,'black':1,'going':2,'receiving':1,'that':1,'clear-cut':1,'refused':1,'lives':1,'recognise':1,'put':1,'envelops':1,'aiming':1,'present':2,'a':1,'on':1,'turns':1,'or':1,'overlappings':1,'remain':1,'points':1,'so':1,'hobbled':1,'the':2,'think':1},'tower':{'above':1},'reduced':{'to':3,'the':1,'from':1,'for':1,'.':1},'burdens':{'of':1},'competition':{'e.g':1,'is':1,'but':1,'.':1,'in':1,'or':1},'deduce':{'more':1},'respect':{'most':1,'with':1},'oftener':{'than':1},'intact':{'ones':1},'leadbeater.':{'an':2},'chewing':{'a':1},'provided':{'to':1,'you':1,'that':1,'by':1,'in':1},'mood':{'at':1},'prolific':{'and':2,'multiplication':2,'early':1,'have':1,'though':1},'defenceless':{'weaponless':1},'legal':{'fees':2},'moon':{'and':4,'because':1,'exert':1,'28':1,'is':5,'newton':1,'it':1,'as':1,'at':2,'entering':2,'------':1,'32':1,'are':1,'passes':1,'from':1,'takes':1,'would':1,'began':1,'when':1,'.':15,'to':1,'of':1,'fig':1,'mars':1,';':1,':':1,'was':6,'split':1,'do':1,'we':1,'nearer':1,'may':1,'showing':1,'were':2,'took':1,'but':7,'crosses':2,'gets':1,'by':1,'partially':1,'has':2,'turns':1,'s':6,'act':1,'the':2,'makes':1,'farther':1},'depletion':{'of':1},'moot':{'point':1},'provides':{'the':3,'means':1},'out-side':{'influences':1},'freed':{'from':2},'lop-eared':{'forms':1},'ovaries':{'and':1},'nails':{'and':1,'in':1},'stereotyped':{'routine':1,'was':1,'bee':1},'communicate':{'some':1},'voracious':{'and':1,'insect':1},'journeyman':{'.':1},'resurrection':{'of':1},'affording':{'food':1,'most':1,'as':1},'on':{'all':1,'minced':1,'september':1,'isolated':1,'disguise':2,'through':1,'human':2,'earth':5,'its':31,'apace':1,'dividing':1,'true':1,'young':1,'better':1,'to':21,'board':2,'stable':1,'photographs':1,'brown':1,'them':3,'his':4,'around':1,'returning':1,'possible':1,'trees':2,'firmer':1,'sea-lettuce':1,'five':1,'probably':1,'radio-active':1,'one':5,'jupiter.':1,'evolution':3,'likeness':1,'january':1,'sufficiently':1,'sand':2,'each':5,'small':1,'them.':1,'entirely':1,'page':1,'saturn.':1,'transcribe':1,'some':4,'biology':1,'yerkes':2,'individual':1,'entering':1,'our':2,'special':1,'creatures':1,'what':1,'for':2,'god':1,'mars.':1,'ice':3,'various':1,'affecting':1,'progress':1,';':2,'receiving':1,'red':1,'can':1,'columbus':1,'wheat':2,'whose':1,'evolving':1,'atoms':1,'water':1,'by':3,'dry':4,'both':2,'backwards':1,'repeating':1,'leaves':1,'american':1,'islands':2,'passing':2,'or':1,'this':11,'striking':1,'hearing':1,'another':3,'einstein':1,'trust':1,'from':2,'her':3,'their':10,'top':1,'there':1,'two':1,'.':12,'183':1,'moisture':1,'mars':10,'until':1,'life':1,'clever':1,'that':3,'mammals':1,'exactly':1,'back':1,'bipedal':1,'with':1,'those':1,'must':1,'plants':2,'account':2,'these':4,'mount':2,'up':1,'air':2,'three':1,'under':1,'and':3,'withered':1,'gate-posts':1,'in':9,'surpassing':1,'slowing':1,'an':10,'protective':1,'planets':1,'further':1,'floating':1,'any':1,'different':3,'inborn':1,'wits':1,'radiation':1,'snow':1,'close-packed':1,'other':1,'sandy':2,'animal':1,'accumulating':1,'towards':1,'lanky':1,'it':8,'herbs':1,'itself.':1,'occasion':1,'such':1,'intrinsic':1,'parallel':1,'a':63,'land':6,'to-day':1,'decaying':1,'we':1,'which':18,'green':2,'every':4,'the':294,'berries':1,'again.':1},'beavers':{'who':1},'discussed':{'elsewhere.':1,'separately':1,'in':2},'chamberlin':{'and':1,'s':1,'says':2},'shrimp':{'net':1},'20417.zip':{'this':1},'whence':{'the':3,'man':1,'is':2,'they':2,'he':1},'stop.':{'illustration':1},'stand':{'in':1,'out':1,'alone.':1},'prism--a':{'triangular-shaped':1},'discrimination':{'of':1,'with':1,'between':1},'gregory':{'b':1},'investigators':{'professor':1,'.':1},'or':{'partial':1,'suns':1,'four':3,'nursery':1,'go':2,'layers':1,'brackish':1,'hunting':2,'electricity':1,'unenforceability':1,'young':2,'to':10,'under':1,'teaching':1,'division':1,'devonian':1,'fall':1,'animals':2,'whirlpools':1,'elevations':1,'squids':1,'alevins':1,'redistribute':1,'corpuscles':1,'clouds':1,'die':1,'frozen':1,'glaciations':1,'greenish':1,'small':1,'mammal':1,'autotomy.':1,'caries':1,'upper':1,'frog-mouth':1,'pass':2,'further':1,'even':16,'what':1,'adds':1,'fitnesses':1,'pipes':1,'paddle':1,'access':1,'above':1,'new':3,'thereabouts':1,'movement':1,'segmentation':1,'men':1,'water':1,'protection':1,'along':1,'extreme':1,'sending':1,'thirty':2,'brilliant':1,'wherever':1,'experience':1,'patagium':1,'formation':1,'threes':1,'feelings':1,'semang':1,'total':1,'herring':1,'tertiary':1,'engrain':1,'use':2,'from':5,'two':4,'distributing':3,'almost':2,'more':8,'becomes':1,'envelope':1,'about':1,'train':1,'rabbit':1,'breach':1,'glad':1,'must':1,'flagellum':1,'strain':1,'averaged':1,'can':1,'nothing.':1,'marble':1,'mud-fishes':1,'proprietary':1,'brown':1,'pulling':1,'something':1,'serum':1,'axis':1,'disappearing.':1,'six':3,'chemical':2,'how':2,'fourth':1,'re-use':2,'stock':1,'gonads':1,'communicating':2,'after':3,'eighty':1,'mankind':1,'a':33,'elusive':1,'light':2,'hypotheses':1,'coal':2,'so':4,'deterioration':1,'playing':1,'foetal':1,'refund':3,'sperm-cell':1,'evolutionary':1,'self-destructively':1,'rottenness':1,'double-breather':1,'hypertext':1,'years':1,'lumpsucker':1,'secondaries':1,'pterodactyls':2,'group':1,'lateral':1,'destroyed':2,'animal':1,'pglaf':1,'repulsive':1,'they':1,'weeds':1,'not':2,'detach':1,'adventurous':1,'bubbles.':1,'magnitude':1,'fitness':1,'beneath':1,'mental':1,'agriculture':1,'out':1,'dying':1,'cause':1,'alevin':1,'shut':1,'approached':1,'siege':1,'eternal':1,'rotifer':1,'duck-billed':3,'telescopes':1,'nebulae':1,'rearrangements':1,'wanderers':1,'audacity':1,'disturbed':1,'lemurs':1,'stone':1,'unborn':1,'zoophyte':3,'south':1,'emotion':1,'blown':1,'another':1,'flagella':1,'foraminifera':2,'monkey':1,'pelagic':1,'anyone':1,'their':2,'185':1,'white':1,'muscles':1,'immediate':1,'sea-scorpions':1,'egg-producer':1,'patches':1,'meteors':1,'grey':1,'actively':1,'iron':1,'were':1,'providing':2,'sea-gooseberries':1,'chrysalis':1,'shell':2,'have':2,'cleverness':1,'organs':1,'any':9,'built':1,'lumps':1,'camouflage':1,'gunnel':1,'take':1,'online':3,'destroy':2,'spawns':1,'primaries':1,'easygoing':1,'centres':2,'breaking':1,'invertebrate':1,'successive':1,'measured':1,'darkness':1,'sea-butterflies':1,'nostrils':1,'later':3,'dissolved':1,'electrons':1,'salt':1,'planetary':1,'distributed:':1,'nest-building':1,'bright':1,'archimedes':1,'seaweed':1,'entity':3,'find':1,'only':3,'wood':1,'black':1,'employee':1,'shepherding':1,'fossil':1,'get':1,'eel-fare':1,'fronds':1,'cannot':1,'preparing':1,'instinctive':2,'primates':1,'stone.':1,'devoured':1,'amid':1,'parasitic':1,'remove':1,'twice':1,'steam':1,'kernel':1,'seventeen':1,'ebb':1,'intelligence':1,'testing':1,'computer':1,'are':2,'corrupt':1,'eoliths':1,'federal':1,'away':1,'rings':1,'waltzing':1,'its':1,'weapons':1,'mud':1,'between':1,'nestor':1,'across':1,'deletions':1,'incarnation':1,'creating':2,'sole':1,'podargus':2,'invisible':2,'1.e.9.':2,'sperm-producer':1,'many':3,'region':1,'water-ouzel--a':1,'strains':2,'expense':1,'expression':1,'experimental':1,'mutating':1,'among':1,'adjusted':1,'mutations':3,'whatever':1,'extinct':2,'late':1,'gregarious.':1,'one-celled':1,'create':1,'three':5,'protoplasm':1,'thrice':1,'rather':1,'general':1,'else':1,'elvers':1,'homes':1,'solid':1,'dendrites':1,'replaced':1,'argonaut':1,'wild':2,'layer':1,'diaphragm':1,'is':1,'squid':2,'it':5,'cluster':1,'to-morrow':1,'anti-bodies':1,'in':14,'if':1,'damaged':1,'perhaps':1,'cromagnard':3,'shorter':1,'dermis':1,'double-breathers':1,'big':1,'mud-skipper':2,'prominences':1,'foam':1,'infinite':1,'staving':1,'reflection':1,'charges':4,'well':1,'command':2,'comes':1,'mother':2,'the':23,'left':1,'less':14,'cromagnards':1,'distribute':2,'egg-cell':1,'obtain':1,'fishing':1,'anamnia':1,'multiples':1,'vibration':1,'absorption':1,'killed':1,'dipper':1,'irresponsive':1,'humanity':1,'photographed':1,'tracheae':1,'early':1,'possibly':1,'gyrating':1,'five':2,'using':1,'modifications':1,'appearing':1,'feral':2,'post-glacial':2,'incidental':1,'eel':1,'vortex':1,'ctenophores':1,'often':1,'crown':1,'dead':1,'sponge':1,'indirect':1,'bruising':1,'for':2,'memories':1,'does':1,'glacial':1,'disproved--e.g':1,'enregistering':1,'by':10,'on':5,'limitation':3,'chaff':1,'central':1,'of':11,'20417.zip':1,'octopus':2,'sea-grass':1,'down':1,'because':3,'determine':1,'protozoa':1,'additions':1,'her':1,'camouflaging':2,'incipient':1,'sneezing':1,'was':2,'pinna':1,'some':3,'amongst':1,'heat':1,'shoulder-blade':1,'trying':1,'with':3,'whether':1,'dangerous':1,'variations':2,'frugivorous':1,'associated':1,'taste':1,'an':3,'as':3,'furl':1,'again':1,'dimly':1,'inborn':1,'when':3,'other':8,'dies':1,'casque':1,'nucleus':2,'pycnogon':1,'sneeze':1,'vice':1,'vehicles':1,'implied':1,'indirectly':3},'amber':{'trade':1},'cambridge':{'university':1,'manual':1,'.':3},'columbia.':{'the':1,'fig':1},'communication':{'that':1,'between':2},'charts':{'we':1},'spinal':{'canal':1,'cord':4},'clams':{'in':1},'accounts':{'for':1},'determine':{'the':3,'what':1,'survival':1},'cro-magnon':{'in':1},'speculated':{'on':1},'theoretically':{'a':1,'that':1},'buds':{'out':1},'pycnogon':{'walking':1},'whales':{'and':1,'great':1,'.':1,'which':1,'largely':1},'distinctions':{'except':1},'strictly':{'marine':1},'there':{'and':1,'emerge':1,'exists':2,'being':1,'had':4,'is':259,'191':1,'results':2,'one':1,'diverged':2,'are':142,'have':7,'in':3,'.':5,'any':2,'seemed':1,'emerges':1,'rises':1,'appear':1,'would':2,'seems':7,'been':2,'actually':1,'may':10,'only':1,'other':1,'probably':2,';':1,'has':12,'was':42,'ought':1,'be':1,'life':2,'an':1,'intervened':1,'some':1,'took':1,'illustration':1,'soon':1,'depressing':1,'cannot':1,'lives':1,'arose':2,'they':1,'not':5,'now':1,'comes':1,'depended':1,'a':3,'on':1,'are.':1,'should':3,'could':2,'will':5,'remain':2,'must':7,'can':11,'evolved':4,'were':26,'the':1,'might':1,'makes':1,'came':3},'disposed':{'to':2},'dispersion':{'is':3,'can':1},'strict':{'liability':1,'sense':3},'world--weighs':{'nearly':1},'house':{'of':1,'.':2,'to':1,'against':1,'on':1},'macaques':{'and':1,'the':1},'fish':{'and':2,'is':4,'it':2,'117':1,'at':1,'118':1,'firmly':1,'takes':1,'lizards':1,'flying':1,'when':1,'.':2,'to':2,'which':4,'probably':1,'has':1,'arges':1,'stock':1,'that':1,'ceratodus':1,'chiasmodon':2,'with':2,'like':1,'of':1,'larger':1,'grows':1,'the':3,'male':1,'makes':1,'called':1},'eoanthropus':{'expresses':1},'relic':{'of':3,'were':1},'kittens':{'or':1},'account.':{'since':1},'troubles.':{'another':1},'amongst':{'fishes':1,'the':8,'themselves':1,'them':1,'all':1},'instrument.':{'a':1},'strenuous':{'life.':1,'life':3,'conditions':1,'time':2},'promote':{'variability':1},'faster':{'and':1,'than':4,'.':2},'applying':{'severe':1},'bullet':{'and':1,'thirty':1,'leaves':1,'illustration':1,'one':1,'itself':1,'does':1,'the':1},'multiplicity':{'.':1},'electroscope':{'is':1},'centenarian':{'tortoise':1},'grasp':{'begins':1,'probably':1,'the':1,'an':1},'grass':{'and':2,'gathering':1,'forming':1,'the':1,'was':1,'he':1},'creeping':{'of':1,'about':1,'upwards':1},'strongly':{'developed':1,'illumined':1},'accentuated':{'by':1},'words:':{'bone':1},'stock.':{'every':1},'taste':{'do':1,'may':1,'of':1,'seems':1,'which':1,'in':1},'yacht':{'and':1},'lingula':{'of':1},'tactics--self-effacement':{'on':1},'britain':{'and':2,'do':1,'we':1,'just':1,'it':1,'has':1,'having':1},'curly-or':{'wavy-haired':1},'diverged':{'far':1,'the':2,'from':1},'orchards':{'descended':1},'corresponding':{'ratio':1,'magnetic':1,'to':10,'bright':1,'stages':1,'hump':1},'russel':{'wallace':1},'operation':{'of':1,'to-day':1},'collared':{'lashed':1},'deserve':{'for':1},'discerned':{'in':1},'shore-haunt':{'and':2,'littoral':1,'as':1,'are':1,'exhibits':1},'compel':{'the':1},'erecting':{'standing':1},'spring-tails':{'and':1},'blackish-grey':{'.':1},'f.z.s.':{'seasonal':1,'professor':1,'banded':1,'rock':1,'the':3,'woodpecker':1},'meteorites--pieces':{'of':1},'cock-pigeon':{'very':1},'deviation':{'it':1},'briefly':{'the':1,'discussed':1,'outline':1},'separate':{'and':1,'animals':1,'study.':1,'engines':1,'tuft':1,'whirling':1,'off':1,'entity':1,'universes--':1,'threads':1,'molecules':1,'existence':1,'genus':1},'manipulate':{'puzzle-boxes':1},'symbol':{'of':1},'carnegie':{'institution':2},'includes':{'not':1,'information':1,'all':2,'thousands':1,'the':2},'gutenberg':{'web':1,'associated':1,'license':3,'is':3,'ebook':4,'literary':13,'are':1,'you':1,'volunteers':1,'appears':1},'nucleus':{'and':2,'then':1,'we':1,'gr':1,'rather':1,'of':5,'is':1,'but':1,'.':4,'to':1,'are':1,'in':1,'into':1,';':1,'has':1,'or':3},'recognise':{'a':1,'both':1,'them':1,'that':1,'these':1,'an':1,'as':2,'progress':1,'the':6,'accessory':1},'fasten':{'themselves':1},'included':{'a':1,'was':1,'with':2,'.':2,'in':2,'the':1,'has':1,'numerous':1},'stocks':{'began.':1,'of':3,'began':1,'within':1,'it':1,'but':1},'irretraceable':{'course.':1},'bustard.':{'such':1},'atromaculatus':{'121':1,'in':1},'missed':{';':1},'meadow':{'it':1},'bilateral':{'symmetry.':1,'symmetry':2},'calls':{'of':1,'the':3,'it':1,'adaptive':1},'wife':{'took':1},'splendour.':{'they':1},'environment.':{'1':1,'sec':1},'eighty-odd':{'chemical':2},'migrated':{'to':1,'from':2},'all':{'opinions':1,'over':3,'mending':1,'four':1,'thoughtful':1,'through':3,'its':2,'except':2,'monkeys':1,'forms':1,'to':3,'only':1,'reptiles':2,'easy':1,'circle':1,'his':5,'liability':2,'they':1,'day':2,'processes':1,'50':1,'these':6,'works':1,'cells':1,'mean':1,'angles--that':1,'because':1,'energy':1,'hard':1,'phenomena':1,'are':1,'our':3,'shoots':1,'enemies':1,'respects':1,'space':1,'access':1,'outside':1,';':3,'be':1,'we':1,'scientific':1,'here':1,'atoms':2,'magnetism':2,'directions.':1,'members':1,'clues':1,'directions':3,'along':1,'likelihood':3,'things.':1,'mingled':1,'of':7,'round':3,'speeds':1,'probability':2,'point':1,'three':1,'chemists':1,'references':2,'sounds':1,'use':1,'her':1,'flying':1,'copies':2,'.':7,'scions':1,'conceivable':1,'molecular':2,'was':1,'life':2,'that':3,'but':2,'cases':2,'white':3,'those':2,'inconspicuous':1,'animals':2,'this':4,'originally':2,'appearance':2,'air':1,'matter':7,'were':1,'meet':1,'stages':2,'at':2,'and':1,'associated':1,'sorts':6,'is':3,'modern':2,'it':1,'as':1,'manner':1,'walks':1,'perhaps':3,'things':4,'make':1,'when':2,'detail':1,'how':1,'other':1,'which':1,'creatures':1,'higher':2,'kinds':1,'moving':2,'such':1,'in':2,'attaining':1,'time':1,'the':81,'bodies':2},'lack':{'of':2},'muscle-fibres':{'grow':1,'in':1},'son.':{'the':1,'alsatian':1},'seals':{'and':1,'.':1},'light-waves':{'and':1,'into':1,'.':2,'are':1,'which':1,'the':2},'disc':{'and':1,'for':1,'of':4,'.':2,'eight':1,'was':1},'dish':{'and':1},'follow':{'sir':1,'that':1,'it':1,'however':1,'till':1,'the':4,'with':1,'their':1},'disk':{'or':1},'decisions':{'were':1},'synthetic':{'chemists':2,'chemist':1},'glimpse':{'of':8,'the':1,'in':1},'deliberateness':{'and':1,'.':1},'meteorites--a':{'great':1},'subjected':{'.':1},'extraneous':{'source':1},'presentation':{'of':1},'tethered':{'on':1},'activities':{'and':1,'influenced':1,'may':1,'of':1,'.':1,'implying':1,'as':1},'belonging':{'to':1},'means--light':{'without':1},'worse':{'to':1,'for':1,'.':1},'devonian':{'a':1,'age':1,'period':4,'seas.':1,'lung-fishes':1,'foot-print':1,'the':1,'red':1},'song':{'of':1},'infringement':{'a':1},'combustible':{'material':1},'educative':{'process':1},'induce':{'fresh':1},'psychologist':{'whom':1},'sons':{'new':1,'first':1},'fan':{'or':1,'like':1,'by':1},'hatching':{';':1,'out':2,'.':1},'awful':{'possibility--involution':1},'time--wherein':{'to':1},'soles':{'with':1},'rhodeus':{'amarus':2},'corpuscles':{'and':1,'called':1,'form':1,'.':1},'morley':{'tried':1},'stimulus':{'almost':1,'of':1,'.':1,'travels':1,'to':2,'such':1},'eye-sockets':{'the':1},'list':{'may':1,'of':3,'is':1,'to':1},'prolonged':{'training':1,'period':1,'ice':1,'youthfulness':1,'ante-natal':1,'the':1,'trying':1,'drought':2,'exposure':1},'rods.':{'2':1},'indemnity':{'-':1},'familiarly':{'seen':1},'dexterity':{'and':1,'until':1,'besides':1,'.':1},'lightner':{'witmer.':1},'rats':{'and':4,'learn':1},'depths.':{'a':1,'illustration':1},'ten':{'and':1,'pounds':3,'of':1,'thousand':3,'times':1,'hours':2,'to':1,'straws':1,'unseen':1,'moons':1,'hours--a':1,'our':1,'years':1,'minutes':2},'foreground':{'holding':1},'fringing':{'the':1,'teeth':1},'tea':{'or':1},'reins':{'at':1,'in':1},'breakers':{'.':1},'000-50':{'000':1},'rate':{'a':1,'from':2,'that':1,'of':15,'which':1,'than':1},'invention':{'and':1,'of':1,'.':1,'first':1,'that':1},'1904-5':{'in':1},'s-beak':{'jaws':1},'functioning':{'properly':1,'throughout':1,'.':1},'remarkably':{'representative':1},'toe.':{'illustration':1},'paralyse':{'and':1},'babylonia':{'egypt':1,'greece':1},'what':{'origin':1,'this':3,'all':1,'right':1,'followed':3,'is':49,'it':4,'evidence':1,'are':10,'in':1,'peter':1,'causes':1,'before':1,'happens':2,'sir':1,'would':1,'matter':1,'electricity':1,'agency':1,'does':1,'goes':2,'resulted':1,'new':1,'you':1,'has':4,'might':5,'energy':1,'crookes':1,'sort':1,'then':2,'we':20,'elements':2,'electric':1,'may':5,'mammals':1,'of':1,'looks':2,'took':1,'mimics':1,'heat':1,'fruit':1,'mankind':1,'they':9,'satellites':1,'an':1,'come':1,'appears':1,'those':1,'man':1,'a':7,'great':1,'animals':1,'these':1,'was':8,'professor':1,'osborn':1,'more':1,'she':2,'were':1,'happened':1,'about':1,'the':18,'gives':1,'makes':1,'could':1,'bond':1},'necessary.':{'a':1},'imported':{'from':1},'advantageous':{'to':1,'than':1,'power':1,'for':1},'sun':{'and':22,'compare':1,'already':1,'often':1,'produces':1,'is':20,'in':5,'constitute':1,'ceased':1,'as':3,'itself':2,'sec':1,'looks':1,'uranus':1,'year':1,'------':1,'our':1,'are':2,'before':1,'mercury':1,'passes':1,'from':1,'would':5,'seems':1,'.':23,'to':4,'must':2,'without':1,'which':4,'dying':2,';':1,'has':4,'was':2,'into':1,'photographed':2,'we':4,'goes':1,'that':4,'may':1,'forming':1,'obscures':1,'however':1,'but':2,'cannot':1,'every':1,'here':1,'somewhat':1,'not':1,'with':2,'nearly':1,'like':2,'a':1,'whose':1,'19':1,'18':1,'could':1,'sweeps':1,'or':1,'s':35,'became':1,'flame':1,'can':1,'have':1,'were':2,'at':2,'the':7,'called':1,'thanks':1},'sum':{'up':1},'ticks':{'of':1},'crust':{'and':2,'of':3,'.':3,'brought':1,'has':1,'with':2,'by':1},'brief':{'moments':1,'outline':1},'version':{'posted':1},'for--may':{'have':1},'maze--which':{'they':1},'discern':{'the':2,'that':1},'heat-measuring':{'instrument':1},'cheetahs':{'or':2,'occur':1},'segmentation':{'of':1},'toes':{'and':1,'a':1,'scrambling':1,'form':1,'shorten':1,'.':3,'as':1},'tags':{'of':2},'ceratodus':{'which':1},'berthelot':{'that':1},'behaviour':{'and':2,'show':1,'is':5,'reaches':1,'depends':1,'sec':1,'are':1,'had':1,'.':8,'may':3,'which':6,'was':1,'we':1,'that':1,'very':1,'but':2,'diagram':1,'76':1,'on':1,'both':1,'of':15,'without':2},'inverse':{'ratio':1,'order':1},'compressed':{'body':1,'marked':1},'directions':{'and':1,'becoming':1,'within':1,'.':3,'as':1,'indicative':1,'at':2,';':1},'steamships':{'to':1},'observing':{'carefully':1,'all':1,'the':1},'water-shed':{'to':1},'chlorophyll-possessing':{'plants':1},'29.46':{'73000':1},'difficulty':{'of':1,'is':1,'about':1,'in':3},'1843':{'had':1},'1842':{'.':1},'allows':{'life':1,'for':1},'1845':{'of':1},'miniature':{'frogs':1,'solar':1,'.':1},'extremes':{'of':1,'are':1,'to':1},'reshufflings':{'or':1},'m.f.':{'near':1},'2163':{'--':1},'cataract':{'gives':1},'sticking':{'out':3},'disposition':{'taking':1},'suddenly':{'seized':1,'fired':1,'attacked':1,'this':1,'lights':1,'into':1,'perceive':1,'being':1,'so':1,'in':1,'rising':1},'semites':{'nordics':1},'bathers':{'are':1},'screens':{'in':1},'mme':{'.':1},'color':{'of':1},'1908':{'33':2,'notice':1,'the':1},'rainbow-tinted':{'colours':1},'know.':{'the':1},'1907':{'by':2},'coatings':{'is':1},'1905':{'22':1,'illustration':1},'herring':{'and':1,'illustrations':1,'the':1,'family':1,'would':1},'1900':{'by':1,'that':1},'1901':{'but':1},'unthinkably':{'long':1},'pervades':{'everything--so':1},'proceed':{'to':1,'from':2,'at':1},'degree.':{'until':1},'faint':{'and':2,'indications':1,'star':1,'.':1,'to':2,'impressions':1,'or':1},'unthinkable':{'on':1},'minor':{'chapter':2,'invasions':1,'alterations':1,'ones':1,'idiosyncrasies':1,'speculated':1},'horses':{'and':5,'a':1,'or':1},'flat':{'forehead':1,'on':2,'as':1,'spider':1,'skull':1},'darting':{'hither':1},'knows':{'his':1,'for':1,'that':1,'of':1,'but':2,'to':1,'only':1,'how':1,'the':1,'monkeys':1},'light-years':{'polaris':1},'definition':{'is':1},'coating':{'and':1},'text.':{'illustration':3},'screen.':{'the':1,'now':1},'flit':{'by':1},'stick':{'might':1,'with':1,'so':1,'to':1,'it':1},'known':{'and':5,'sources':1,'as':10,'human':1,'in':2,'from':1,'excepting':1,'approximately':1,'.':4,'bird--evidences':1,'to':15,'only':2,'easy':1,'between':1,'bird--too':1,':':1,'type':1,'bird':4,'then':1,'that':4,'but':2,'atom':1,'predecessors':2,'on':1,'about':2,'attempt':1,'of':3,'amphibian':1,'the':1,'fact':1},'glad':{'to':1},'presumed':{'evolution':1},'primate':{'stem':2,'stock':2},'sense-presentation':{'and':1},'lung-fish':{'inside':1},'v':{'the':1,'.':2},'--jupiter':{'and':1},'excursion':{'in':1},'tennis':{'ball.':1},'computers':{'including':1,'.':1},'hormones--itself':{'of':1},'brown':{'and':2,'plants':1,'that':1,'colour':1,'variety':1,'box':1,'bear':3,'plumage':1,'ones':2,'seaweed':1,'in':1,'variable':1,';':1,'on':1,'stoat':1},'bright--the':{'light':1},'joints':{'in':1},'locating':{'sounds':1},'abandonment':{'of':1},'moorhens':{'was':1,'which':1},'protects':{'its':1},'imitation':{'counts':1,'so':1,'two':1,'but':1,'.':1},'arise':{'mysteriously':1,'from':3,'take':2,'directly':1},'pond':{'and':3,'of':1,'is':1,'it':1,'to':1,'nor':1},'air-dome':{'.':1},'mother-of-pearl':{'or':1},'terrestrial':{'plants':2,'mountains':1,'life':3,'animals':3,'rather':1,'support':1,'haunt':2,'standards':1,'dinosaurs':1,'journeyman':1,'animal':3,'backboned':1,'dragons':2},'influenced':{'all':1,'by':4},'court':{'maze':2,'maze--which':1},'goal':{'is':1},'unavailable.':{'what':1,'the':1},'breaking':{'on':2,'up':3,'down':5,'diverse':2,'down.':1,'the':1},'84.02':{'31900':1},'occasionally':{'with':1,'however':1,'in':1},'influences':{'such':1,'shutting':1,'from':1,'they':1},'extinguished':{'at':1},'shoulder-blade':{';':1},'hers.':{'illustration':1},'mould':{'so':1,'opening':1},'simplicity':{'and':1,'of':1},'sea-squirt':{'and':1},'orbits':{'.':1,'with':1,'at':1,'round':1},'trial-and-error':{'method':1,'methods':1},'twenty-thousandth':{'of':1},'moult':{'and':2},'pupae':{'tend':1,'less':1},'adventure':{'and':1,'the':1,'which':4,'.':1},'infects':{'him':1},'prospecting':{'for':1,'in':1},'concentrating':{'always':1},'profited':{'by':1},'dissolving':{'out':1},'short':{'a':1,'summer':1,'we':1,'and':2,'stump-like':1,'of':1,'powerful':1,'tail':1,'lists':1,'.':1,'list':1,'length':1,'folk':1,'words':1,'time':7,'the':1,'sojourn':1,'excursion':1,'to':1,'distance':3},'chiefly':{'on':1,'used':1,'from':1,'of':1,'through':1,'in':2,'sounds':1,'with':1},'dispersion--that':{'is':1},'prefers':{'a':1},'life-histories':{'and':1,'of':1},'departure':{'of':1,'in':1},'height':{'and':1,'of':8,'.':1,'so':1,'in':1,'the':1,'was':1},'shore':{'and':2,'area.':1,'is':4,'scene':1,'inland':1,'1921':1,'as':1,'starfishes':1,'at':1,'in':1,'.':3,'to':1,'varies':1,'hatch':1,';':1,'life':1,'seaweeds':1,'but':1,'they':1,'others':1,'come':1,'must':1,'animals':2,'of':9,'according':1,'the':1,'something':1},'conjugal':{'affection.':1},'kippax':{'call':1},'shade':{'of':2},'iron-mines':{'saturated':1},'encased':{'in':2},'plaice':{'and':2,'or':1},'indebted':{'climatic':1},'september':{'of':1,'1922':1,'29':2,'7':1},'developed':{'and':1,'on':1,'from':1,'for':1,'is':1,'except':1,'vocal':1,'.':3,'through':1,'collar-bone':1,'in':1,'along':1,'striped':1,'than':1,'more':1},'universals.':{'intelligent':1},'mission':{'of':4},'cross':{'upon':1,'x':1,'with':1,'was':1,'from':1},'gauged':{'from':1},'unfitting':{'that':1},'scientist':{'galileo':1,'is':1},'concentric':{'regions':1,'lines':1},'emphasized':{'by':1},'thirtieth':{'case':1,'forty':1},'variability--evolution':{'of':1},'style':{'.':2},'forwards':{'as':1,'for':1},'call':{'radio-activity':1,'magnetic':1,'mind':1,'life':2,'as':1,'electrons.':1,'our':2,'living':1,'gravitation':1,'them--or':1,'electro-magnetic':1,';':1,'into':2,'nebulae.':1,'neolithic':1,'himself':1,'them--which':1,'it':1,'helping':1,'them':1,'white.':1,'canals':1,'white':2,'a':2,'light':1,'ozone':1,'of':1,'the':4,'perceptual':1,'reason.':1},'susceptible':{'to':1},'fairbanks':{'ak':1},'example.':{'the':1},'obscure--sometimes':{'environmental':1},'harmless':{'from':1,'snakes':1},'strange':{'animals':2,'animal':1,'amalgams':1,'nest':1,'rings':1,'state':1,'to':2,'as':1,'objects':1,'colouring':1,'lowly':1,'spectacle':1,'creations':1,'conditions':1},'combination-boxes':{'where':1},'non-plastic':{'efficiency':1},'partitions':{'se':1},'might':{'on':1,'be':17,'almost':1,'injure':1,'speak':1,'see':1,'therefore':1,'have':2,'take':2,'happen':1,'hasten':1,'think':1,'possess':1},'alter':{'the':2},'pre-human':{'ape-man':1,'ancestor':1,'ancestors':1,'pedigree':1},'return':{'and':2,'from':1,'later':1,'to':10,'as':1,'the':1,'or':2},'sucking':{'tongue':1},'alighting':{'only':1},'hunter':{'with':1},'chalones':{'which':1},'2.--the':{'milky':1},'communities':{'and':1},'hunted':{'out':1},'adventurous':{'and':1,'life-history':1,'experiment':1,'worms':1},'bigger':{'and':1,'than':2},'instructions':{'to':1},'subtler':{'demands':1},'intricacy':{'of':1},'bolts':{'and':1},'mastered':{'the':1,'so':1,'.':1},'man':{'all':1,'over':1,'discovered':1,'whose':3,'had':3,'except':1,'forms':1,'to':3,'has':9,'noticing':1,'coloured':1,'represents':1,'did':1,'found':1,'photographically':1,'works':1,'bone':1,'often':1,'past':1,'homo':2,'sec':1,'are':2,'thinks':1,'established':1,'plays':1,'stands':2,'since':1,'does':2,'got':1,';':2,'we':2,'sprang':1,'alone':2,'appears':1,'on':2,'would':1,'of':12,'could':1,'s':48,'or':4,'first':1,'appeared':1,'171':1,'asks':1,'.':18,'too':1,':':2,'was':4,'himself':2,'knows':1,'that':1,'exterminated':1,'took':1,'but':2,'to-day':1,'167':1,'with':3,'161':1,'he':1,'plants':1,'grew':1,'these':1,'type':1,'will':2,'values':1,'were':2,'and':22,'153':1,'type.':1,'157':1,'is':11,'it':1,'an':1,'reconstructed':1,'as':2,'lived':1,'have':1,'in':5,'saw':1,'occur':1,'perhaps':2,'interferes':1,'1':1,'how':1,'a-b.':1,'interfered':1,'pursues':1,'nearer':1,'may':1,'preceding':2,'who':3,'prepared':1,'73':1,'included':1,'man':1,'a':1,'off':2,'pithecanthropus':1,'m':1,'the':7,'possesses':1,'came':1},'inherent':{'biological':1},'difficult':{'chapter':1,'on':1,'word':1,'for':3,'of':1,'question':1,'theories':1,'environment':1,'to':14,'not':1,'situation':1,'speculation':1,'conditions':1,'than':1},'saturn.':{'the':1},'constructing':{'its':1},'weighs':{'1':1,'about':3,'nearly':1},'weight':{'for':1,'of':6,'is':1,'two':1,'.':1,'they':1,'than':1},'needless':{'to':2},'generation':{'and':1,'people':1,'of':1,'is':1,'after':1,'to':3,'that':1,'have':1,'in':1,';':1,'if':1},'female--first':{'one':1},'notochord':{'is':2,'.':2},'recapitulate':{'racial':1,'in':1},'culminating':{'with':2,'in':2},'scratching':{'swimming':1},'inflated':{'and':1,'balloon.':1},'croaking':{'of':2},'wondered':{'why':1,'idly':1,'at':1},'induces':{'a':1},'progressive;':{'everything':1},'health':{'and':1,'which':1,'.':1},'hill':{'cave':2,'in':1},'absorb':{'either':1},'celebes':{'lay':1},'induced':{'to':2},'caucasian':{'arose':1,'.':1},'regards':{'many':1,'their':1,'sight':1,'wave-lengths':1,'the':4,'its':2,'size':1},'note--that':{'of':1},'exertions':{'and':1,'running':1},'lesser':{'degree':1},'coco-palms':{'has':1},'rotifer':{'is':1},'monotony':{'.':1},'tassels':{'on':1},'fuller':{'embodiment':2,'well-being.':1},'teach':{'her':1},'colonised':{'by':1,'at':1},'generate':{'heat':1,'thousands':1},'lag':{'behind':1},'thrown':{'a':1,'on':2,'dust':1,'off':1,'upon':1},'preliminary':{'training':1,'scaffolding':1},'thread':{'of':1,'needles':1},'e.g':{'.':38},'decipiens':{'and':1},'77':{'photo':1,'reproduced':1},'light--we':{'have':1},'circuit':{'of':2,';':1,'generates':1,'.':1},'twenty':{'thousand':1,'million':2,'years':5,'hours':2,'to':1,'miles':1,'or':2},'lemurs':{'and':1,'there':1},'experimenter':{'or':1},'fallen':{'and':1,'sufficiently':1},'throws':{'light':1,'it':1},'solidly':{'frozen':1},'sperm-cell':{'and':1,'adapted':1,'with':1},'sheep-driving':{'competition':1},'limestone':{'canyon':2,'which':1},'feel':{'and':1,'sure':1,'for':1,'over-anxious':1,'quite':1,'dare':1},'radical':{'difficulty':1,'changes':1},'churning':{'water':1},'linking':{'generation':1,'of':1},'well-known':{'case':1,'elements':2,'that':1,'mudfish':1,'examples':1,'soft-shell':1,'carpo-metacarpus':1},'sympathy':{'which':2},'sailor':{'expressed':1},'brave':{'self-forgetful':1},'defects':{'such':1},'fees':{'to':1,'.':1,'or':1,'that':1},'says':{'and':1,'a':1,'no.':1,'do':1,'that':3,'professor':1,'meteorites':1,'sir':1,'can':1,'the':2,';':1},'vapour-like':{'matter':1},'whale':{'and':2,'what':1,'showing':1,'there':1,'reaches':1,'.':1,'rushes':1,'the':1,'has':1,'118':1,'is':1,'must':1},'earthworms':{'and':1,'which':1,'centipedes':1,'many':1,'began':2,'have':1,'in':1},'fossil-bearing':{'rocks':1},'passes':{'a':1,'from':2,'into':1,'to':1,'near':1,'through':4,'directly':2,'between':1,'along':2,'the':1,'out':1},'story':{'of':19,'is':1,'when':1,'.':1,'will':1,'simply':2,'in':2,'the':1,'has':1,'went':1},'birgus':{'latro':2,'which':1},'temperature':{'and':3,'is':1,'it':1,'reaches':1,'say':1,'at':2,'in':1,'would':2,'seems':1,'.':7,'which':1,';':1,'was':1,'day':1,'then':1,'we':1,'falls':1,'rises':1,'than':1,'must':1,'of':10,'could':1,'allows':1,'will':1,'the':2},'redistributing':{'project':1,'or':1},'kin.':{'the':1},'leading':{'to':3,'peculiarities':1,'from':1,'authority':1},'coasts':{'but':1},'brisker':{'flow':1},'hangs':{'over':1},'swarm':{'of':3,'sometimes':1,'like':1,'has':1},'storm':{'note':1,'petrel':4,'effects':1,'they':1},'pitted':{'against':1},'soddy.':{'it':1},'aristocracy':{'and':1},'store':{'of':3,'the':1},'fire-mists':{'such':1,'would':1},'imperfect':{'core':2,';':1,'telescope':1,'the':1},'fish-lizards':{'and':1},'pump':{'.':1},'information:':{'dr':1},'convinces':{'us':1},'tugs':{'at':1},'sea-scorpions':{'belonged':1},'treasures':{'behind':1},'rifle':{'and':1,'bullet':3,'.':1},'convinced':{'of':1,'that':2},'explodes':{'without':1},'king':{'of':1},'kind':{'and':2,'we':2,'enable':1,'from':2,'whereas':1,'that':2,'of':34,'taking':1,'express':1,'upon':1,'.':2,'will':1,'set':1,'in':3,';':2,'throughout':1,'or':1,'present':1},'earth--as':{'a':1},'wonder-world':{'of':2},'double':{'this':1,'streaming':1,'blowhole':1,'fold':1,'that':1},'instruction':{'and':1},'indifferent.':{'they':1},'dispensed':{'with':1},'risks':{'and':2,'to':1,'are':1,'of':2},'coast.':{'illustration':1},'earth--an':{'electric':1},'tongues':{'of':2},'unrestricted.':{'animals':1},'7a':{'the':1},'outstanding':{'events':1},'greenwich':{'observatory':1},'disguise--other':{'kinds':1},'gale':{'bringing':1},'alike':{'of':1,'in':1},'cleaned':{'artificially':1},'shrews':{'tree-shrews':1},'cases--marvellous':{'apparatus':1},'cobras':{'brightly':1},'blowhole':{'or':1},'check':{'on':1,'the':2,'comes':1,'vegetation.':1},'interferes':{'is':1},'cropped':{'up':1},'port':{'knows':1,'in':1},'middlemen':{'is':1},'moist':{'winds':1,'and':1,'climate':2,'internal':1,'air':1},'finding':{'their':1},'interfered':{'but':1},'added':{'a':2,'to':4,'up':1},'electric':{'current':15,'power':2,'bells.':1,'bell':1,'charges':2,'shock':1,'phenomena':1,'charge':3,'magnet':1,'tram':1,'terminals':1,'dynamo.':1,'circuit':1,'trams':1,'discharge':6,'spark':8,'furnace':1},'bands':{'it':1,'140':1},'intervened':{'the':1},'instance.':{'organic':1},'measures':{'of':1,'about':1,'on':1,'the':1,'three':1},'reach':{'a':2,'and':1,'about':1,'us.':1,'us':1,'.':1,'their':1,'only':1,'but':2,'the':7,'upward':1,'out':1},'react':{'effectively':1,'on':1},'cigarette':{'and':1},'attempt':{'to':2,'at':1,'too':1},'74':{'diagram':1},'73':{'okapi':1},'72':{'photo':2,'earthworm':1,'reproduced':1},'enduring':{'satisfaction':1},'nothing':{'happens':1,'appeals':1,'like':1,'solid':1,'of':1,'had':1,'but':3,'.':6,'better':1,'more':1,'at':1,'which':1,'in':2,'colder':1,';':1,'out':2,'was':1,'gives':1},'measured':{'and':2,'cube':1,'in':2,'drop':1,'only':1,'fall':1,'the':2,'by':1,'movements':1},'achievement':{'and':1,'is':1},'constitution':{'of':10,'could':1,'which':1,'.':1},'equatorial':{'regions':1,'forests':1},'22.--a':{'nebular':1},'mineral':{'particles':1},'coincides':{'with':1},'chemical':{'reaction':3,'processes':3,'elements':3,'energy':2,'substances':1,'science':1,'screen':3,'conditions.':1,'messengers':6,'element':2,'leave':1,'transformation--the':1,'analysis':1,'routine':1,'action':1,'.':1,'changes':1,'compounds':1,'element.':1,'level':2},'zealand.':{'some':1},'amphibian':{'foot-print--an':1,'mind':1,'race':1,'in':1},'wood-snails':{'but':1},'notch':{'next':1},'artemia':{'salina':1},'institutions':{'.':1,'were':1},'lying':{'on':2,'head':1,'inert':1,'over':1,'upon':1,'beside':1,'low':3},'stones':{'and':3,'on':1,'from':1,'of':2,'.':1,'so':1,'in':1,'probably':1,';':1,'where':1,'or':1},'copy':{'and':1,'a':1,'of':2,'is':1,'upon':1,'it':2,'or':1,'in':1,'display':1,'if':1},'journeys':{'undertaken':1,'.':1},'pennies':{'and':1,'from':1},'wayside':{'.':1},'to-day.':{'as':1,'illustration':1,'an':1},'shares':{'with':1},'gilded':{'boxes':1},'securing':{'a':1,'change-provoking':1,'the':2},'mudfish':{'may':1,'of':1,'is':1,'or':1},'fishes--the':{'mind':1},'moulting':{'immature':1},'grotesque':{'delusions':1},'betray':{'themselves':1},'hip':{'joint':1},'birnam':{'when':1},'hit':{'a':1,'and':1,'upon':1,'by':1},'gains':{'of':2,'that':1},'assumed':{'on':1},'furnaces':{'as':1,'with':1},'whistle':{'is':1},'explosively':{'from':1},'longest':{'for':1,'of':1,'feathers':1,'are':1,'waves':2,'or':1,'pinions':1},'instinctive':{'aptitudes':5,'activities':1,'repertory.':1,'capacities.':1,'rather':1,'capacities':5,'due':1,'actions':1,'element':1,'behaviour':10,'obligations':1,'registration.':1,'ants':1,'capacities--limited':1,'routine':2,'capacity':2,';':1,'.':1,'awareness':1,'behaviour.':1},'shreds.':{'whenever':1},'stone.':{'and':1,'nearly':1},'eye-piece':{'magnifies':1,'.':1,'its':1,'at':1},'expositor':{'.':1},'thereabouts':{'.':1},'nibbles':{'at':1},'arges':{'that':1},'investigate':{'the':1},'ninety-two':{'elements--we':1,'.':1},'activity':{'and':1,'we':1,'which':1,'for':2,'almost':1,'heretofore':1,'is':1,'in':2,'s':2,'.':3,'also':1,'as':2,'besides':1,'of':3,'known':1,';':1,'where':1},'rischgitz':{'collection.':6},'engraved':{'on':2},'nibbled':{'away':1},'bars':{'of':1,'have':1,'which':1},'art':{'of':1,'expressing':1,'in':1},'achieved':{'.':2},'intelligence':{'and':9,'on':1,'--the':1,'deteriorates':1,'cooperated':1,'of':2,'is':2,'when':1,'what':1,'.':7,'will':1,'to':3,'increases':1,'are':1,'a':1,'in':3,'seen':1,'the':2,'--a':1,';':2,'co-operating':1},'arc':{'in':2},'bare':{'head':1},'are':{'limited':1,'all':9,'scooped':1,'caused':1,'landlocked':1,'commoner':1,'illustrated':3,'particularly':3,'poorly':1,'particles':2,'certainly':1,'concerned':3,'to':9,'preserved':1,'under':1,'worth':1,'activities':1,'comparatively':1,'seized':1,'returned':1,'sitting':1,'very':25,'trillions':1,'foul':1,'vastly':1,'vast':2,'dim':1,'clouds':1,'large':2,'quick':3,'smaller':1,'specially':1,'dealing':1,'likely':1,'further':1,'estimated':1,'giving':1,'hereditary':2,'fossil':1,'ever':1,'led':1,'loose':1,'here':3,'hundreds':5,'met':1,'others':1,'persecuted':1,'strong':3,'observing':1,'great':2,'thirty':1,'vibrating':1,'descended':5,'usually':4,'conveniently':1,'composed':2,'mimicked':1,'suddenly':1,'merely':5,'explained':1,'marked':2,'highly':1,'brought':1,'visible':2,'hard-and-fast':1,'from':1,'recalling':1,'two':11,'few':1,'wonderfully':1,'therefore':2,'taken':1,'themselves':1,'phosphorescent--they':1,'more':13,'separated':1,'staggering':1,'tested':1,'ignorant':2,'known':7,'mounted':2,'none':1,'vicissitudes':1,'excessively':1,'exceptions':2,'pent-up':1,'bent':1,'indicated':1,'oviparous':1,'tax':1,'allowed':1,'huge':1,'rather':1,'divided':1,'breaking':2,'entangled':3,'1':2,'located':2,'ordinary':1,'substances--':1,'tried':1,'undergoing':2,'inconceivably':1,'burrowing':1,'different':2,'waves':3,'such':5,'a':13,'free-swimming':1,'chiefly':2,'four':2,'crowded':1,'light':1,'so':13,'pulled':1,'minded':1,'over':1,'mainly':1,'produced':1,'held':1,'still':5,'its':2,'26':1,'interesting':1,'masses':1,'actually':2,'strange':1,'microscopic':1,'spoiling':1,'covered':1,'receptacles':1,'secondary':1,'split':1,'good':1,'locusts':1,'safe':1,'they':3,'not':35,'sorted':1,'now':11,'killed':1,'well-known':1,'always':2,'sufficiently':1,'each':1,'found':3,'entirely':1,'traces':1,'lifted':1,'doing':2,'sifted':5,'transmissible.':1,'borne':3,'living':1,'shown':2,'fundamentally':1,'content':1,'laid':2,'7':1,'induced':1,'red':1,'attended':1,'quite':4,'small':1,'put':1,'beginning':2,'cremated':1,'exhibited':1,'constantly':1,'adepts':1,'greatest.':1,'instances':1,'spots':2,'directly':1,'immensely':1,'mercury':1,'little':1,'ancient':2,'similarly':1,'unknown':1,'plastic':1,'their':3,'cooling':1,'2':1,'too':1,'wrapped':1,'legally':1,'white':1,'witnessing':1,'mostly':4,'that':1,'exactly':1,'predictable':1,'convinced':1,'peculiar':1,'double':1,'enabled':1,'extraordinarily':2,'matter':1,'determined':1,'supposed':1,'treated':1,'encumbered':1,'variable':1,'close':2,'seen':4,'clearly':2,'relatively':2,'built':3,'thoroughly':3,'speculative':1,'able':8,'also':11,'edge':1,'absorbed':1,'presently.':1,'most':1,'eight':1,'printed':1,'drought':1,'incursions':1,'extremely':1,'nutritive':1,'manifested':1,'especially':1,'considered':1,'clear':1,'sometimes':1,'repeated':1,'face':1,'short-lived':1,'points':2,'left':4,'normally':1,'molluscs':1,'shot':1,'sceptical':1,'supported':1,'scattered':1,'right-handed':1,'rotating':1,'unsurpassed.':1,'giant':1,'highest':1,'distributed':2,'outside':1,'buttons':2,'being':2,'only':5,'going':1,'employed':1,'thousands':1,'meant':1,'exceptional':1,'dependent':1,'closely':1,'altogether':1,'instinctive':1,'areas':1,'playful':1,'sheltered':1,'common':1,'rung':1,'doubles':1,'approaching':1,'set':2,'acquired':1,'observed':1,'sporadic':1,'luminous':1,'subject':1,'said':2,'prominent.':1,'circulating':1,'continually':5,'jewels.':1,'luminescent':1,'unable':1,'various':2,'markedly':1,'probably':3,'prodigally':1,'numerous':3,'we':4,'gratefully':1,'invisible':3,'precious':1,'favourable':1,'many':16,'taking':1,'equal':1,'present':2,'tree-toads':1,'adapted':3,'among':1,'hollow':1,'learning':1,'deflected':1,'ether':1,'startling':1,'there.':1,'capable':1,'tremendous':1,'due':1,'.':3,'attaching':1,'immense':3,'much':4,'slowly':1,'likewise':1,'repelled':1,'painted':1,'suns.':1,'worked':1,'those':3,'stolen':1,'these':3,'awakened':1,'seven':1,'almost':2,'violently':2,'obtrusive':1,'obeying':1,'tell-tale':1,'in':26,'ready':1,'confirmed':1,'perpetually':1,'stimulated':1,'parts':1,'arguments':1,'mixtures':1,'played--for':1,'used':3,'temporary':1,'arctic':1,'constantly--either':1,'moving':1,'kept':2,'paralysed':1,'well':2,'without':2,'the':43,'charged':1,'just':4,'less':1,'increasingly':1,'offensive':1,'mistaken':1,'reincarnated':1,'human':1,'alternative':1,'revealed.':1,'corroborated':1,'thinking':1,'agile':1,'spread':1,'exempt':1,'resolved':1,'easily':1,'dark':1,'apt':4,'long-haired':1,'accepted':1,'redistributing':1,'ruled':1,'like':4,'complicated.':1,'shed':1,'right':1,'often':16,'some':9,'neutralised':1,'amongst':3,'born':3,'universes':1,'provided':1,'gradually':1,'dense':1,'asking':1,'pre-eminent':1,'palatable':1,'slight':1,'manufactured':1,'broken':1,'on':6,'about':6,'cautious':1,'carried':3,'getting':1,'of':7,'discussed':1,'greatly':2,'connected':1,'hatched':4,'flying':2,'attached.':1,'billions':1,'three':3,'authorities':1,'mere':1,'impressed':1,'strictly':1,'there':3,'disposed':1,'long':3,'stars':3,'deposited':1,'naturally':1,'lowest':1,'complete':2,'deaf':1,'but':3,'somehow':1,'curiously':1,'removed':2,'considerable':1,'directed':1,'made':5,'arranged':2,'characteristic':1,'placed':1,'called':11,'storing':1,'vehicles':1,'affectionate':1,'certain':1,'slowing':1,'general':1,'as':8,'definite':1,'at':7,'floating':2,'no':7,'generally':1,'other':8,'blackish-grey':1,'really':3,'separate':1,'suited':1,'included':1,'--a':1,'reflectors':1,'longer':2,'practically':3,'required':1,'utilised':1,'beds':1,'far':4,'undoubted':1,'restored':1},'walking-stick':{'insects':1},'chambers':{'perforating':1},'bark':{'and':1,'of':1},'arm':{'and':1,'spawn':1,'of':2,'is':1,'stretching':1,'.':1,'skips':1,';':1},'declined':{'and':1},'crunching':{'insects.':1},'youth':{'to':1,'from':1},'learns':{'a':1,'the':1},'discovered--pulling':{'and':1},'distinctive':{'features':1,'colour':1,'spectrum':3,'arrangement':1,'peculiarities':1,'fauna':1,'is':1},'anatomists':{'have':1},'misjudge':{'our':1},'universe.':{'this':1,'but':1,'sec':1,'illustration':1,'in':1,'our':1,'are':1},'contrary':{'to':1,'has':1},'nestor':{'parrot':1},'numerous':{'and':1,'hard':1,'locations':1,'parachutists--':1,'attempts':1,'lobes':1,'prehensile':1,'ways':1,'separate':1,'young':1,'microscopic':1,'muscles':1,'kinds':1,'that':1,'hundreds':1,'gas-bubbles':1,'types':1,'ribs':1,'colour-varieties':1,'variations':1,'as':1,'mutually':1,'tubercles':1,'appendages':1},'hairs':{'may':1,'of':2,'and':1,';':1,'which':1},'vitality.':{'illustration':1},'1.f.2':{'.':1},'recently':{'named':1,'said':1,'that':1,'regarded':1,'shown':1,'been':1,'erected':1,'discovered':2,'as':1,'learned':1},'creating':{'derivative':2,'the':2},'1.f.3':{'a':1,'this':1,'the':1,'.':1},'sole':{'of':2,'which':1,'have':1,'are':1},'outfit':{'for':1},'days.':{'there':1,'sec':1},'succeed':{'not':1,'and':1,'in':3,'but':1,'.':1},'head.':{'compare':1,'illustration':1},'prelude':{'to':1},'inertia':{'of':1},'bronze':{'second':1,'was':1,'age':1},'c':{'a':1,'that':1,'of':1,'there':2,'but':1,'.':16,'thirdly':1,'3':2,'others':1,'any':1},'license':{'available':1,'and':1,'terms':1,'especially':1,'for':1,'please':1,'when':1,'.':2,'as':1,'included':2,'apply':1,'the':1,'must':1},'attainment':{'at':1},'sheaths':{'of':1},'distinctively':{'new':1,'north':1,'marine':1},'1.f.5':{'.':1},'roman':{'galley':1},'became':{'useful':1,'heated':1,'an':2,'as':1,'in':1,'extinct':2,'gradually':1,'unavailable':1,'for':1,'restricted':1,'extinct.':1,'much':1,'too':1,'easier':1,'more':2,'aware':1,'suited':1,'a':3,'longer':1,'equal':1,'enregistered':1,'the':4,'essential':1},'cloud-like':{'effect.':1,'patches':1},'bond':{'of':1,'could':1},'finds':{'its':3},'peripatus':{'a':1,'83':1,'centipedes':1,'which':2},'sloth':{'s':1},'flies':{'to':2,'into':1,'at':1,'.':1},'flier':{'.':2},'distress':{'is':1},'reasons':{'and':1,'great':1,'have':1,'for':3,'is':1,'are':2,'which':1,'why':1},'sweet':{'sap':1,'odours':1},'sweep':{'of':1},'whelk':{'on':1,'the':1,'requires':1,';':1,'or':2},'regulated':{'then':1,'harmony':1,'by':1},'incandescent':{'may':1,'world-cloud':1,'atoms':1,'gas.':1},'fibres':{'come':1},'newbigin':{'m':1},'simpler':{'and':3,'elements':1,'animals.':1,'forms':2,'so':1,'fossil':1,'in':1,'still':1},'pr':{'are':1},'decline':{'europe':1,'of':1,'sometimes':1,'markedly':1},'there.':{'so':1,'it':1},'jugglery':{'with':1},'java':{'and':1,'ape':1,'ape-man':3,'at':1,'in':1,'man':2,'ape-man--an':2},'scented':{'with':1},'illumined':{'seaweed-growing':1,';':1,'green':1,'than':1,'surface':1},'pigmies':{'of':1},'dug':{'as':1},'whom':{'we':2,'you':1,'they':1},'reduction':{'of':3,'in':1},'pg':{'search':1},'--an':{'internal':1},'brick':{'you':1,'contains':1,'moves':1},'yolk-laden':{'portion':1},'attractive':{'phenomenon':1},'affectionate':{'and':1},'flight':{'and':1,'from':1,'also':1,'may':1,'brings':1,'is':2,'.':3,'brought':1,'most':1,'as':1,'so':1,'which':2,'of':3,'implies':1,'has':1,'was':1},'flints':{'with':1},'flinty':{'sponge':1,'needles':1,'skeleton':2},'precision':{'what':1},'defect':{'you':1,'in':2},'1864':{'by':1},'temperament':{'as':1},'1869':{'that':1},'1868':{'sir':1},'depends.':{'separate':1},'plants':{'and':24,'already':1,'begun':1,'is':1,'it':2,'at':1,'have':2,'in':3,'before':1,'stands':1,'for':1,'.':5,'to':3,';':2,'laboriously':1,'may':1,'upon':1,'but':2,'such':1,'with':1,'by':1,'flourished':1,'asexual':1,'can':1,'were':2,'the':4,'or':3,'are':2},'stolen':{'by':1},'conception':{'of':6,'the':1,'.':1,'to':1},'boast':{'with':1},'yellow-brown':{'the':1},'frozen':{'gas':1,'masses':1,'hard':2,'rigid':1},'compactness':{'of':1},'intercepts':{'great':1,'all':1},'64-6221541':{'.':1},'parents.':{'strangest':1},'lenard':{'and':1,'found':1},'dublin':{'high':1,'zoo':1},'obtrusive':{'rather':1},'obstacle':{'of':1,'race':1},'rid':{'of':3},'hare--with':{'human':1},'currents':{'within':1,'of':1,'there':1,'.':1,'needed':1,'at':1,'moisture':1},'peopled':{'than':1,'.':1},'away.':{'3':1,'it':1,'illustration':1},'chapter.':{'the':1},'twofold':{'process':1,'caution':1},'illustration:':{'the':1,'star':1},'lengths':{'.':2,'part':1,'which':1,'in':1},'muscle-cells':{';':1,'which':2,'.':1},'foretells':{'the':1},'undersides':{'of':1},'blood-relationship':{'with':1,'between':1},'stimulated':{'brain':1,'cells':1,'if':1,'by':2,'to':1},'dermis':{'and':1},'widely':{'separated':1,'distributed':1,'open':1},'peoples':{'with':1,';':1,'who':1,'to-day':1,'indeed':1},'9':{'a':1,'feet':1,'inches':1,'million':1,'looking':1,'000':1,'the':1,'saturn':1},'shirk':{'the':1},'yucca':{'moth':6,'flowers':2,'flower':3,'moths.':1},'higher':{'and':3,'vertebrates':2,'still':2,'reaches':2,'apes--gorilla':1,'pitch':1,'expressions':1,'education':1,'terrestrial':1,'forms':2,'apes':2,'power':1,'there':1,'note':3,'animal':1,'life':1,'degree':1,'insects.':1,'mammals.':1,'standard':1,'adventures.':1,'controlling':1,'faculty':1,'flowering':1,'than':1,'land':1,'animals':4,'level':3,'turn':2,'centres':1,'mammal':1},'current.':{'each':1},'chequer':{'hen':1},'mountain':{'ranges':2,'hare':4,'torrents':1},'ultimate':{'particles':1,'object':1,'service':1,'atoms':1},'flows':{'as':1,'in':1},'brooding':{'on':1,'it':1},'moving':{'and':2,'speck':1,'through':1,'at':1,'rapidly':2,'hoofed':1,'her':1,'away':1,'.':1,'particles':2,'how':1,'parts':2,'body':1,'very':1,'amongst':2,'atoms':1,'water':1,'objects':2,'molecules.':1,'with':5,'on':2,'about':1,'mass':1,'toward':1,'round':1},'mistake.':{'we':1},'sagacious':{'indeed':1,'when':1},'birch':{'alder':1},'vertical;':{'the':1},'263':{'professor':1,'reproduced':1},'lower':{'and':1,'side.':1,'vertebrates':1,'surface':1,'one':1,'in':1,'female.':1,'photograph.':1,'miocene':1,'jaw':6,'vertebrate':1,'orders':2,'eocene':1,'picture':1,'ends':1,'mammals':1,'levels':1,'jaw.':1,'than':3,'types':1,'temperature':2,'photograph':1,'diagram.':1,'animals':1,'level':1,'part':1,'side':1},'people.':{'no':1},'dancing':{'mice':1,'mouse':1,'or':1},'chickens':{'that':1,'incubated':1,'in':1},'outflame':{'of':1},'analysis':{'of':1,'showing':1,'would':1},'magnified':{'to':2},'solids':{'.':1},'edge':{'on':1,'or':1,'of':5},'length.':{'now':1},'b.c':{'.':2},'beautiful.':{'in':1},'muscle-fibre':{'m.f.':1},'266':{'the':1},'pollen':{'to':1,'from':2,'.':1},'abilities':{'come':1},'endeavour':{'to':1,'after':3,'associated':1,'or':1,'.':1},'unseen':{'occupies':1,'earthworms':1,'.':1},'mimicked':{'butterflies':1,'.':2,'by':1,'for':1,'are':1},'mood.':{'certain':1},'pigeons':{'and':2,'to':1,'it':1,'were':1},'competitive':{'.':1},'reincarnated':{'in':1},'intervals':{';':1},'inachis':{'from':2},'questions':{'and':1,'besides':1,'that':1,'of':3,'introduce':1,'have':1,'with':1},'inter-relations--the':{'subject':1},'reliance':{'on':1},'continent':{'of':1,'when':1,'fixes':1,'from':1},'tamed':{'.':1},'ravine':{'near':1},'wedge-shaped':{'piece':1},'corroborated':{'or':1,'by':1},'extracted':{'from':1},'workers':{'fastened':1},'tentatives--new':{'departures':1},'ocean':{'and':1,'for':1,'of':4,'is':2,'it':1,'.':2,'s':1,'home':1},'exclusively':{'of':1},'exhibition':{'of':2},'inducing':{'strange':1},'finder':{';':1},'turtle-backs':{'is':1},'associations':{'and':1,'established':1,'of':1,'between':1,'.':1,'were':1,'such':1,'with':1},'up-stream.':{'sometimes':1},'balloon.':{'photos':1,'running':1},'sensatory':{'nerve-fibre':1},'entangled':{'and':2,'in':2,'together':1,'air':1},'earth--making':{'a':2},'modifications':{'are':1},'rotate':{'and':1,'on':3,'all':1,'at':1,'round':1},'line--are':{'represented':1},'neanderthaler':{'.':1},'confront':{'us':1},'incidental':{'damages':1},'separately':{'is':1,'.':1},'collect':{'pennies':1,'half':1},'arthur':{'the':1,'thomson':5,'keith':7,'thomson.':1,'antiquity':1},'retires':{'to':1},'under-water':{'world':1},'foot--an':{'obvious':1},'table.':{'illustration':1},'essential':{'features':2,'similarity':2,'that':1,'vertebrate':1,'to':2,'oneness':1,'part':3,'independence':1,'in':1,'bones':1,'construction':1,'difference':1,'correlation':1,'identity':1},'engravings':{';':1},'hinted':{'at':2},'feet--the':{'largest':1},'men--races':{'of':1},'eluding':{'the':1},'streaming':{'motion':1,'from':2},'newsletter':{'to':1},'hjort':{'dr':1},'saucer':{'or':1},'aptitudes':{'many':1,'what':1,'which':1,'inborn':1,'then':1},'stately':{'and':1},'gradually':{'division':1,'slow':1,'from':1,'radiating':1,'out':1,'turned':1,'as':1,'reduced':1,'cooling':1,'settle':1,'eliminate':1,'evolved':2,'curved':1,'become':1,'increasing':1,'adapted':1,'regrown':1,'realised':1},'bushy-tailed':{'almost':1},'tends':{'to':6},'prof':{'.':7},'fragments':{'a':1,'and':1,'broken':1,'doubled':1,'of':2},'pieces--a':{'kind':1},'jumps':{'along':1,'from':1},'weir':{'confessed':1},'refused':{'to':1,';':1},'race--there':{'is':1},'intense':{'white':1,'disturbance':1,'competition':1,'activity':1},'vivid':{'idea':1},'cautious':{'and':1,'for':1},'mingled':{'with':4,'together':1},'age.':{'photograph':1,'sand-pit':1,'some':1,'as':1,'cenozoic':1,'they':1,'the':1},'row':{'of':1},'tortuous':{'path':1},'firing':{'the':1},'deepish':{'water':1},'forbears':{'long':1},'penetration':{'implies':1,'.':1},'lifeless':{'world.':1},'range':{'of':7,'became':1,'in':2},'wonders':{'of':4,'that':1},'fluttering':{'.':1},'gamma':{'rays':4},'naturalists':{'who':2,'have':1},'feed':{'and':1,'on':5,'for':1,'there':1,'some':1,'at':2,'in':1},'enregistration':{'of':1},'moss':{'and':1,';':1,'by':1},'conquest':{'of':8,'implied':1,'both':1},'attached.':{'methods':1},'flagellates':{'in':1},'canal':{'in':1,'system':1,'round':1},'impressed':{'on':1,'with':1,'by':1},'acquiesce':{'as':1,'in':1},'extremely':{'rapid':1,'interesting':1,'alert':1,'rarified':1,'delicate':1,'conservative':1,'fine':1,'thin':1},'question':{'and':2,'what':1,'rises':1,'to-day':1,'that':1,'whether':2,'of':3,'is':4,'had':1,'but':1,'to':2,'as':1,'which':1,'in':2,':':2,'than':1,'must':1},'cocoon--the':{'bag':1},'cuticle':{'or':1},'enregister':{'outside':1,'ready-made':1,'or':1},'conceivable':{'ages':1},'mimicry':{'and':2,'is':1,'serves':1,'.':1,'in':1,'called':1},'sections':{'of':1,'3':1,'.':1},'files':{'of':1,'containing':1},'mountains':{'and':1,'on':1,'like':1,'of':3,'.':1,'to':1,'are':2,'the':1},'potassium':{'pill':1},'glamour':{'of':1},'cloth':{'if':1,'packets':1,'in':1},'began--a':{'small':1},'energy--traceable':{'back':1},'crane':{'and':1,'the':1},'ring-armour.':{'illustration':1},'raising':{'the':1},'penguin':{'notice':1,'213':1},'section.':{'influence':1},'nonplussed':{';':1},'consist':{'of':1,'themselves':1,'in':1},'characteristic':{'style':1,'set':1,'fossils':2,'pelagic':2,'of':4,'endeavour':1,'.':1,'contingencies--the':1,'sharp':1,'self-preservative':1,'bird':1,'population':1},'seize':{'the':1},'117':{'photo':1,'ten-armed':1},'stalking':{'about':1,'we':1,'carnivore':1},'homo':{'neanderthalensis':1,'sapiens':1,'heidelbergensis':1},'redistribution.':{'start':1},'etc.':{'are':1,'gives':1},'called':{'protists':1,'appropriately':1,'luidia':1,'nototrema':1,'negative.':1,'spring':1,'is':1,'labyrinthodonts':1,'chalones':1,'differentiation':1,'salps':1,'planets':1,'protozoa.':1,'obelia':2,'pontobdella':1,'helium':1,'zostera':1,'triticum':1,'viviparity':1,'peter':1,'informal':1,'positive':1,'educability.':1,'muellerian':1,'spiral':1,'peripatus':2,'aerial.':1,'their':1,'without':1,'pretty':1,'hormones':1,'lycosa':1,'energy':1,'red':1,'kelts':1,'we':1,'which':1,'convergences':1,'zoological':1,'glands':1,'the':23,'upon':1,'guanin':1,'learning':1,'phagocytes':1,'them':1,'amniota':1,'convergence':1,'batesian':1,'commensalism':1,'venus':1,'momentous':1,'a':5,'deeps':1,'into':1,'sun-spots':1,'chauliodus':1,'round':1,'cryptozoic':1,'physiological':1,'tropisms':2,'have':1,'were':1,'self-mutilation':1,'primitive':1,'cells':1,'experimental':1,'jasper':1},'x-ray':{'photograph':6,'spectra':1},'individuality':{':':1,'with':1},'freak':{'is':1},'sepia':{'from':2},'breast.':{'the':1},'problem.':{'1.f.4':1},'warning':{'colours':2,'note':1,'coloration':1},'reservoirs':{'of':1,'to':1},'trammels':{'of':1},'whirligig':{'beetle':2},'adams':{'10':1,'who':1},'knowledge.':{'astronomical':1},'rainbow':{'is':1,'.':1,'where':1,'in':1},'riot':{'in':1},'reason.':{'the':1,'sec':1,'what':1,'here':1},'tentative':{'men':3,'branches':1,'or':1,'experimental':1},'weight.':{'4':1},'endurance':{'patience':1},'peace':{'while':1,'or':1},'c.:':{'that':1},'reappearance':{'of':1},'club':{'can':1},'opalina':{'which':1},'income':{'.':2},'ferment':{'from':1},'intercrossing':{'or':1,'between':1},'generates':{'heat':2,'sufficient':1,'in':1},'backbone':{'and':1,'a':1,'of':1,'.':1,'which':1,'in':3,';':1},'problems':{'on':1,'that':1,'of':1,'but':1,'.':2,'which':1},'thirty-two':{'miles':1},'helping':{'to':1,'the':1},'develops':{'very':1,'into':1},'allowing':{'the':1,'elbow-room':1,'more':1},'-200':{'deg':1},'folds':{'its':1},'inventions':{'are':1},'vaseline':{'bottle':1},'fluorescence':{'on':1},'fan-like':{'cluster':1},'path.':{'there':1},'liquefy':{'air':1},'accumulations':{'of':1},'departments':{'of':1},'back.':{'the':1},'departs':{'209':1,'in':1},'appearance--an':{'epoch-making':1},'weights':{'or':1,'.':1},'well-being.':{'we':1},'hooky':{'surfaces':1,'that':1},'vue':{'gardens':1},'resistance':{'to':1,'.':1},'distributed:':{'this':1},'protuberant':{'the':1},'winds':{'rise':1,'from':1,'two':1},'open-minded.':{'the':1},'adjustment':{'to':1,'of':1},'contributions':{'and':1,'to':1,'from':3,'are':1},'magnifying':{'lens':1,'lens.':1},'tide-marks':{';':1},'copernicus':{'lower':1},'simon':{'newcomb':1},'e-mail':{'within':1},'disposal':{'however':1},'sparrow':{'to':1,'rise':1,'up':1},'deal.':{'the':1},'cradle':{'of':7,'whereas':1,'.':1,'in':1,'or':1,'is':1},'stable':{'kind':1,'lines':1,'crust':1,'.':1,'result':1,'curved':1,'stock':1,'equilibrium':1},'breach':{'of':2},'include':{'a':1,'all':1,'whales':1,'many':2,'one':1,'those':2,'the':2,'mediterraneans':1},'breathing':{'dry':1,'of':1,'by':2,'which':1,'movements':2},'wished':{'to':1},'wind.':{'in':1},'club-moss':{'forests':3},'talons':{'and':1},'alder':{'and':1},'sensation':{'of':4},'electron':{'and':3,'sir':1,'has':1,'theory':3,'theory--the':1,'is':4,'current':3,'when':1,'as':1,'.':2,'rotating':1,'to':2,'pump':1,'physicists':1,'in':1,';':1,':':1,'was':1,'merely':1,'sticks':1},'graphic':{'illustration':1},'dando':{'baby':1},'bounding':{'about':1},'posture':{'with':1},'redistribute':{'this':1},'ideas--the':{'living':1},'self-effacement':{'is':1,'often':1,'but':1},'fur':{'and':1,'of':2,'or':1},'notes':{'with':1},'phenomena.':{'sec':1},'agency.':{'yellow-crowned':1,'chimpanzee':1,'orang-utan':1,'penguins':1,'in':1,'baby':2},'deals':{'with':1,'.':1},'glaciations':{'and':1},'warranties':{'of':2,'or':1},'poisonous':{'snake':2,'species':1},'phoenix':{'electric':1},'moulding':{'effect':1},'blood-fluid':{'or':1},'noted':{'for':1,'that':4},'assemblage':{'of':2},'disclaimer':{'of':1,'or':2},'smaller':{'even':1,'and':1,'telescope':2,'cheek-bones':1,'constituents':1,'less':1,'.':1,'particles':2,'will':1,'electrons':1,'have':1,'globes':1,'magellanic':1,'particles.':1,'than':8},'gripping':{'grappling':1,'the':1,'them':1,'teeth':1},'possum.':{'the':1},'tides--another':{'instance':1},'coldrum':{'in':1},'euphrates':{'.':1},'chauliodus':{'a':1},'fold':{'of':3},'sea-anemones':{'and':1,'147':1,'we':1,'which':1,'on':2,'mask':1,'hermit-crabs':1,'they':1},'unsurpassed.':{'to':1},'protrude':{'greatly':1},'sifting-out':{'process':1},'fermenting':{'vegetation':1},'makers':{'of':1},'folk':{'or':1,'place':2,'two':1,'human':1,'in':1},'unavailable':{'the':1,'.':3,'heat':1,'energy':1,'having':1},'disentangle':{'these':1},'waiting':{'for':1},'chose':{'a':1,'compartment':2},'desires':{'.':1},'kangaroo':{'while':1,'carrying':2},'underwood':{'underwood.':2},'youngest':{'and':1,'.':1},'desired':{'.':1},'grilse.':{'in':1},'separation':{'of':2},'frilled':{'lizard':3,'lips':2},'fifteen-spined':{'stickleback':1},'--carrying':{'with':1},'fruit-eating':{'and':1},'little-brained':{'ants':1},'settling':{'on':1},'evolution--the':{'establishment':1},'survivor':{'of':1},'convolutions.':{'illustration':1},'mauer':{'near':2,'at':1},'ones.':{'various':1},'leaving':{'a':1,'no':2,'perhaps':1,'only':1,'the':2,'its':1},'suggests':{'the':3,'that':2,'motions':1,'.':1},'patagium':{'and':1,'is':1},'oar':{'reduces':1},'breeds':{'of':2,'it':1,'that':1},'hue':{'and':1,'is':1},'pent-up':{'reservoirs':1},'apple':{'.':1},'spy':{'in':1},'egypt':{'and':1,'crete':1,'the':1},'earth-moon':{'system.':1},'facilitating':{'their':1},'apt':{'to':9},'expect':{'great':1,'that':1,'very':1,'there':1,'it':1,'to':2,'much':1},'marmosets':{'and':2},'motor':{'nerve-fibre':2,'nerve-cell.':1,'nerve-cell':1,'nerve-fibres':1,'nerve-cells':2,'answer':1},'newby':{'chief':1},'apply':{'to':1},'repopulation':{'of':1},'segregating':{'their':1},'use':{'and':3,'some':1,'it':1,'at':1,'in':1,'its':1,'for':2,'to':3,'there':1,'when':1,'.':2,'their':2,'has':1,'was':1,'them':1,'unless':1,'very':1,'but':1,'part':1,'a':3,'this':3,'of':14,'carbonic':1,'the':5,'seaweed':1},'fee':{'of':1,'is':1,'as':1,'for':3,'or':2},'from':{'all':3,'being':7,'tip':2,'worms':3,'ignoble':1,'facts':1,'japan':1,'inshore':1,'its':16,'roots':2,'mingling':1,'outer':1,'electricity':1,'masses':1,'behind':1,'forms':1,'to':1,'crest':4,'photographs':2,'donors':1,'them':2,'his':1,'branch':1,'10':2,'very':1,'freezing':1,'within.':1,'five':1,'trough':1,'now':1,'monkeys':1,'sowing':1,'benevolent':1,'hawaii':1,'these':4,'slipping':1,'each':9,'where':1,'side':6,'view':1,'people':1,'generation':2,'intelligence':2,'fish':2,'some':3,'direct':1,'dead':1,'gumboil':1,'year':1,'our':4,'dawn':1,'what':3,'colour-varieties':1,'sun':1,'nebula':1,'asia':1,'your':1,'particles':1,'outside':2,'expressing':1,'public':1,'red':1,'scientific':6,'insects':1,'men':1,'seaweeds':1,'water':5,'protection':1,'great':1,'struggle':1,'others':1,'simpler':1,'both':1,'about':2,'actual':1,'experience':1,'stone':1,'railway':1,'osborn':4,'pre-human':1,'first':2,'among':1,'simple':2,'within':4,'inland':1,'one':23,'pole':2,'learning':1,'ether':1,'cloud':1,'millions':1,'ancient':1,'her':1,'body-cells.':1,'remains':2,'pre-existing':1,'three':2,'sunlight':2,'.':1,'uniting':1,'behind.':1,'which':12,'white':1,'injury':1,'specimens':1,'radium':6,'500':1,'gill-breathing':1,'elsewhere':1,'that':2,'mammals':2,'malay':1,'heat':1,'part':1,'another.':1,'body-cells':1,'atom':4,'infusorians':1,'knife-blade-like':2,'those':1,'fossil':1,'sponge':1,'animals':2,'this':7,'tree':3,'us':3,'air':2,'below':1,'diagrams':1,'more':1,'and':1,'egypt':1,'mexico':2,'certain':1,'modern':1,'india':3,'it':2,'an':2,'states':1,'collision':1,'something':3,'any':6,'sir':1,'different':1,'ancestors':1,'end':1,'negatively-electrified':1,'scotland':1,'innumerable':1,'other':5,'5':2,'copying':1,'ordinary':1,'several':1,'enormous':1,'star':1,'glands':1,'time':3,'hand':1,'eight':1,'two':2,'nothing':1,'such':3,'types':1,'man':2,'a':37,'ingersoll':2,'land':2,'natural':1,'age':3,'their':7,'without':5,'knipe':6,'not-living':2,'every':1,'the':256,'europe.':1},'figure':{'of':1,'is':2,'one':1,'2':1,'ninety-two':1,'in':1,'.':1},'animals--by':{'insects':1},'frog':{'about':1,'showed':1,'discriminates':1,'flying':1,'had':1,'catches':1,'answers':1,'192':1,'1':1,'s':1,'rhacophorus':1,'which':1,'rhinoderma':1,'the':1,'mouth.':1,'merged':1,'lays':1},'few':{'and':1,'insects':1,'years':1,'feet':2,'spiders':1,'protozoa':1,'offspring':1,'lessons':1,'things':3,'ticks':1,'opportunities':1,'astronomers':3,'rivals':1,'other':1,'black':1,'weeks':1,'hundred':2,'minor':1,'inches':1,'that':1,'thousand':1,'days.':1,'records':1,'representative':1,'yards':1,'cases':3,'now':1,'extremely':1,'conspicuous':1,'pounds':1,'of':3,'months':1,'days':4,'cases.':1,'corners':1,'exceptions':1,'minutes':1,'embryonic':1,'illustrations.':1},'apprenticeship--tentative':{'men--primitive':1},'gales':{'will':1},'diving-bell':{'to':1,'full':1},'eagles':{'gather':1},'possession':{'of':2},'grandest':{'and':1,'pictures':1,'as':1},'secretions':{'of':1},'humanly':{'impossible':1},'inclined':{'to':1,'pillar':1,'plane':6,'plane.':1},'rarest':{'type':1},'impress':{'him':1},'steadfastly':{'serving':1},'eagles.':{'similarly':1},'hilger':{'ltd.':2},'rabbit':{'and':1,'squirrel':1,'for':1,'when':1,'.':1,'which':1,'the':1},'scale.':{'sec':1,'if':1},'development--that':{'there':1},'women':{'show':1},'fro.':{'this':1},'us.':{'this':1,'the':1,'races':1,'sec':1},'getting':{'a':1,'on':4,'what':1,'thinner':1,'hotter':1,'into':3,'air':1,'possession':1,'farther':1,'wet':1,'rid':1,'out':1,'away':1,'transport':1,'at':1},'ice.':{'seeing':1},'overlappings':{'.':1},'anywhere':{'at':2,'else':1},'perched':{'on':1},'field--which':{'he':1},'three-chambered.':{'the':1},'dissolve':{'a':1,'the':1},'proof':{'of':12,'that':2},'have--there':{'is':1},'non-growing':{'non-moulting':1},'habitats':{'which':1},'proprietary':{'form':1},'mud-fish':{'protopterus':2},'thirsty':{'and':1},'calculation':{'suggests':1,'as':1,'ought':1},'inaccessible':{'to':1},'tax':{'returns':1,'deductible':1,'identification':1,'treatment':1,'exempt':2},'land-snails':{'representing':1,'for':1},'something':{'associated':1,'less':1,'is':1,'as':1,'beyond':1,'to':1,'which':1,'new':2,'has':1,'more':1,'corresponding':2,'that':3,'very':3,'new--a':1,'but':1,'else':1,'with':1,'simpler':1,'about':1,'like':6,'of':2,'could':1,'the':1},'serial':{'issue':1},'made':{'and':3,'among':1,'polished':1,'rudely':1,'it':5,'an':2,'visible':3,'incandescent':1,'in':6,'luminous':1,'their':1,'out':1,'perfect':1,'bridges':1,'till':1,'of.':1,'.':6,'1':1,'to':7,'pets':1,'man.':1,'lays':2,'do':1,'malaria':1,'that':2,'of':5,'possible':1,'but':1,'forbidding':1,'during':1,'with':1,'by':8,'a':5,'on':1,'great':1,'many':1,'clear':1,'no':1,'up':3,'large':1,'points':1,'so':2,'artificially':1,'january':2,'stone':1,'the':5,'more':1,'at':1},'sir':{'e.':1,'norman':3,'richard':1,'wm':1,'j':7,'william':8,'g':1,'arthur':7,'oliver':3,'w':3,'harry':1,'isaac':5,'ernest':6,'john':3,'george':1,'ray':4},'galls':{'on':1},'counting':{'the':1,'electrons':2},'decaying':{'vegetation--an':1,'leaves':1},'sit':{'on':1},'distinguishable':{'from':1},'justifiable':{'to':2},'past.':{'on':1,'one':1},'struggles':{'there':1,'upward':1},'moods':{'.':1},'fortunate':{'for':1},'brian':{'janes':2},'instead':{'of':8,'strong':1},'struggled':{'.':1},'substances--':{'phosphorescent':1},'tension':{'passes':1,'is':1,'grows':1},'cupboard':{'and':1},'attend':{'the':1,'too':1},'yolk-sac':{'y.s.':1},'slipher':{'of':1},'immersed':{'in':3},'masks':{'the':1},'tack':{'of':2,'however':1},'wrist':{';':1,'which':1},'understanded':{'of':1},'1887':{'michelson':1},'1885':{'another':1},'agglomerations':{'of':1},'superstitions':{'have':1},'are--measuring':{'them':1},'clauses.':{'experimentation':1},'inheritance':{'that':1,'of':1,'.':1,'which':2,'the':1,';':1},'interrupted':{'light':1},'polystomella':{'showing':2},'fortunately':{'fast':1},'ovipositor':{'inside':1},'locomotor':{'agility':1,'triumph':1,'activity':1},'summer.':{'there':1},'irregularity':{'in':1},'preparing':{'our':1,'the':2},'affection.':{'the':1},'spreads':{'sleeping':1,'out':1},'saturated':{'southwards':1},'farming':{'or':1},'minnow':{'and':1,'to':1,'could':1},'mentioned.':{'this':1,'illustration':1},'reptile':{'and':1,'from':1,'breathes':1,'but':1,'total':1,'95':1,'94':1,'at':1},'interpreted':{'to':1,'as':1},'whilst':{'its':1,'an':1},'mathematicians':{'upon':1},'130':{'000':1,'steps':1},'idiosyncrasies':{'crop':1,'.':1},'looks':{'a':1,'like':3,'less':1,'almost':1,'big':1,'after':1,'extraordinarily':1,'.':1,'as':4},'135':{'animal':1},'abstruse':{'speculations':1},'interpreter':{'.':1},'139':{'photo':1},'138':{'the':1,'protective':1},'ease.':{'more':1},'self-fertilisation':{'because':1},'primordial':{'substance':2},'choose':{'to':1},'orange':{'screen':1,'yellow':2},'clusters':{'of':1,'at':1},'receptacles':{'or':1},'forty-five':{'seconds':1,'degrees':1},'crowds':{'of':3},'refracting':{'telescope':3},'originator':{'of':2},'bumbling':{'bittern':1},'forty-one':{'years':1},'orthodox':{'head-on':1},'practice':{'however':1,'or':1},'flew':{'away':1,'round':1,'22':1},'impressing':{'other':1,'itself':1},'emerald':{'hue.':1},'satellites':{'of':3,'miles':1,'like':1},'attaining':{'a':1,'to':1,'various':1,'that':1},'successor':{'rather':1},'viscid':{'threads':2},'articles':{'will':1,'with':1,'are':1},'crumb-of-bread':{'sponge':1},'sleeve':{'.':1},'movements.':{'this':1},'profound':{'idea':1,'abysses':1,'practical':1,'.':1,'calm':1,'moulding':1},'tram':{'or':1},'seashore.':{'illustration':1},'transmitted':{'through':2,'.':1},'trap':{'formed':1,'.':1},'cocoon':{'flies':1,'when':1},'bills':{'and':1,'up':1,'upwards':2},'erratic':{'quantities':1,'scattered':1,'paths':1},'foot-print--an':{'eloquent':1},'fitting':{'their':1},'old-established':{'creature':1},'related':{'to':11,'half-monkeys':1,'fish':1,'which':1},'whitish':{'spots':1},'remove':{'the':1},'82':{'peripatus':1},'83':{'photo':1,'photograph':1},'80':{'per':1},'86':{'photo':1,'an':1},'87':{'animals':1},'ebooks':{'and':1,'unless':1,'.':1,'are':1,'in':1,'with':1},'respects':{'a':2,'very':1,'like':1},'loquacious':{'bird.':1},'cerebral':{'hemispheres':1,'advances':1},'blood-channels':{'and':1},'flattening':{'of':1},'exporting':{'a':1},'20.--comet':{'october':1},'carpo-metacarpus':{'bone':1},'supports':{'them':1},'dive':{'far':1,'neither':1},'despairing':{'of':1},'fun':{'but':1},'zoological':{'gardens.':1,'races':1,'park':1,'haunt':1,'park.':10},'pours':{'out':2},'mussels.':{'the':1},'maintains':{'that':1},'promptly':{'discovered':1},'york':{'and':1,'zoological':10},'waves--light--what':{'the':1},'obliteration':{'.':1},'tenant':{'.':1},'support.':{'project':1},'age-old':{'mystery':1},'weaves':{'its':1},'organic':{'evolution':9,'evolution.':3,'matter':1,'nature':1,'particles':1,'evolution--there':1,'dust':1},'g':{'notice':1,'.':10,'in':1},'musculature':{'integumentary':1},'curlews':{'both':1},'behaviour.':{'a':2,'evolution':1,'illustration':1,'comparing':1,'sec':1,'in':1,'the':2},'chisel-edged':{'teeth':1},'hence':{'a':1,'fall':1,'it':1,'appendicitis':1,'in':1,'the':2,'if':1},'pterosaurs':{'none':1},'californian':{'coast.':1},'incipient':{'race':1,'species':1},'embryo':{'-reptile':1,'there':2,'no':1,'-mammal':1,'is':2,'within':1,'.':3,'while':1,'of':2,'the':1,'has':1,'with':1,'-fish':1,'shows':1},'plainly':{'this':1,'how':1,'that':1},'arcturus':{'43.4':1},'pycraft':{'w':1},'echo':{'of':1},'bonnet':{'monkey':2},'foals':{'and':1,'to':1},'eleventh':{'printing':1,'moon':1},'placental':{'mammals':1},'representations':{'concerning':1},'imperial':{'war':4},'miles--in':{'itself':1},'dispersive':{'effect':1},'salient':{'aspects':1,'features':1,'examples':1},'droop':{'forward':1},'unknown':{'on':1,'gas':1,'but':1,'.':3,'to':1,'manner':1,'in':1,'until':1},'galley':{'hill':1,'.':1},'retreats':{'and':1},'their':{'distances':1,'interpretation':1,'perch':1,'orbits.':1,'boxed-in':1,'brain':1,'attempts':1,'relation':1,'salivary':1,'upturned':1,'speed':3,'lessons':2,'birthplace':2,'doom':1,'resemblance':1,'progeny':1,'masses':1,'possessors':2,'young':6,'opportunities':1,'wings':1,'environment':2,'surroundings':3,'neighbours':1,'bases':1,'parents':2,'marks':1,'resources':1,'appearance--an':1,'borrowed':1,'clutches':1,'fate':1,'distance':1,'food':4,'advances':1,'moons':1,'early':1,'smallness':1,'background':1,'hands':1,'slipperiness':1,'height':1,'day':1,'condition':1,'evolution':1,'success':1,'parrot':1,'course':1,'crops':1,'luminosity':2,'length.':1,'back-teeth':1,'activity':1,'distant':1,'bills':4,'soft':1,'breast-bone':1,'bond':1,'dwindled':1,'burrows':1,'old':1,'mental':1,'weight':1,'life-history':2,'appearance':1,'energy':3,'range.':1,'sifting':1,'relative':2,'rate':1,'individual':1,'year':1,'development':2,'foals':1,'enemies':3,'living':1,'constitution':1,'axes':1,'interference':1,'migrations':2,'artificial':1,'fellows':1,'colours':1,'wave-lengths.':1,'simplest':1,'approach':1,'bearers':1,'scaly':1,'body':2,'variability':1,'toes':1,'transparency':1,'power':3,'importance':1,'argument':1,'kindred':3,'limbs':1,'atoms':2,'behaviour':1,'host':1,'chances':1,'outlying':2,'substance':1,'allies':1,'brilliant':1,'dormancy':1,'insect':3,'discoveries':1,'motion':1,'turn':1,'length':2,'head':1,'youthful':1,'first':1,'origin':2,'golden':3,'own':9,'gizzard--certainly':1,'family':1,'presence':1,'reasons':1,'father':1,'bluish':1,'multiplication':1,'enlarged':1,'names':1,'passage':2,'size':1,'decline':1,'use':1,'palm-bones':1,'chisel-edged':1,'muddy':1,'destination':1,'secret':1,'thinnest':1,'prey':1,'predecessors':1,'way':7,'fixed':2,'repertory':1,'more':2,'function':1,'hue':1,'eyes':1,'tissues':1,'yolk-forming':1,'wits':2,'brains':1,'becoming':1,'back':1,'heat':2,'importance.':1,'lives':1,'adult':1,'impulse':1,'ring-armour.':1,'insect-visitors':1,'homes':1,'characteristic':1,'cells':3,'detachable':1,'ancestral':1,'lips':1,'vocal':1,'temperatures':1,'reproduction':1,'light':3,'photosynthesis':1,'remains':1,'parents.':1,'real':1,'furs':1,'modern':1,'mind':1,'discovery':2,'deep':1,'manner':1,'lifetime':1,'movements':2,'respective':1,'ancestors':1,'variety':1,'lengths':1,'ascent':1,'maximum':1,'arrangement':1,'pectoral':1,'field':1,'relatives':3,'numerous':1,'income':2,'tool':1,'contemporaries':1,'worldwide':1,'polar':1,'material':1,'cupboard':1,'mouths':1,'normal':1,'nest':1,'reach':1,'orbits':1,'counterparts':3,'visitors':1,'significance.':1,'strength':1,'mouth':1,'delicate':1,'ink-bags':2,'hair':1,'foothold':2,'coloration':1,'natural':1,'modes':1,'pigmy':1,'nostrils':1,'eggs':5,'life':3,'posterior':1,'incessant':1,'castings':1,'manipulative':1,'tentacles':1,'smooth':1,'mother':2,'reward':1,'wing':1,'bodies':3,'usual':1},'1500':{'west':1},'delusions':{'yet':1},'behind.':{'there':1,'illustration':1},'embryology':{'--these':1,'of':1},'unstereotyped':{'they':1},'invisibility':{'and':1,'may':1,'coloured':1,'does':1,'at':1,'.':1},'noteworthy.':{'penguins':1},'shell':{'and':3,'very':1,'of':11,'is':4,'tends':1,'against':1,'.':2,'were':1,'in':3,'not':1,'with':1,'or':1},'x-rays':{'and':2,'we':1,'ltd.':4,'were':1,'.':2,'discovered':1,'have':1,'so':1,'are':1,'they':1,'which':3,'not':1,'through':2,';':1},'bromogelatine':{'plates':1},'shelf':{'fringing':1,'around':1},'shallow':{'and':1,'there':1,'well-illumined':1,'.':1,'water':5,'trough':1,'water.':2,'pond':1,'areas':1},'reflecting':{'instrument':1,'telescope--the':1,'telescope':1,'others':1},'constituent':{'colours':1,'of':1,'element':1},'july':{'17':2},'reverses':{'its':1},'blind':{'flat-fish':1,'alley':1,'gut':2},'dynamical':{'principle':1},'succeeded':{'and':1,'sir':1,'or':1,'.':1,'every':1,'in':3,'by':1},'uninterested':{'to':1},'isolation':{'of':1,'from':1,'which':1},'richer':{'evolution':1},'instincts--of':{'insects':1},'dynamo':{'as':1,'does':1,'it':1,'which':1},'individualities':{'arise':1},'dusty':{'the':1},'varied.':{'a':1},'tracts':{'of':1},'safeguarded':{'the':1},'violets':{'would':1},'fowl':{';':1},'gate-posts':{'and':1,'green':1},'sifting.':{'but':1},'endeavour.':{'sec':1,'in':1},'mongolian':{'and':1},'germinal':{'changefulness':1,'variations':1},'siamang':{'.':1},'reaches':{'a':5,'on':1,'of':3,'it':1,'us':1,'which':1,'in':1,'such':1,'the':2,'its':3},'angle':{'and':1,'on':1,'to':2,'.':1},'pollen-tubes':{'grow':1},'agency':{'could':1},'olfactory':{'messages':1},'supplanted':{'by':1},'well-marked':{'chins':1,'breeds':1},'ungirt':{'loin':1},'which':{'all':9,'belong':2,'help':1,'just':1,'produces':2,'captures':1,'probe':1,'vary':1,'gulls':1,'leads':3,'stored':1,'thanks':1,'go':3,'still':1,'birds':1,'causes':4,'seemed':2,'bridges':1,'rapid':1,'depend':1,'had':6,'came':1,'actually':1,'forms':5,'simple':1,'only':1,'behave':1,'extends':2,'helps':1,'sulked':1,'under':1,'attained':2,'covered':1,'circle':1,'has':43,'alter':1,'happened':1,'grip':1,'eventually':1,'his':2,'means':3,'food':2,'breaks':1,'tends':1,'lurk':1,'floated':1,'confines':1,'feels':2,'cannot':5,'nearly':2,'they':19,'progress':1,'not':1,'during':1,'he':7,'now':2,'dr':1,'monkeys':1,'look':1,'indicate':2,'like':1,'did':1,'always':2,'generally':1,'modern':2,'make':4,'admitted':1,'travels':2,'this':5,'persisted':1,'she':1,'turns':1,'become':2,'speculation':1,'freshwater':1,'mount':1,'reaches':1,'often':1,'reference':1,'people':1,'sends':1,'ancestral':1,'some':4,'supplies':1,'recapitulate':1,'constitute':2,'individual':1,'lines':1,'are':66,'pass':1,'our':1,'kant':1,'parachuting':1,'even':1,'delivered':1,'plays':1,'opened':1,'lead':1,'constitutes':2,'rings':1,'its':1,'everything':1,'contained':1,'experiment':1,'huxley':1,'scientists':1,'probably':4,'learned':1,'dilutes':1,'roentgen':1,'can':2,'we':52,'led':4,'nature':2,'climbs':1,'never':2,'atoms':1,'water':2,'credits':1,'were':12,'sink':1,'lasts':1,'put':1,'from':1,'puzzled':1,'come':1,'by':5,'about':1,'enables':2,'rests':1,'deals':1,'could':4,'strikes':1,'contract':1,'mixes':1,'carries':2,'became':1,'stand':1,'professor':1,'swing':1,'usually':1,'disappears':1,'stimulate':1,'comes':1,'feed':2,'emerge':1,'radio-activity':1,'followed':1,'secure':3,'formerly':1,'supply':1,'suddenly':1,'seems':1,'habitual':1,'marked':2,'one':1,'brought':1,'lies':2,'spans':1,'comprises':1,'whalebone':1,'mark':1,'appeared':1,'presents':1,'differ':1,'light':1,'expresses':1,'takes':1,'would':8,'to':3,'there':11,'finally':1,'periodically':1,'rivals':1,'live':4,'spread':3,'slowly':1,'living':1,'grew':2,'was':18,'opens':1,'gives':1,'life':1,'enable':1,'arise':1,'molecules':1,'form':1,'afford':1,'becomes':1,'marks':1,'amphibians':1,'broke':1,'separates':2,'absorbs':1,'almost':1,'reverses':1,'must':4,'plants':2,'pull':1,'made':1,'animals':2,'unfortunately':1,'these':3,'prevents':1,'require':1,'work':1,'lessen':1,'will':7,'attacks':1,'remain':1,'lays':1,'many':1,'already':1,'meet':1,'circulate':1,'dr.':1,'hatch':1,'have':22,'bind':1,'give':3,'frogs':1,'again':1,'is':61,'occupies':1,'thus':1,'it':22,'eats':1,'helped':1,'case':1,'as':3,'lived':1,'protects':1,'at':2,'slip':1,'allowed':1,'regulate':1,'pit':1,'counteract':1,'granules':2,'lie':1,'date':1,'no':4,'suggest':1,'began':2,'holds':1,'when':2,'astronomers':2,'very':1,'take':4,'forces':1,'brings':1,'new':1,'you':2,'grows':1,'neolithic':1,'formed':2,'conveys':1,'attend':1,'though':1,'may':16,'dive':1,'faintly':1,'paid':1,'reflect':1,'most':1,'fell':2,'tackle':1,'two':1,'multiply':1,'infects':1,'grow':1,'man':8,'a':8,'demand':1,'land':2,'in':7,'i':2,'makes':7,'arrange':1,'mask':1,'lasted':1,'thought':1,'used':1,'eurypterids':1,'allow':1,'keeps':1,'masks':1,'the':57,'justify':1,'blend':1,'responded':1,'migrate':1,'once':1},'tree-frogs':{'are':2,'called':1},'spawns':{'in':1},'divers':{'come':1},'vegetation':{'marking':1,'that':1,'of':1,'only':1,'in':1,'probably':1,';':1,'lingering':1,'consisted':1},'hydrostatica':{'related':2},'centre':{'and':4,'of':4,'.':2,'to':1,'only':2,'at':1,'in':1,'or':1},'wind-blown':{'sand':1},'who':{'show':1,'is':3,'soon':1,'anticipating':1,'have':4,'estimated':1,'are':5,'intrude':1,'said':1,'described':1,'had':2,'does':1,'has':1,'lacks':1,'do':1,'knows':1,'found':1,'may':1,'came':1,'gnaw':1,'lives':1,'learns':1,'approach':1,'believe':1,'with':1,'by':2,'concentrated':1,'made':4,'to-day':1,'like':1,'was':1,'think':1,'will':1,'maintain':1,'can':1,'mounts':1,'desire':1,'agree':1,'restored':1,'notifies':1},'cohesion':{'of':1,'between':1},'1.d':{'.':1},'1.e':{'below.':1,'.':1},'microbic':{'or':1},'digestive':{'and':1,'filaments':1,'juice.':1},'1.a':{'.':1},'1.b':{'.':1},'1.c':{'below':1,'.':1},'emancipation':{'of':3,'from':1},'violet.':{'sorting':1},'class':{'a':1,'of':5,'we':1},'deny':{'a':1},'expert':{'opinion':1,'advice':1},'deccan':{'the':1},'wasp-like':{'impression':2},'.001':{'per':1},'pipe':{'to':1,'.':1},'different-lengthed':{'waves':1},'cloaked':{'by':1},'europe.':{'it':1,'illustration':1},'swarming':{'in':1},'goals':{'and':1},'unimpeded':{'five':1},'refund':{'set':1,'from':1,'of':3,'-':1,'.':2,'in':1,'described':1},'terrific':{'cold':1},'insulators':{'because':1,'for':1},'perceptions':{'and':1},'chances':{'of':1,'are':1},'sceptical':{'about':1},'agreed':{'to':1},'tidings':{'from':1},'chapters':{'of':1},'upright':{'forehead':1,'on':1,'nail':1},'purely':{'instinctive':2},'sabre-toothed':{'tiger':1},'seaweed':{'and':3,'for':1,'area':1,'of':1,'nest':1,'continues':1,'but':1,'.':1,'green':1,'nibbles':1,'each':1,'vegetation.':1,'or':1},'changeful':{'surroundings':1,'processes':1,'place':1},'utter':{'darkness--an':1,'sufficient':1,'darkness':1},'fear':{'of':2},'darkest':{'period':1},'feat':{'which':1},'agrees':{'in':1},'nearer':{'a':1,'and':1,'an':1,'to':3,'the':3,'.':1,'than':1},'cave-bear':{'became':1,'cave-lion':1},'implying':{'initiative':1},'cache':{'of':1,'after':1},'gouging':{'out':1},'surroundings':{'on':1,';':1,'like':2,'these':1,'many':1,'.':4,'admits':1,'their':1,'without':1,'including':1,'lighter':1,'in':1,'not':1,'the':4,'rests':1,'must':1},'postulated':{'by':1},'herald':{'the':1,'its':1},'inhabit':{'the':1},'local':{'influence':1,'drying':1,'changes':1,'thickness':1},'combe':{'capelle':1},'snow-capped':{'mountains':1},'dexterities':{'which':1},'helios':{'the':1},'cube':{'of':1},'skims':{'from':1},'watching':{'those':1,'in':1},'d.p.':{'it':1},'displayed':{'performed':1},'primeval.':{'the':1},'intensely':{'hot':1},'words':{'all':1,'as':1,'are':2,'what':1,'to':1,'true':1,'there':2,'.':1,'also':1,'written':1,'meant':1,'we':1,'signifying':1,'but':2,'indicative':1,'such':1,'with':1,'monkeys':1,'animals':1,'of':2,'became':1,'can':1,'positive':1,'become':1,'the':2,'or':1},'please.':{'it':1},'penetrate':{'everywhere':1,'the':1,'through':1},'spur':{'to':2},'burned':{'up':1},'ornithoscatoides':{'decipiens':1},'sweat':{'and':1},'prodigally':{'using':1},'belts':{'which':1},'monsters':{'1892':1},'insectivorous':{'and':1,'plant':1,'bats':1},'quaternary':{'at':1},'waterfalls':{'of':1},'sparrows':{'and':1,'to':1},'generations':{'reached':1,'afterwards--and':1,'yet':1,'to':1},'afterwards--and':{'suffering':1},'unison':{'with':1},'available':{'on':1,'.':1,'with':1,'for':1,'space':1},'ebb':{'of':1},'acquired':{'a':2,'an':1,'its':1,'dexterities':1},'monkeys--in':{'dogs':1},'distantly':{'related':1},'cross-fertilisation.':{'sec':1},'violet':{'then':1,'end':1,'light':1,'colour':1,'.':1,'will':1,'at':1,'the':1},'barrels':{'of':1},'this.':{'the':1},'responses':{';':1,'.':2},'closer':{'examination':1},'closes':{'with':1},'shore-frequenting':{'seals':1},'mentioned':{'that':1,'already.':1,'indicates':1,'part':1,'in':1,'the':1,'is':1},'monstrous':{'tortoise':1},'worship':{'and':1},'genius':{'a':1,'of':1,'.':1,'it':1,'than':1},'converted':{'almost':1,'into':1,'directly':1},'identification':{'number':1,'for':1},'colour-associations':{'.':1},'hebrides':{'southwards':1},'crude':{'flint':1},'limit':{'these':1,'to':1,'the':1,'.':1},'variability':{'on':1,'is':1,'.':1,'to':1,'along':1,';':1},'andromeda':{'messier':2},'ability':{'to':2,'.':1},'opening':{'and':1,'fir':1,'up':1,'to':1,'new':1,'the':2,'more':1},'joy':{'and':1,'.':1},'agencies':{'operating':1,'for':1,'.':1},'podargus':{'a':1,'190':1},'apes':{'and':6,'both':1,'from':1,'show':1,'though':1,'but':1,'.':3,'also':1,'as':2,'diverged':1,'can':1,'165':1,'monkeys':1},'hypothesis':{'that':1,'may':1,'.':3,'therefore':1,'which':1,'one':1,'apart':1},'probing':{'and':1,'its':1},'rhythm.':{'illustration':1},'air-bubble--air':{'entangled':1},'swift':{'stroke':1,'hardly':1,'runners':1,'stream':1},'commands':{'our':1,'such':1},'cliff.':{'energy':1},'acknowledge':{'as':2},'mentone':{'on':1},'grouse':{'and':2,'disease':2,'or':1},'april':{'1922':4},'grain':{'of':8,'contains':1,'planted':1,'.':1},'utilising':{'dry':1},'retrograde':{'direction':1},'canopy':{'over':1},'germ-cells':{'and':1,'do':1,'that':1,'perhaps':1,'is':1,'but':1,'are':1,'have':1,'has':1,'into':1},'mutating':{'mood.':1},'wall':{'of':7,'shown':1,'.':1},'wonder':{'of':2,'then':1},'walk':{'with':2},'walt':{'whitman':1},'subscribe':{'to':1},'heredity':{'is':1,'which':1},'stars--to':{'star':1},'animalcule':{'often':1,'is':1,'which':1,'the':1,'has':1,'or':1},'table':{'suggests':1,'colliding':1,'page':1,'.':2},'investigator':{'noted':1},'mesozoic':{'and':1,'is':1,'era':6,'three':1,'times':1},'provinces':{'and':1},'i.e.':{'eating':1},'cavities':{'in':1},'hunters':{'and':2,'fowlers':1},'trademark':{'and':2,'license':1,'copyright':1,'but':1,'.':3,'as':1,'owner':2},'window':{'.':1},'responds':{'to':1},'ant-eaters':{'lay':1},'reindeer':{'and':2,'wild':1,'men':1,'man':1},'cry':{'uttered':1,'for':1,'.':2},'735':{'years.':1},'bewildering':{'profusion':1},'twenty-nine':{'days':1},'conductors.':{'so':1},'remedies':{'for':1},'1.e.1.':{'1.e.7':1},'painted':{'on':1,'bison':1,'in':2},'sufficient':{'for':1,'supply':1,'of':1,'here':1,'to':6,'heat':1,'sounds':1,'quantity':1,'cause':1,'theoretical':1,'inducement':1,'if':1},'thrusting':{'their':2},'sub-aquatic':{'environment':1},'ensuring':{'that':1},'visible.':{'illustration':1},'present':{'features':1,'point':1,'is':4,'rate':1,'in':6,'our':1,'living':1,'unavailable':1,'when':1,'two':1,'.':2,'day.':1,'state':1,'form':2,'though':1,'after':1,'but':1,'standard':1,'purpose':1,'they':1,'trying':2,'with':1,'day':2,'stage':1,'whereby':1,'value':1,'time':1,'the':4},'inconspicuous':{'24':1,'among':2,'when':1,'against':2,'.':2,'as':1,'amidst':1,'in':2,'by':1},'interstices':{'they':1},'abandoned':{'by':1,'.':2},'unlike':{'the':2},'agreement.':{'illustration':1},'vanilla':{'ascii':2},'will':{'emerge':1,'learn':1,'deal':1,'supply':1,'almost':1,'cover':1,'pass':2,'replace':1,'say':1,'have':1,'measure':1,'radiate':1,'tend':3,'scent':1,'any':1,'select':1,'make':2,'again':1,'gradually':1,'detect':4,'proceed':1,'to':2,'prevail':1,'support':1,'show':1,'deal.':1,'.':1,'start':1,'finally':1,'suffocate':1,'take':2,'then':1,'hatch':1,'surprise':1,'confine':1,'cause':1,'tell':1,'dispute':1,'evolve':1,'notice':1,'enable':1,'return':1,'engender':1,'gnaw':1,'admit':1,'express':1,'stop':1,'rush':1,'bear':1,'intercept':1,'sink':1,'not':9,'last':1,'attract':1,'come':3,'throw':1,'summon':1,'knock':1,'do':3,'rotate':1,'give':2,'consist':1,'be':53,'science':1,'colour':1,'no':1,'liquefy':1,'spontaneously':1,'appear':1,'remain':2,'continue':2,'die':1,'become':1,'the':2,'tap.':1,'explain':1,'travel':1},'inequilibrium':{'results':1},'vastly':{'hotter':1,'greater':1,'more':3},'wild':{'plants':1,'horses':1,'life':1,'animals':1,'rock-dove':1,'nature':2,'mammals':1,'peoples':1,'dog':2,'.':1,'species':2,'wheat':1,'rabbit':1,'cattle':1,'boar':1,'life.':1,'fauna':1,'he':1,'or':2,'cabbage':1,'sheep':1},'2007':{'ebook':1},'tadpoles':{'of':1,'while':1,'are':1,'.':1},'layer':{'of':4,'is':1,'overpowering':1,'or':2,'.':2},'envelope.':{'thus':1},'zostera':{'form':1},'apprehend':{'the':1},'filaments':{'which':1,'in':1},'non':{'profit':1},'encouragement':{'to':1},'meteoritic':{'contributions':1},'life-forms':{'would':1},'perhaps':{'among':1,'all':1,'because':5,'stray':1,'is':2,'it':5,'an':3,'discovered':1,'are':1,'in':1,'25':4,'from':2,'to':1,'twenty':1,'sum':1,'there':2,'when':1,'next':1,'also':2,'too':1,'belong':1,'500':1,'we':1,'increased':1,'that':2,'300':1,'eight':1,'they':3,'100':2,'one':1,'beginning':1,'why':1,'a':6,'thirty':1,'this':2,'professor':1,'wild':1,'the':9,'came':1},'trailing':{'on':1},'cromagnard':{'representative':2,'in':1},'forceps':{'held':1,'the':1,'so':1,'.':1},'unite':{'with':1},'electro-magnetic':{'energy':1,'theory':1,'waves':2},'orionis':{'showing':1,'37':1},'unity':{'and':1,'of':1,'.':2,'at':1,';':1,'or':1},'exuberance':{'of':3},'geographical':{'barriers':1,'distribution':1},'largest':{'and':1,'in':1,'of':4,'flying':1,'refracting':1,'reflecting':1,'waves':1,'telescopes':2},'units':{'of':1,'the':1,'were':2,'or':1,'are':1},'gets':{'up':2,'worn':1,'will':1,'through':1,'the':1,'beyond':1,'its':2},'hammering':{'at':2},'firmament':{'is':1},'spirited':{'pictures':1},'elbows':{'.':1},'slave':{'of':1},'conceived':{'as':1},'overcrowded':{'or':1},'student':{'what':1,'but':1,'in':1},'vapour':{'layers':1,'shoot':1,'of':1,'to':1,'at':1,'out':1},'laborious':{'tasks':1},'collar':{'over':1,'round':1},'warming':{'the':1},'reached.':{'the':1},'banded':{'krait':3},'unpacked':{'the':1},'star-book':{'.':1},'electrified.':{'in':1},'spectator':{'after':1},'sound-waves':{'and':1},'undertaken':{'by':1},'realised':{'the':1,'in':2,'.':1},'tacchini':{'of':1},'heavily':{'armoured':1},'only.':{'3':1},'wren':{'.':1},'multitude':{'of':6},'obtain':{'a':3,'permission':2},'replenish':{'the':1},'batteries':{'of':1,'getting':1,'.':1},'fishing':{'farming':1},'rocked':{'from':1},'inturned':{'margin':1},'cuckoo-spit':{'147':1,'the':2,'on':1},'contractile':{'vacuole':1},'disturbance':{'around':2,'ceases':1,'being':1,'is':1,'which':1,'in':1,'such':1},'host.':{'illustration':1},'supply':{'will':1,'of':6,'the':4,'and':1,'our':1},'smith':{'woodward':1},'pitcher-plant':{'catching':1},'discuss':{'at':1},'book':{'and':1,'on':1,'of':2,'there':2,'it':1,'which':1,'the':1},'galloping':{'boar':2},'usage':{'spread':1,'had':1},'enacted':{'on':1},'unprecedented':{'development':1},'civilisation--coal':{'.':1},'knob':{'on':1},'wont':{'to':1},'diamond-like':{'eyes':1},'branch':{'and':4,'we':1,'after':1,'from':1,'of':3,'is':1,'within':1,'to':2,'at':1,'now':1,'or':1,'out':1},'community':{'at':1,'in':1},'facial':{'characteristics':1,'expressions':1,'expression':2},'denser':{'and':1,'along':1,'masses':1,'than':1},'press':{'professor':1,'copyright':1,'the':2,'agency.':7},'originative':{'stock':1},'feral':{'216':1,'it':1},'safest':{'coloration':1},'perpetual':{'unremitting':1},'loses':{'a':1,'weight.':1,'it':1,'least':1,'its':1},'colonising':{'of':1,'the':1},'vortex':{'may':1,'phenomena':1,'in':1},'james':{'ritchie':1,'s':8,'matter':1},'puzzle-boxes':{'and':2,'with':1},'smoothness':{'of':1},'herons':{'and':1,'storks':1},'exceed':{'20':1},'because':{'they':8,'mind':1,'it':7,'in':1,'sounds':1,'its':3,'to':1,'deeply':1,'there':1,'birds':1,'their':1,'many':2,'we':1,'some':2,'heat':2,'although':1,'he':2,'this':1,'light':1,'obviously':1,'of':8,'the':12},'ages--evolution':{'of':1},'vortices':{'or':1},'elevators':{'in':1},'scottish':{'history':1},'mosquitoes':{'which':2},'eventfulness':{'of':1},'flint-shelled':{'radiolarians':1},'116':{'a':1,'after':1},'113':{'the':1},'faraday':{'he':1},'119':{'sea-horse':1,'photo':1,'an':1},'118':{'greenland':1,'minute':1},'blood-vessel':{'nerve':1,'for':1},'gill-slits':{'of':1,'are':1},'lamprey--a':{'long':1},'leaf':{'and':1,'touches':1,'towards':1,'seventy-five':1,'is':1,'six':1,'when':1,'.':4,'near':1,'without':1,'in':2,'close':1,';':1,'before':1,'must':2},'lead':{'on':1,'has':2,'pencil':1,'these':1,'is':1,'us':3,'one':1,'.':3},'promotion':{'and':1},'high.':{'the':1},'mines':{'of':1},'philosopher':{'and':1,'professor':1},'instantaneous':{'abandonment':1},'arteries':{'of':1},'leap':{'and':2,'over':1,'due':1,'out':1},'glacial':{'climate':1,'time':1,'.':1},'repeopling':{'from':1},'trout':{'go':1,'we':1,'in':1,'or':1,'eluding':1},'locate':{'a':1},'obey':{'this':2,'an':1},'thoroughfare':{'for':1},'astounding':{'fact':2},'analysed':{'tons':1,'.':1,'in':1},'conveyed':{'by':1},'raise':{'a':1,'their':1,'the':2,'it':1},'rare':{'birds':1},'carried':{'to':2,'about':2,'by':3,'for':1,'back':1},'extension':{'of':2,'have':1},'unsurpassable':{';':1},'column':{'of':1},'universe':{'and':3,'transmitting':1,'is':13,'it':1,'an':1,'as':3,'sec':2,'are':1,'in':1,'even':1,'said':1,'opened':1,'remains':1,'tiny':1,'.':11,'how':1,'which':1,'has':1,'was':2,'comparable':1,'may':2,'why':1,'243':1,'than':1,'a':1,'of':1,'can':1,'were':2,'the':1,'or':1},'biscuit':{'from':1,'.':1},'eclipse.':{'this':1},'dependence':{'.':1},'urged':{'that':1},'sea-horse':{'is':1,'puts':2,'in':2},'carries':{'them':2,'many':1,'about':1,'in':1,'the':2,'its':1},'carrier':{'of':1,'pigeons':1,'pigeon':3},'places':{'on':2,'them':1,'for':1,'e.g':1,'of':2,'vary':1,'to':1,'have':1,'the':3,'where':1,'its':1},'wheats':{'.':1},'devouring':{'their':1,'potatoes':1},'warranty':{'or':1,'disclaimer':1},'splash':{'of':1},'own':{'and':3,'beautiful':1,'weight':2,'when':1,'mind':1,'invention':1,'in':1,'lambs':1,'.':7,'reward.':1,'before':1,'dispersive':1,'little':1,'sake':1,'distinctive':2,'definite':1,'system':2,'moon':1,'internal':1,'white':1,'was':1,'day':1,'then':1,'race':1,'that':1,'but':1,'atoms':1,'genealogical':1,'solar':2,';':1,'he':1,'kind':1,'enemies.':1,'planet':1,'circle':1},'polished':{'stones':1,'stone':2},'sugary':{'sap':2},'owe':{'to':3,'them':1,'it':1,'our':1},'habituations':{'and':1},'wearisome':{'reiteration':1},'promise':{'myriads':1,'that':1,'of':2,'is':1,'are':1,'considerable':1},'brush':{'and':1},'registration':{'of':3,';':1},'cell--a':{'fertilised':1},'to-morrow':{'might':1},'prompted':{'by':1,'reliance':1},'linnaeus':{'spoke':1},'van':{'was':1},'miles.':{'these':1},'transfer':{'energy':1,'her':1},'paperwork':{'and':1},'spiral':{'nebulae.':1,'facing':1,'nebulae':8,'nebula':11,'edge-on':1,'arms':2,'having':1,'arms.':1,'to':1,'than':1,'structure':1},'continental':{'islands':1,'masses':1,'elevation':1,'fish':1},'uniting':{'into':1,'with':1},'4.--the':{'great':1},'breeding':{'season':2,'only':1,'calls':1,'time':1},'phosphorus':{'is':1},'mouth.':{'everyone':1,'sec':1,'illustration':4},'limulus':{'may':1},'fundy':{'it':1},'dasypeltis':{'gets':1},'u.s.a.':{'this':1},'incursions':{'of':1},'volume':{'and':1},'larger':{'and':3,'animals':2,'particle':1,'variety':1,'rather':1,'of':1,'area':1,'parasite':1,'than':5,'supply':1,'in':1,'fifteen-spined':1,'.':1,'continent':1,'species':1},'counterparts':{'in':3},'millipedes':{'and':1},'shark-like':{'and':1},'tactics':{'of':1,'are':1},'instructive':{'case':1,'to':2,'because':1,'.':1},'whether':{'all':2,'gravitation':1,'hunting':1,'that':1,'these':1,'it':5,'bird':1,'we':1,'imitation':1,'they':1,'particular':1,'the':6,'astronomy':1,'similar':1,'or':1},'meeting':{'of':1,'the':1,'that':1},'fossilized':{'forests.':1},'moorhen':{'saw':1,'has':1,'dived':1,'in':1},'record':{'of':1,'is':1,'answers':1,'.':2,'how':1,'the':1,'tells':1},'below':{'and':1,'a':1,'this':1,'freezing-point.':1,'.':3,'their':1,'are':1,'freezing-point':1,'the':11},'graphite':{'similarly':1},'demonstrate':{'a':1},'percival':{'lowell':1,'lowell.':1},'arno':{'von':1},'stirring':{'times':1},'unfolding':{'of':1},'cynodonts':{'were':1},'roentgen.':{'discovery':1},'change-producing':{'factors':1},'--1':{'.':1},'pigment-cells':{'chromatophores':1,'change':1},'1781.9':{'84.02':1},'globules':{'of':1},'kind.':{'sec':1},'soft-shell':{'tortoise':1},'domesticated':{'sheep':1,'animals':7,'dog':2,'breeds':1,'type':1,'creature':1},'counteract':{'poisons':1},'limb':{';':1,'or':1},'mutual':{'benefit':1,'gravitation':1,'dependence':1,'assurance':1},'1898.':{'in':1},'incredible':{'refinement':1,'speed':1},'portion':{'consists':1,'of':5,'would':1},'other':{'all':1,'interpretation':1,'words':11,'four':1,'experiments':1,'facts':1,'birds':1,'causes':1,'chemical':1,'apes':2,'group':1,'shifts':1,'physiological':1,'interesting':1,'parts':1,'marsh':1,'main':1,'associations':1,'format':1,'inter-relations':1,'marked':1,'they':1,'new':2,'radio-active':1,'sensational':1,'worlds':1,'backboned':1,'sedimentary':1,'side':6,'investigators':2,'telescope.':1,'thinkers':1,'growths':1,'some':1,'mollusc':1,'sporadic':1,'bacteria':1,'creatures':3,'pigments':1,'organisms':1,'factors':1,'ways':3,'pictures':1,'heavenly':1,'got':1,';':3,'warranties':1,'body':1,'ends':1,'toes':1,'terms':1,'men':2,'atoms':3,'stellar':1,'objects':1,'by':1,'extreme':1,'digits':1,'great':1,'substance':1,'of':1,'haunts':1,'times':3,'thing':1,'s':1,'light--we':1,'host.':1,'useful':1,'features':1,'reasons':1,'intellectual':1,'highly':1,'fishes':1,'seashore':1,'protozoa':1,'sounds':1,'throughout':1,'persons.':1,'trifles':1,'sea-snail':2,'copies':1,'.':14,'way':4,'reptiles':1,'specimens':1,'direction':1,'senses':2,'spiral':1,'form':2,'substances':2,'mammals':7,'immediate':1,'known':1,'branches':1,'cases':9,'than':1,'circumstances':1,'animals':3,'liquid':1,'places':1,'work':2,'theories':1,'project':1,'wild':1,'stages':1,'colour':1,'and':1,'meant':1,'seven':1,'change-producing':1,'is':3,'experiments--indications':1,'it':1,'metals':2,'pieces':1,'medium':1,'universes.':1,'planets':3,'universes':1,'domesticated':1,'orders':1,'cotton':1,'end':2,'in':1,'things':1,'ideas':1,'species':1,'astronomers':2,'instance':1,'became':1,'animal':1,'party':1,'enemies':1,'intelligent':1,'creature':1,'kinds':2,'hand':9,'glimpses':1,'blood':1,'never':1,'authorities':1,'such':1,'acquisitions':1,'amoeboid':1,'modes':1,'consequences':1,'age':1,'obstacles':1,'lines':1,'shafts.':1,'fundamental':2,'mechanical':1,'the':1,'order':1,'bodies':2},'sunrise':{'the':1},'boon':{'to':1},'conclusion':{'we':1,'that':5,'is':2,'what':1,'to':1,'in':1},'supersaturated':{'vapour':1},'kinds':{'forms':1,'of':34,'neoceratodus':1,'with':1,'are':1},'june':{'1922':4},'inherently':{'liable':1},'4.29':{'vega':1},'--i':{'.':1},'supple':{'yet':1},'--a':{'sort':1,'quite':1},'opened':{'a':1,'cones':1,'up':1,'.':1,'with':1,'its':1},'association--why':{'is':1},'ranks':{'of':2},'half-second':{'that':1},'volumes':{'of':1,'g':1},'understand':{'them':1,'that':1,'very':1,'what':1,'why':2,'in':2,'not':1,'the':4,'now':1,'agree':1},'function.':{'interesting':1},'expands':{'as':1},'sun--the':{'surface':1,'planets':1},'sci.':{'volvox':1,'trypanosoma':1}}
 
 class Learner:
     def __init__(self):
-        self.db={}
-    def learn(self,text):
-        replacements1={'[^a-zA-Z0-9\.;:\-]':' ',
-                       '\s+':' ',', ':' , ', '\. ':' . ',
-                       ': ':' : ','; ':' ; '}
-        for key,value in replacements1.items(): text=re.sub(key,value,text)
-        items=[item.lower() for item in text.split(' ')]
-        for i in range(len(items)-1):
-            item=items[i]
-            nextitem=items[i+1]
-            if not self.db.has_key(item): self.db[item]={}
-            if not self.db[item].has_key(nextitem): self.db[item][nextitem]=1
-            else: self.db[item][nextitem]+=1
-    def save(self,filename):
-        cPickle.dump(self.db,open(filename,'wb'))
-    def load(self,filename):
-        self.loadd(cPickle.load(open(filename,'rb')))
-    def loadd(self,db):
-        self.db=db
-    def generate(self,length=10000,prefix=False):
-        replacements2={' ,':',', ' \.':'.\n', ' :':':', ' ;':';', '\n\s+':'\n' }
-        keys=self.db.keys()
-        key=keys[random.randint(0,len(keys)-1)]
-        words=key
-        words=words.capitalize()
-        regex=re.compile('[a-z]+')
+        self.db = {}
+
+    def learn(self, text):
+        replacements1 = {'[^a-zA-Z0-9\.;:\-]': ' ',
+                         '\s+': ' ', ', ': ' , ', '\. ': ' . ',
+                         ': ': ' : ', '; ': ' ; '}
+        for key, value in replacements1.items():
+            text = re.sub(key, value, text)
+        items = [item.lower() for item in text.split(' ')]
+        for i in range(len(items) - 1):
+            item = items[i]
+            nextitem = items[i + 1]
+            if item not in self.db:
+                self.db[item] = {}
+            if nextitem not in self.db[item]:
+                self.db[item][nextitem] = 1
+            else:
+                self.db[item][nextitem] += 1
+
+    def save(self, filename):
+        cPickle.dump(self.db, open(filename, 'wb'))
+
+    def load(self, filename):
+        self.loadd(cPickle.load(open(filename, 'rb')))
+
+    def loadd(self, db):
+        self.db = db
+
+    def generate(self, length=10000, prefix=False):
+        replacements2 = {' ,': ',', ' \.': '.\n', ' :': ':', ' ;':
+                         ';', '\n\s+': '\n'}
+        keys = self.db.keys()
+        key = keys[random.randint(0, len(keys) - 1)]
+        words = key
+        words = words.capitalize()
+        regex = re.compile('[a-z]+')
         for i in range(length):
-            okey=key
-            if not key in self.db: break # should not happen
-            db=self.db[key]
-            s=sum(db.values())
-            i=random.randint(0,s-1)
-            for key,value in db.items():
-                if i<value: break
-                else: i-=value
-            if okey=='.': key1=key.capitalize()
-            else: key1=key
+            okey = key
+            if not key in self.db:
+                break  # should not happen
+            db = self.db[key]
+            s = sum(db.values())
+            i = random.randint(0, s - 1)
+            for key, value in db.items():
+                if i < value:
+                    break
+                else:
+                    i -= value
+            if okey == '.':
+                key1 = key.capitalize()
+            else:
+                key1 = key
             if prefix and regex.findall(key1) and \
-                    random.random()<0.01:
-                key1='<a href="%s%s">%s</a>' % (prefix,key1,key1)
-            words+=' '+key1
-        text=words
-        for key,value in replacements2.items():
-            text=re.sub(key,value,text)
-        return text+'.\n'
+                    random.random() < 0.01:
+                key1 = '<a href="%s%s">%s</a>' % (prefix, key1, key1)
+            words += ' ' + key1
+        text = words
+        for key, value in replacements2.items():
+            text = re.sub(key, value, text)
+        return text + '.\n'
+
 
 def da_du_ma(n=4):
-    return ''.join([['da','du','ma','mo','ce','co',
-                     'pa','po','sa','so','ta','to']\
-                        [random.randint(0,11)] for i in range(n)])
+    return ''.join([['da', 'du', 'ma', 'mo', 'ce', 'co',
+                     'pa', 'po', 'sa', 'so', 'ta', 'to']
+                    [random.randint(0, 11)] for i in range(n)])
+
 
 def populate(table, n, default=True, compute=False):
-    ell=Learner()
+    ell = Learner()
     #ell.learn(open('20417.txt','r').read())
     #ell.save('frequencies.pickle')
     #ell.load('frequencies.pickle')
     ell.loadd(IUP)
-    ids={}
+    ids = {}
     for i in range(n):
-        record={}
+        record = {}
         for fieldname in table.fields:
             field = table[fieldname]
-            if not isinstance(field.type,(str,unicode)):
+            if not isinstance(field.type, (str, unicode)):
                 continue
             elif field.type == 'id':
                 continue
-            elif default and field.default !=None:
-                record[fieldname]=field.default
+            elif default and not field.default in (None, ''):
+                record[fieldname] = field.default
             elif compute and field.compute:
                 continue
             elif field.type == 'text':
-                record[fieldname]=ell.generate(random.randint(10,100),prefix=None)
+                record[fieldname] = ell.generate(
+                    random.randint(10, 100), prefix=None)
             elif field.type == 'boolean':
-                record[fieldname]=random.random()>0.5
+                record[fieldname] = random.random() > 0.5
             elif field.type == 'date':
                 record[fieldname] = \
-                    datetime.date(2009,1,1) - \
-                    datetime.timedelta(days=random.randint(0,365))
+                    datetime.date(2009, 1, 1) - \
+                    datetime.timedelta(days=random.randint(0, 365))
             elif field.type == 'datetime':
                 record[fieldname] = \
-                    datetime.datetime(2009,1,1) - \
-                    datetime.timedelta(days=random.randint(0,365))
+                    datetime.datetime(2009, 1, 1) - \
+                    datetime.timedelta(days=random.randint(0, 365))
             elif field.type == 'time':
-                h = random.randint(0,23)
-                m = 15*random.randint(0,3)
-                record[fieldname] = datetime.time(h,m,0)
+                h = random.randint(0, 23)
+                m = 15 * random.randint(0, 3)
+                record[fieldname] = datetime.time(h, m, 0)
             elif field.type == 'password':
                 record[fieldname] = ''
             elif field.type == 'upload':
                 record[fieldname] = None
-            elif field.type=='integer' and hasattr(field.requires,'options'):
-                options=field.requires.options(zero=False)
-                if len(options)>0:
-                    record[fieldname] = options[random.randint(0,len(options)-1)][0]
+            elif field.type == 'integer' and \
+                    hasattr(field.requires, 'options'):
+                options = field.requires.options(zero=False)
+                if len(options) > 0:
+                    record[fieldname] = options[
+                        random.randint(0, len(options) - 1)][0]
                 else:
                     record[fieldname] = None
-            elif field.type=='list:integer' and hasattr(field.requires,'options'):
-                options=field.requires.options(zero=False)
+            elif field.type == 'list:integer' and hasattr(field.requires, 'options'):
+                options = field.requires.options(zero=False)
                 if len(options) > 0:
-                    record[fieldname] = [item[0] for item in random.sample(options, random.randint(0,len(options)-1)/2)]
+                    record[fieldname] = [item[0] for item in random.sample(
+                        options, random.randint(0, len(options) - 1) / 2)]
             elif field.type == 'integer':
                 try:
-                    record[fieldname] = random.randint(field.requires.minimum,field.requires.maximum-1)
+                    record[fieldname] = random.randint(
+                        field.requires.minimum, field.requires.maximum - 1)
                 except:
-                    record[fieldname] = random.randint(0,1000)
-            elif field.type == 'double' or str(field.type).startswith('decimal'):
-                if hasattr(field.requires,'minimum'):
-                    rand=random.random()
+                    record[fieldname] = random.randint(0, 1000)
+            elif field.type == 'double' \
+                    or str(field.type).startswith('decimal'):
+                if hasattr(field.requires, 'minimum'):
+                    rand = random.random()
                     if str(field.type).startswith('decimal'):
                         import decimal
-                        rand=decimal.Decimal(rand)
-                    record[fieldname] = field.requires.minimum+ \
-                                        rand*(field.requires.maximum-field.requires.minimum)
+                        rand = decimal.Decimal(rand)
+                    record[fieldname] = field.requires.minimum + \
+                        rand * (field.requires.maximum -
+                                field.requires.minimum)
                 else:
-                    record[fieldname] = random.random()*1000
+                    record[fieldname] = random.random() * 1000
             elif field.type[:10] == 'reference ':
                 tablename = field.type[10:]
                 if not tablename in ids:
-                    if table._db._dbname=='gql':
-                        ids[tablename] = [x.id for x in table._db(table._db[field.type[10:]].id>0).select()]
+                    if table._db._dbname == 'gql':
+                        ids[tablename] = [x.id for x in table._db(
+                            table._db[field.type[10:]].id > 0).select()]
                     else:
-                        ids[tablename] = [x.id for x in table._db(table._db[field.type[10:]].id>0).select()]
+                        ids[tablename] = [x.id for x in table._db(
+                            table._db[field.type[10:]].id > 0).select()]
                 n = len(ids[tablename])
                 if n:
-                    record[fieldname] = ids[tablename][random.randint(0,n-1)]
+                    record[fieldname] = \
+                        ids[tablename][random.randint(0, n - 1)]
                 else:
                     record[fieldname] = 0
             elif field.type[:15] == 'list:reference ':
                 tablename = field.type[15:]
                 if not tablename in ids:
-                    if table._db._dbname=='gql':
-                        ids[tablename] = [x.id for x in table._db(table._db[field.type[15:]].id>0).select()]
+                    if table._db._dbname == 'gql':
+                        ids[tablename] = [x.id for x in table._db(
+                            table._db[field.type[15:]].id > 0).select()]
                     else:
-                        ids[tablename] = [x.id for x in table._db(table._db[field.type[15:]].id>0).select()]
+                        ids[tablename] = [x.id for x in table._db(
+                            table._db[field.type[15:]].id > 0).select()]
                 n = len(ids[tablename])
                 if n:
-                    record[fieldname] = [item for item in random.sample(ids[tablename], random.randint(0,n-1)/2)]
+                    record[fieldname] = [item for item in random.sample(
+                        ids[tablename], random.randint(0, n - 1) / 2)]
                 else:
                     record[fieldname] = 0
-            elif field.type=='list:string' and hasattr(field.requires,'options'):
-                options=field.requires.options(zero=False)
+            elif field.type == 'list:string' \
+                    and hasattr(field.requires, 'options'):
+                options = field.requires.options(zero=False)
                 if len(options) > 0:
-                    record[fieldname] = [item[0] for item in random.sample(options, random.randint(0,len(options)-1)/2)]
-            elif field.type=='string' and hasattr(field.requires,'options'):
-                options=field.requires.options(zero=False)
-                record[fieldname] = options[random.randint(0,len(options)-1)][0]
-            elif field.type=='string' and fieldname.find('url')>=0:
-                record[fieldname] = 'http://%s.example.com' % da_du_ma(4)
-            elif field.type=='string' and fieldname.find('email')>=0:
+                    record[fieldname] = [item[0] for item in random.sample(
+                        options, random.randint(0, len(options) - 1) / 2)]
+            elif field.type == 'string' \
+                    and hasattr(field.requires, 'options'):
+                options = field.requires.options(zero=False)
+                record[fieldname] = \
+                    options[random.randint(0, len(options) - 1)][0]
+            elif field.type == 'string' and fieldname.find('url') >= 0:
+                record[fieldname] = 'http://%s.example.com' % \
+                    da_du_ma(4)
+            elif field.type == 'string' and fieldname.find('email') >= 0:
                 record[fieldname] = '%s@example.com' % da_du_ma(4)
-            elif field.type=='string' and fieldname.find('name')>=0:
+            elif field.type == 'string' and fieldname.find('name') >= 0:
                 record[fieldname] = da_du_ma(4).capitalize()
-            elif field.type=='string':
-                record[fieldname] = ell.generate(10, prefix=False)[:field.length].replace('\n',' ')
+            elif field.type == 'string':
+                z = ell.generate(10, prefix=False)
+                record[fieldname] = z[:field.length].replace('\n', ' ')
         table.insert(**record)
     table._db.commit()
 
 if __name__ == '__main__':
-    ell=Learner()
+    ell = Learner()
     ell.loadd(eval(IUP))
-    print ell.generate(1000,prefix=None)
+    print ell.generate(1000, prefix=None)

From fb357eb241e9f3b668143ae2bf3f6ee642c05d66 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 18:36:39 -0500
Subject: [PATCH 43/49] fixed problem with new importer and custom import

---
 VERSION        |  2 +-
 gluon/tools.py | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index 98865e61..34fbedde 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 14:59:27) dev
+Version 2.1.1 (2012-10-19 18:36:33) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index a323a3ff..3b20d71d 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -25,25 +25,28 @@ import Cookie
 import cStringIO
 from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_from_string
 
-from contenttype import contenttype
-from storage import Storage, StorageList, Settings, Messages
-from utils import web2py_uuid
-from fileutils import read_file, check_credentials
+from gluon.contenttype import contenttype
+from gluon.storage import Storage, StorageList, Settings, Messages
+from gluon.utils import web2py_uuid
+from gluon.fileutils import read_file, check_credentials
 from gluon import *
 from gluon.contrib.autolinks import expand_one
 from gluon.contrib.markmin.markmin2html import \
     replace_at_urls, replace_autolinks, replace_components
 from gluon.dal import Row
 
-import serializers
+import gluon.serializers as serializers
 
 try:
-    import json as json_parser                      # try stdlib (Python 2.6)
+    # try stdlib (Python 2.6)
+    import json as json_parser
 except ImportError:
     try:
-        import simplejson as json_parser            # try external module
+        # try external module
+        import simplejson as json_parser
     except:
-        import contrib.simplejson as json_parser    # fallback to pure-Python module
+        # fallback to pure-Python module
+        import contrib.simplejson as json_parser
 
 __all__ = ['Mail', 'Auth', 'Recaptcha', 'Crud', 'Service', 'Wiki',
            'PluginManager', 'fetch', 'geocode', 'prettydate']

From ca0313c514e4ab11c623dd0dfb2ddc944e434f91 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 19 Oct 2012 18:43:14 -0500
Subject: [PATCH 44/49] back button in mobile admin demo

---
 VERSION                                             | 2 +-
 applications/admin/views/plugin_jqmobile/about.html | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 34fbedde..620a48d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 18:36:33) dev
+Version 2.1.1 (2012-10-19 18:43:10) dev
diff --git a/applications/admin/views/plugin_jqmobile/about.html b/applications/admin/views/plugin_jqmobile/about.html
index ae3e1e24..c02f87d3 100644
--- a/applications/admin/views/plugin_jqmobile/about.html
+++ b/applications/admin/views/plugin_jqmobile/about.html
@@ -9,6 +9,13 @@
       body {
       background: url('{{=URL('static','plugin_jqmobile/images/iphone.jpg')}}') no-repeat white;
       }
+      #back {
+      z-index: 1000;
+      padding: 10px;
+      position: absolute;
+      top: 0;
+      right: 0;
+      }
       iframe {
       position: absolute;
       margin-left: 320px;
@@ -35,6 +42,7 @@
   </head>
   <body>
     <iframe src="{{=URL('default','index',vars=dict(is_mobile='true'))}}"></iframe>
+    <div id="back"><a href="{{=URL('default','index',vars=dict(is_mobile='false'))}}">Back</a></div>
     <div id="about">
       <h1><a href="http://web2py.com">web2py</a> plugin</h1>
       <h2>for <a href="http://jquerymobile.com/">jQuery Mobile</a></h2>

From 654626d519f55442e2416785d3cb16944a3cfc31 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 20 Oct 2012 10:03:57 -0500
Subject: [PATCH 45/49] removed print statements from scheduler, thanks Niphlod

---
 VERSION            | 2 +-
 gluon/scheduler.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 620a48d4..6ef22d51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-19 18:43:10) dev
+Version 2.1.1 (2012-10-20 10:03:51) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index fde13d9a..1e986ad8 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -857,7 +857,6 @@ class Scheduler(MetaScheduler):
         tvars = 'vars' in kwargs and kwargs.pop('vars') or dumps(pvars)
         tuuid = 'uuid' in kwargs and kwargs.pop('uuid') or web2py_uuid()
         tname = 'task_name' in kwargs and kwargs.pop('task_name') or function
-        print 'a', targs
         rtn = self.db.scheduler_task.validate_and_insert(
             function_name=function,
             task_name=tname,

From b4849550057bd97b436e0f74ea03823d193e49e0 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 20 Oct 2012 10:08:58 -0500
Subject: [PATCH 46/49] fixed issue 1100, thanks sherdim

---
 VERSION             | 2 +-
 gluon/validators.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 6ef22d51..badf3681 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-20 10:03:51) dev
+Version 2.1.1 (2012-10-20 10:08:54) dev
diff --git a/gluon/validators.py b/gluon/validators.py
index e3a33480..af3f6629 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -1770,6 +1770,7 @@ official_top_level_domains = [
     'xn--hlcj6aya9esc7a',
     'xn--jxalpdlp',
     'xn--kgbechtv',
+    'xn--p1ai',
     'xn--zckzah',
     'ye',
     'yt',

From b37ed1c1e086c36558978d1c9e9a9823b2192e0a Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 20 Oct 2012 10:11:08 -0500
Subject: [PATCH 47/49] fixed issue 1109, thanks Niphlod

---
 VERSION             | 2 +-
 gluon/compileapp.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index badf3681..51c3ddfc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-20 10:08:54) dev
+Version 2.1.1 (2012-10-20 10:11:05) dev
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index 36360d7a..5f145888 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -453,7 +453,10 @@ def compile_views(folder):
 
     path = pjoin(folder, 'views')
     for file in listdir(path, '^[\w/\-]+(\.\w+)+$'):
-        data = parse_template(file, path)
+        try:
+            data = parse_template(file, path)
+        except Exception, e:
+            raise Exception("%s in %s" % (e, file))
         filename = ('views/%s.py' % file).replace('/', '_').replace('\\', '_')
         filename = pjoin(folder, 'compiled', filename)
         write_file(filename, data)

From cb9c2a8ef9531bedfdfcffca5450a6b653652128 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 20 Oct 2012 10:12:04 -0500
Subject: [PATCH 48/49] fixed issue 1102, thanks howesc

---
 VERSION       | 2 +-
 gaehandler.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 51c3ddfc..291cb1bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-20 10:11:05) dev
+Version 2.1.1 (2012-10-20 10:12:01) dev
diff --git a/gaehandler.py b/gaehandler.py
index b039d40b..30c49ecc 100755
--- a/gaehandler.py
+++ b/gaehandler.py
@@ -78,6 +78,12 @@ def wsgiapp(env, res):
     """Return the wsgiapp"""
     env['PATH_INFO'] = env['PATH_INFO'].decode('latin1').encode('utf8')
 
+    #when using the blobstore image uploader GAE dev SDK passes these as unicode
+    # they should be regular strings as they are parts of URLs
+    env['wsgi.url_scheme'] = str(env['wsgi.url_scheme'])
+    env['QUERY_STRING'] = str(env['QUERY_STRING'])
+    env['SERVER_NAME'] = str(env['SERVER_NAME'])
+
     #this deals with a problem where GAE development server seems to forget
     # the path between requests
     if global_settings.web2py_runtime == 'gae:development':

From 0f446833c09ff42ebe184ceaae004fe9686b45a3 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 20 Oct 2012 15:27:13 -0500
Subject: [PATCH 49/49] assign_task takes better care for group_names, thanks
 Niphlod

---
 VERSION            |  2 +-
 gluon/scheduler.py | 71 +++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/VERSION b/VERSION
index 291cb1bc..827cea5a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-20 10:12:01) dev
+Version 2.1.1 (2012-10-20 15:27:09) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 1e986ad8..0495d01c 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -558,7 +558,7 @@ class Scheduler(MetaScheduler):
 
     def pop_task(self):
         now = self.now()
-        db, ts = self.db, self.db.scheduler_task
+        db, st = self.db, self.db.scheduler_task
         if self.is_a_ticker and self.do_assign_tasks:
             #I'm a ticker, and 5 loops passed without reassigning tasks, let's do
             #that and loop again
@@ -573,10 +573,10 @@ class Scheduler(MetaScheduler):
                     logger.error('TICKER: error assigning tasks')
             return None
         db.commit()
-        grabbed = db(ts.assigned_worker_name == self.worker_name)(
-            ts.status == ASSIGNED)
+        grabbed = db(st.assigned_worker_name == self.worker_name)(
+            st.status == ASSIGNED)
 
-        task = grabbed.select(limitby=(0, 1), orderby=ts.next_run_time).first()
+        task = grabbed.select(limitby=(0, 1), orderby=st.next_run_time).first()
         if task:
             task.update_record(status=RUNNING, last_run_time=now)
             #noone will touch my task!
@@ -770,7 +770,7 @@ class Scheduler(MetaScheduler):
 
     def assign_tasks(self):
         db = self.db
-        sw, ts = db.scheduler_worker, db.scheduler_task
+        sw, st = db.scheduler_worker, db.scheduler_task
         now = self.now()
         all_workers = db(sw.status == ACTIVE).select()
         #build workers as dict of groups
@@ -784,45 +784,46 @@ class Scheduler(MetaScheduler):
                 else:
                     wkgroups[gname]['workers'].append(
                         {'name': w.worker_name, 'c': 0})
-        #set queued tasks that expired between "runs" (i.e., you turned off)
-        #the scheduler and then it wasn't expired, but now it is
-        db(ts.status.belongs(
-            (QUEUED, ASSIGNED)))(ts.stop_time < now).update(status=EXPIRED)
+        #set queued tasks that expired between "runs" (i.e., you turned off
+        #the scheduler): then it wasn't expired, but now it is
+        db(st.status.belongs(
+            (QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED)
 
-        all_available = db(ts.status.belongs((QUEUED, ASSIGNED)))((ts.times_run < ts.repeats) | (ts.repeats == 0))(ts.start_time <= now)((ts.stop_time is None) | (ts.stop_time > now))(ts.next_run_time <= now)(ts.enabled == True)
-
-        limit = len(all_workers) * 50
-        #if there are a moltitude of tasks, let's assign a maximum of 50 tasks per worker.
+        all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time is None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True)
+        limit = len(all_workers) * (50 / len(wkgroups))
+        #if there are a moltitude of tasks, let's figure out a maximum of tasks per worker.
         #this can be adjusted with some added intelligence (like esteeming how many tasks will
         #a worker complete before the ticker reassign them around, but the gain is quite small
         #50 is quite a sweet spot also for fast tasks, with sane heartbeat values
         #NB: ticker reassign tasks every 5 cycles, so if a worker completes his 50 tasks in less
         #than heartbeat*5 seconds, it won't pick new tasks until heartbeat*5 seconds pass.
-        tasks = all_available.select(
-            limitby=(0, limit), orderby=ts.next_run_time)
-        #everything until now is going fine. If a worker is currently elaborating a long task,
-        #all other tasks assigned to him needs to be reassigned "freely" to other workers, that may be free.
+
+        #If a worker is currently elaborating a long task, all other tasks assigned
+        #to him needs to be reassigned "freely" to other workers, that may be free.
         #this shuffles up things a bit, in order to maintain the idea of a semi-linear scalability
+
         #let's freeze it up
         db.commit()
-        #let's break up the queue evenly among workers
-
-        for task in tasks:
-            gname = task.group_name
-            ws = wkgroups.get(gname)
-            if ws:
-                counter = 0
-                myw = 0
-                for i, w in enumerate(ws['workers']):
-                    if w['c'] < counter:
-                        myw = i
-                    counter = w['c']
-                d = dict(status=ASSIGNED,
-                         assigned_worker_name=wkgroups[gname]['workers'][myw]['name'])
-                if not task.task_name:
-                    d['task_name'] = task.function_name
-                task.update_record(**d)
-                wkgroups[gname]['workers'][myw]['c'] += 1
+        for group in wkgroups.keys():
+            tasks = all_available(st.group_name == group).select(
+                limitby=(0, limit), orderby=st.next_run_time)
+            #let's break up the queue evenly among workers
+            for task in tasks:
+                gname = task.group_name
+                ws = wkgroups.get(gname)
+                if ws:
+                    counter = 0
+                    myw = 0
+                    for i, w in enumerate(ws['workers']):
+                        if w['c'] < counter:
+                            myw = i
+                        counter = w['c']
+                    d = dict(status=ASSIGNED,
+                             assigned_worker_name=wkgroups[gname]['workers'][myw]['name'])
+                    if not task.task_name:
+                        d['task_name'] = task.function_name
+                    task.update_record(**d)
+                    wkgroups[gname]['workers'][myw]['c'] += 1
 
         db.commit()
         #I didn't report tasks but I'm working nonetheless!!!!