Browse Source

Fix defects found by lgtm.com

adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
d52c6230e9
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 4
      src/searchengine/nova/helpers.py
  2. 8
      src/searchengine/nova/nova2.py
  3. 4
      src/searchengine/nova/nova2dl.py
  4. 6
      src/searchengine/nova/novaprinter.py
  5. 4
      src/searchengine/nova3/helpers.py
  6. 8
      src/searchengine/nova3/nova2.py
  7. 4
      src/searchengine/nova3/nova2dl.py

4
src/searchengine/nova/helpers.py

@ -1,4 +1,4 @@
#VERSION: 1.42 #VERSION: 1.43
# Author: # Author:
# Christophe DUMEZ (chris@qbittorrent.org) # Christophe DUMEZ (chris@qbittorrent.org)
@ -90,7 +90,7 @@ def retrieve_url(url):
charset = 'utf-8' charset = 'utf-8'
try: try:
ignore, charset = info['Content-Type'].split('charset=') ignore, charset = info['Content-Type'].split('charset=')
except: except Exception:
pass pass
dat = dat.decode(charset, 'replace') dat = dat.decode(charset, 'replace')
dat = htmlentitydecode(dat) dat = htmlentitydecode(dat)

8
src/searchengine/nova/nova2.py

@ -1,4 +1,4 @@
#VERSION: 1.42 #VERSION: 1.43
# Author: # Author:
# Fabien Devaux <fab AT gnux DOT info> # Fabien Devaux <fab AT gnux DOT info>
@ -77,7 +77,7 @@ def initialize_engines():
# bind class name # bind class name
globals()[engi] = getattr(engine_module, engi) globals()[engi] = getattr(engine_module, engi)
supported_engines.append(engi) supported_engines.append(engi)
except: except Exception:
pass pass
return supported_engines return supported_engines
@ -94,7 +94,7 @@ def engines_to_xml(supported_engines):
if hasattr(search_engine, "supported_categories"): if hasattr(search_engine, "supported_categories"):
supported_categories = " ".join((key supported_categories = " ".join((key
for key in search_engine.supported_categories.keys() for key in search_engine.supported_categories.keys()
if key is not "all")) if key != "all"))
yield "".join((tab, "<", short_name, ">\n", yield "".join((tab, "<", short_name, ">\n",
tab, tab, "<name>", search_engine.name, "</name>\n", tab, tab, "<name>", search_engine.name, "</name>\n",
@ -138,7 +138,7 @@ def run_search(engine_list):
else: else:
engine.search(what) engine.search(what)
return True return True
except: except Exception:
return False return False

4
src/searchengine/nova/nova2dl.py

@ -1,4 +1,4 @@
#VERSION: 1.21 #VERSION: 1.22
# Author: # Author:
# Christophe DUMEZ (chris@qbittorrent.org) # Christophe DUMEZ (chris@qbittorrent.org)
@ -45,7 +45,7 @@ for engine in engines:
exec("from engines.%s import %s" % (e, e)) exec("from engines.%s import %s" % (e, e))
exec("engine_url = %s.url" % e) exec("engine_url = %s.url" % e)
supported_engines[engine_url] = e supported_engines[engine_url] = e
except: except Exception:
pass pass
if __name__ == '__main__': if __name__ == '__main__':

6
src/searchengine/nova/novaprinter.py

@ -1,4 +1,4 @@
#VERSION: 1.46 #VERSION: 1.47
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met: # modification, are permitted provided that the following conditions are met:
@ -51,13 +51,13 @@ def anySizeToBytes(size_string):
# separate integer from unit # separate integer from unit
try: try:
size, unit = size_string.split() size, unit = size_string.split()
except: except Exception:
try: try:
size = size_string.strip() size = size_string.strip()
unit = ''.join([c for c in size if c.isalpha()]) unit = ''.join([c for c in size if c.isalpha()])
if len(unit) > 0: if len(unit) > 0:
size = size[:-len(unit)] size = size[:-len(unit)]
except: except Exception:
return -1 return -1
if len(size) == 0: if len(size) == 0:
return -1 return -1

4
src/searchengine/nova3/helpers.py

@ -1,4 +1,4 @@
#VERSION: 1.41 #VERSION: 1.42
# Author: # Author:
# Christophe DUMEZ (chris@qbittorrent.org) # Christophe DUMEZ (chris@qbittorrent.org)
@ -90,7 +90,7 @@ def retrieve_url(url):
charset = 'utf-8' charset = 'utf-8'
try: try:
ignore, charset = info['Content-Type'].split('charset=') ignore, charset = info['Content-Type'].split('charset=')
except: except Exception:
pass pass
dat = dat.decode(charset, 'replace') dat = dat.decode(charset, 'replace')
dat = htmlentitydecode(dat) dat = htmlentitydecode(dat)

8
src/searchengine/nova3/nova2.py

@ -1,4 +1,4 @@
#VERSION: 1.42 #VERSION: 1.43
# Author: # Author:
# Fabien Devaux <fab AT gnux DOT info> # Fabien Devaux <fab AT gnux DOT info>
@ -76,7 +76,7 @@ def initialize_engines():
# bind class name # bind class name
globals()[engi] = getattr(engine_module, engi) globals()[engi] = getattr(engine_module, engi)
supported_engines.append(engi) supported_engines.append(engi)
except: except Exception:
pass pass
return supported_engines return supported_engines
@ -93,7 +93,7 @@ def engines_to_xml(supported_engines):
if hasattr(search_engine, "supported_categories"): if hasattr(search_engine, "supported_categories"):
supported_categories = " ".join((key supported_categories = " ".join((key
for key in search_engine.supported_categories.keys() for key in search_engine.supported_categories.keys()
if key is not "all")) if key != "all"))
yield "".join((tab, "<", short_name, ">\n", yield "".join((tab, "<", short_name, ">\n",
tab, tab, "<name>", search_engine.name, "</name>\n", tab, tab, "<name>", search_engine.name, "</name>\n",
@ -138,7 +138,7 @@ def run_search(engine_list):
engine.search(what) engine.search(what)
return True return True
except: except Exception:
return False return False

4
src/searchengine/nova3/nova2dl.py

@ -1,4 +1,4 @@
#VERSION: 1.21 #VERSION: 1.22
# Author: # Author:
# Christophe DUMEZ (chris@qbittorrent.org) # Christophe DUMEZ (chris@qbittorrent.org)
@ -45,7 +45,7 @@ for engine in engines:
exec("from engines.%s import %s" % (e, e)) exec("from engines.%s import %s" % (e, e))
exec("engine_url = %s.url" % e) exec("engine_url = %s.url" % e)
supported_engines[engine_url] = e supported_engines[engine_url] = e
except: except Exception:
pass pass
if __name__ == '__main__': if __name__ == '__main__':

Loading…
Cancel
Save