try/except import are now handled by flake8 2.0+ / pyflakes 0.6+

contrib/hds/export.py

@@ -21,7 +21,7 @@
 try:
     import sqlite3 as sqlite
 except ImportError, e:
-    from pysqlite2 import dbapi2 as sqlite  # NOQA
+    from pysqlite2 import dbapi2 as sqlite
 
 from weboob.core import Weboob
 from weboob.core.modules import ModuleLoadError

modules/gazelle/pages/torrents.py

@@ -25,7 +25,7 @@ from logging import warning, debug
 try:
     from urlparse import parse_qs
 except ImportError:
-    from cgi import parse_qs  # NOQA
+    from cgi import parse_qs
 
 from weboob.tools.misc import html2text, get_bytes_size
 from weboob.capabilities.torrent import Torrent

modules/ina/pages/video.py

@@ -23,7 +23,7 @@ import re
 try:
     from urlparse import parse_qs
 except ImportError:
-    from cgi import parse_qs  # NOQA
+    from cgi import parse_qs
 
 from weboob.capabilities import NotAvailable
 from weboob.tools.browser import BasePage, BrokenPageError

modules/kickass/pages.py

@@ -21,7 +21,7 @@
 try:
     from urlparse import parse_qs
 except ImportError:
-    from cgi import parse_qs  # NOQA
+    from cgi import parse_qs
 
 from urlparse import urlsplit
 

modules/radiofrance/browser.py

@@ -29,7 +29,7 @@ import re
 try:
     from urlparse import parse_qs
 except ImportError:
-    from cgi import parse_qs  # NOQA
+    from cgi import parse_qs
 
 
 __all__ = ['RadioFranceBrowser', 'RadioFranceVideo']

weboob/applications/masstransit/masstransit.py

@@ -43,7 +43,7 @@ try:
     import conic
 except ImportError:
     warning("conic is not found")
-    conic = FakeConic()  # NOQA
+    conic = FakeConic()
 
 
 from logging import debug

weboob/tools/application/formatters/iformatter.py

@@ -32,7 +32,7 @@ try:
 except ImportError:
     PROMPT = '--Press return to continue--'
 
-    def readch():  # NOQA
+    def readch():
         return sys.stdin.readline()
 else:
     PROMPT = '--Press a key to continue--'

weboob/tools/browser/firefox_cookies.py

@@ -21,7 +21,7 @@
 try:
     import sqlite3 as sqlite
 except ImportError, e:
-    from pysqlite2 import dbapi2 as sqlite  # NOQA
+    from pysqlite2 import dbapi2 as sqlite
 
 from mechanize import CookieJar, Cookie
 

weboob/tools/config/yamlconfig.py

@@ -29,8 +29,8 @@ try:
     from yaml import CLoader as Loader
     from yaml import CDumper as Dumper
 except ImportError:
-    from yaml import Loader  # NOQA
-    from yaml import Dumper  # NOQA
+    from yaml import Loader
+    from yaml import Dumper
 
 from .iconfig import IConfig, ConfigError
 

weboob/tools/json.py

@@ -27,4 +27,4 @@ try:
     import simplejson as json
 except ImportError:
     # Python 2.6+ has a module similar to simplejson
-    import json  # NOQA
+    import json

weboob/tools/ordereddict.py

@@ -22,15 +22,15 @@ try:
     from collections import OrderedDict
 except ImportError:
     try:
-        from simplejson import OrderedDict  # NOQA
+        from simplejson import OrderedDict
     except ImportError:
         try:
-            from ordereddict import OrderedDict  # NOQA
+            from ordereddict import OrderedDict
         except ImportError:
             ## {{{ http://code.activestate.com/recipes/576693/ (r6)
             from UserDict import DictMixin
 
-            class OrderedDict(dict, DictMixin):  # NOQA
+            class OrderedDict(dict, DictMixin):
                 def __init__(self, *args, **kwds):
                     if len(args) > 1:
                         raise TypeError('expected at most 1 arguments, got %d' % len(args))

weboob/tools/parsers/elementtidyparser.py

@@ -30,7 +30,7 @@ from elementtidy import TidyHTMLTreeBuilder
 try:
     from xml.etree import cElementTree as ElementTree
 except ImportError:
-    from xml.etree import ElementTree  # NOQA
+    from xml.etree import ElementTree
 
 from .iparser import IParser
 

weboob/tools/parsers/html5libparser.py

@@ -22,7 +22,7 @@ from html5lib import treebuilders, HTMLParser
 try:
     from xml.etree import cElementTree as ElementTree
 except ImportError:
-    from xml.etree import ElementTree  # NOQA
+    from xml.etree import ElementTree
 
 from .iparser import IParser
 

weboob/tools/parsers/htmlparser.py

@@ -23,7 +23,7 @@ import htmlentitydefs
 try:
     from xml.etree import cElementTree as ElementTree
 except ImportError:
-    from xml.etree import ElementTree  # NOQA
+    from xml.etree import ElementTree
 
 from .iparser import IParser