Merge pull request #434 from BuhtigithuB/patch-3

PEP8 improvements white space here and there

gluon/globals.py

@@ -76,6 +76,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>'
 
+
 # IMPORTANT:
 # this is required so that pickled dict(s) and class.__dict__
 # are sorted and web2py can detect without ambiguity when a session changes
@@ -88,12 +89,14 @@ class SortingPickler(Pickler):
 SortingPickler.dispatch = copy.copy(Pickler.dispatch)
 SortingPickler.dispatch[DictionaryType] = SortingPickler.save_dict
 
+
 def sorting_dumps(obj, protocol=None):
     file = cStringIO.StringIO()
     SortingPickler(file, protocol).dump(obj)
     return file.getvalue()
 # END #####################################################################
 
+
 def copystream_progress(request, chunk_size=10 ** 5):
     """
     Copies request.env.wsgi_input into request.body
@@ -140,6 +143,7 @@ def copystream_progress(request, chunk_size=10 ** 5):
     cache_ram(cache_key + ':uploaded', None)
     return dest
 
+
 class Request(Storage):
 
     """
@@ -184,7 +188,6 @@ class Request(Storage):
         self.is_local = False
         self.global_settings = settings.global_settings
 
-
     def parse_get_vars(self):
         """Takes the QUERY_STRING and unpacks it to get_vars
         """
@@ -497,8 +500,7 @@ class Response(Storage):
                     s += js_inline % item[1]
         self.write(s, escape=False)
 
-    def stream(
+    def stream(self,
-        self,
                stream,
                chunk_size=DEFAULT_CHUNK_SIZE,
                request=None,
@@ -603,7 +605,7 @@ class Response(Storage):
             raise HTTP(404)
         headers = self.headers
         headers['Content-Type'] = contenttype(name)
-        if download_filename == None:
+        if download_filename is None:
             download_filename = filename
         if attachment:
             headers['Content-Disposition'] = \
@@ -646,8 +648,7 @@ class Response(Storage):
         dbtables = {}
         infos = DAL.get_instances()
         for k, v in infos.iteritems():
-            dbstats.append(TABLE(*[TR(PRE(row[0]),'%.2fms' %
+            dbstats.append(TABLE(*[TR(PRE(row[0]), '%.2fms' % (row[1]*1000))
-                                          (row[1]*1000))
                                    for row in v['dbstats']]))
             dbtables[k] = dict(defined=v['dbtables']['defined'] or '[no defined tables]',
                                lazy=v['dbtables']['lazy'] or '[no lazy tables]')
@@ -717,8 +718,7 @@ class Session(Storage):
     - session_filename
     """
 
-    def connect(
+    def connect(self,
-        self,
                 request=None,
                 response=None,
                 db=None,
@@ -785,8 +785,8 @@ class Session(Storage):
             # why do we do this?
             # because connect may be called twice, by web2py and in models.
             # the first time there is no db yet so it should do nothing
-            if (global_settings.db_sessions is True or
+            if (global_settings.db_sessions is True
-                masterapp in global_settings.db_sessions):
+                    or masterapp in global_settings.db_sessions):
                 return
 
         if response.session_storage_type == 'cookie':
@@ -921,7 +921,6 @@ class Session(Storage):
         if self.flash:
             (response.flash, self.flash) = (self.flash, None)
 
-
     def renew(self, clear_session=False):
 
         if clear_session:
@@ -1084,12 +1083,12 @@ class Session(Storage):
         # don't save if file-based sessions,
         # no session id, or session being forgotten
         # or no changes to session (Unless the session is new)
-        if (not response.session_db_table or 
+        if (not response.session_db_table
-            self._forget or 
+                or self._forget
-            (self._unchanged(response) and not response.session_new)):
+                or (self._unchanged(response) and not response.session_new)):
-            if (not response.session_db_table and
+            if (not response.session_db_table
-                global_settings.db_sessions is not True and
+                    and global_settings.db_sessions is not True
-                response.session_masterapp in global_settings.db_sessions):
+                    and response.session_masterapp in global_settings.db_sessions):
                 global_settings.db_sessions.remove(response.session_masterapp)
             # self.clear_session_cookies()
             self.save_session_id_cookie()
@@ -1137,7 +1136,8 @@ class Session(Storage):
             if response.session_new or not response.session_file:
                 # 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)
+                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