R-2.9.12

gluon/tests/fix_path.py

@@ -27,4 +27,4 @@ def fix_sys_path(current_path):
              os.path.abspath(os.path.join(path, 'site-packages')),
              os.path.abspath(os.path.join(path, 'gluon')),
              '']
-    [add_path_first(path) for path in paths]
+    [add_path_first(path) for path in paths]

gluon/tests/test_contribs.py

@@ -65,7 +65,7 @@ class TestContribs(unittest.TestCase):
         self.assertEqual(myappconfig.take('config3.key1', cast=int), '1')
 
         self.assertEqual(myappconfig.take('config3.key2'), 2)
-        
+
         current.request = {}
 
 if __name__ == '__main__':

gluon/tests/test_dal_nosql.py

@@ -1388,7 +1388,7 @@ class TestQuoting(unittest.TestCase):
 
 class TestTableAndFieldCase(unittest.TestCase):
     """
-    at the Python level we should not allow db.C and db.c because of .table conflicts on windows 
+    at the Python level we should not allow db.C and db.c because of .table conflicts on windows
     but it should be possible to map two different names into distinct tables "c" and "C" at the Python level
     By default Python models names should be mapped into lower case table names and assume case insensitivity.
     """
@@ -1406,4 +1406,3 @@ class TestQuotesByDefault(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
     tearDownModule()
-

gluon/tests/test_router.py

@@ -131,7 +131,7 @@ class TestRouter(unittest.TestCase):
             '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').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/static" % root))
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
         try:
@@ -195,7 +195,7 @@ class TestRouter(unittest.TestCase):
                          norm_root('%s/applications/welcome/static/favicon.ico' % root))
         self.assertEqual(filter_url('http://domain.com/static/abc'),
                          norm_root('%s/applications/welcome/static/abc' % root))
-        self.assertEqual(filter_url('http://domain.com/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/static/path/to/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/static" % root))
         # outgoing
         self.assertEqual(filter_url(
@@ -1086,13 +1086,13 @@ class TestRouter(unittest.TestCase):
                         norm_root("%s/applications/admin/static/file" % root))
         self.assertEqual(filter_url('http://domain.com/en/static/file'),
                         norm_root("%s/applications/admin/static/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'),
                         norm_root("%s/applications/examples/static/en/file" % root))
         self.assertEqual(filter_url('http://domain.com/examples/static/file'),
                          norm_root("%s/applications/examples/static/en/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'),
                         norm_root("%s/applications/examples/static/it/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'),
                         norm_root("%s/applications/examples/static/file" % root))
 
         self.assertEqual(filter_url('https://domain.com/admin/ctr/fcn',
@@ -1188,19 +1188,19 @@ class TestRouter(unittest.TestCase):
                          norm_root("%s/applications/admin/static/file" % root))
         self.assertEqual(filter_url('http://domain.com/en/static/file'),
                          norm_root("%s/applications/admin/static/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/en/static/file'),
                         norm_root("%s/applications/examples/static/en/file" % root))
         self.assertEqual(filter_url('http://domain.com/examples/static/file'),
                         norm_root("%s/applications/examples/static/en/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it/static/file'),
                         norm_root("%s/applications/examples/static/it/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'), 
+        self.assertEqual(filter_url('http://domain.com/examples/it-it/static/file'),
                         norm_root("%s/applications/examples/static/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/static/en/file').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/examples/static/en/file').replace('/', os.sep),
                         norm_root("%s/applications/examples/static/en/file" % root))
         self.assertEqual(filter_url('http://domain.com/examples/static/it/file').replace('/', os.sep),
                         norm_root("%s/applications/examples/static/it/file" % root))
-        self.assertEqual(filter_url('http://domain.com/examples/static/it-it/file').replace('/', os.sep),  
+        self.assertEqual(filter_url('http://domain.com/examples/static/it-it/file').replace('/', os.sep),
                         norm_root("%s/applications/examples/static/it-it/file" % root))
 
     def test_router_get_effective(self):
@@ -1267,14 +1267,14 @@ class TestRouter(unittest.TestCase):
 
         '''
         load(rdict=dict())
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/static" % root))
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/==to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/-+=@$%%/static" % root))
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/.static')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/s..tatic')
@@ -1287,7 +1287,7 @@ class TestRouter(unittest.TestCase):
             ),
         )
         load(rdict=router_static)
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/#static" % root))
 
         router_static = dict(
@@ -1296,23 +1296,23 @@ class TestRouter(unittest.TestCase):
             ),
         )
         load(rdict=router_static)
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/static" % root))
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to/st~tic')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to--/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep),  
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/==to--/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/==to--/static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/-+=@$%/static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/-+=@$%%/static" % root))
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/to//static')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/#static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/#static" % root))
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/./static')
         self.assertRaises(HTTP, filter_url, 'http://domain.com/welcome/static/bad/path/../static')
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/.../static').replace('/', os.sep),  
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/.../static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/.../static" % root))
-        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/.static').replace('/', os.sep), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/.static').replace('/', os.sep),
             norm_root("%s/applications/welcome/static/path/to/.static" % root))
 
     def test_router_args(self):

gluon/tests/test_routes.py

@@ -108,7 +108,7 @@ class TestRoutes(unittest.TestCase):
             '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'), 
+        self.assertEqual(filter_url('http://domain.com/welcome/static/path/to/static'),
             norm_root("%s/applications/welcome/static/path/to/static" % root))
         # no more necessary since explcit check for directory traversal attacks
         """
@@ -174,7 +174,7 @@ default_application = 'defapp'
         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'),
                          norm_root('%s/applications/welcome/static/abc' % root))
-        self.assertEqual(filter_url('http://domain.com/defapp/static/path/to/static'), 
+        self.assertEqual(filter_url('http://domain.com/defapp/static/path/to/static'),
             norm_root("%s/applications/defapp/static/path/to/static" % root))
 
     def test_routes_raise(self):