Merge tag 'upstream/2015.05.15'

[youtubedl] / devscripts / check-porn.py

diff --git a/devscripts/check-porn.py b/devscripts/check-porn.py
index 216282712c1b38b96c049f74a6cfe8a0fcd30806..7a219ebe97c555be79a55cf4dc30bf2cb823ca28 100644 (file)
--- a/devscripts/check-porn.py
+++ b/devscripts/check-porn.py
@@ -28,7 +28,7 @@ for test in get_testcases():
     if METHOD == 'EURISTIC':
         try:
             webpage = compat_urllib_request.urlopen(test['url'], timeout=10).read()
     if METHOD == 'EURISTIC':
         try:
             webpage = compat_urllib_request.urlopen(test['url'], timeout=10).read()

-        except:
+        except Exception:

             print('\nFail: {0}'.format(test['name']))
             continue
 
             print('\nFail: {0}'.format(test['name']))
             continue
 


@@ -45,12 +45,12 @@ for test in get_testcases():
 
         RESULT = ('.' + domain + '\n' in LIST or '\n' + domain + '\n' in LIST)
 
 
         RESULT = ('.' + domain + '\n' in LIST or '\n' + domain + '\n' in LIST)
 

-    if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict']
-                   or test['info_dict']['age_limit'] != 18):
+    if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict'] or
+                   test['info_dict']['age_limit'] != 18):

         print('\nPotential missing age_limit check: {0}'.format(test['name']))
 
         print('\nPotential missing age_limit check: {0}'.format(test['name']))
 

-    elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict']
-                         and test['info_dict']['age_limit'] == 18):
+    elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict'] and
+                         test['info_dict']['age_limit'] == 18):

         print('\nPotential false negative: {0}'.format(test['name']))
 
     else:
         print('\nPotential false negative: {0}'.format(test['name']))
 
     else: