Do not test import for coverage

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/attributecode/__init__.py

@@ -23,9 +23,11 @@
 import os
 
 try:
-    unicode  # Python 2
-except NameError:
-    unicode = str  # Python 3 #NOQA
+    # Python 2
+    unicode
+except NameError:  # pragma: nocover
+    # Python 3 
+    unicode = str  #NOQA
 
 
 __version__ = '3.3.0'
@@ -53,17 +55,17 @@ class Error(namedtuple('Error', ['severity', 'message'])):
     def __new__(self, severity, message):
         if message:
             if isinstance(message, unicode):
-                message = clean_string(message)
+                message = self._clean_string(message)
             else:
-                message = clean_string(unicode(repr(message), encoding='utf-8'))
+                message = self._clean_string(unicode(repr(message), encoding='utf-8'))
                 message = message.strip('"')
 
         return super(Error, self).__new__(
             Error, severity, message)
 
     def __repr__(self, *args, **kwargs):
         sev = severities[self.severity]
-        msg = clean_string(repr(self.message))
+        msg = self._clean_string(repr(self.message))
         return 'Error(%(sev)s, %(msg)s)' % locals()
 
     def to_dict(self, *args, **kwargs):
@@ -72,26 +74,26 @@ def to_dict(self, *args, **kwargs):
         """
         return self._asdict()
 
-
-def clean_string(s):
-    """
-    Return a cleaned string for `s`, stripping eventual "u" prefixes
-    from unicode representations.
-    """
-    if not s:
+    @staticmethod
+    def _clean_string(s):
+        """
+        Return a cleaned string for `s`, stripping eventual "u" prefixes
+        from unicode representations.
+        """
+        if not s:
+            return s
+        if s.startswith(('u"', "u'")):
+            s = s.lstrip('u')
+        s = s.replace('[u"', '["')
+        s = s.replace("[u'", "['")
+        s = s.replace("(u'", "('")
+        s = s.replace("(u'", "('")
+        s = s.replace("{u'", "{'")
+        s = s.replace("{u'", "{'")
+        s = s.replace(" u'", " '")
+        s = s.replace(" u'", " '")
+        s = s.replace("\\\\", "\\")
         return s
-    if s.startswith(('u"', "u'")):
-        s = s.lstrip('u')
-    s = s.replace('[u"', '["')
-    s = s.replace("[u'", "['")
-    s = s.replace("(u'", "('")
-    s = s.replace("(u'", "('")
-    s = s.replace("{u'", "{'")
-    s = s.replace("{u'", "{'")
-    s = s.replace(" u'", " '")
-    s = s.replace(" u'", " '")
-    s = s.replace("\\\\", "\\")
-    return s
 
 
 # modeled after the logging levels

src/attributecode/__main__.py

@@ -19,6 +19,6 @@
 from __future__ import unicode_literals
 
 
-if __name__ == '__main__':
+if __name__ == '__main__': # pragma: nocover
     from attributecode import cmd
     cmd.cli()

src/attributecode/api.py

@@ -25,13 +25,13 @@
 from attributecode.util import python2
 
 
-if python2:
+if python2:  # pragma: nocover
     from urllib import quote  # NOQA
     from urllib import urlencode  # NOQA
     from urllib2 import HTTPError  # NOQA
     from urllib2 import Request  # NOQA
     from urllib2 import urlopen  # NOQA
-else:
+else:  # pragma: nocover
     from urllib.parse import quote  # NOQA
     from urllib.parse import urlencode  # NOQA
     from urllib.request import Request  # NOQA

src/attributecode/gen.py

@@ -41,9 +41,9 @@
 from attributecode.util import unique
 
 
-if python2:
+if python2:  # pragma: nocover
     import backports.csv as csv  # NOQA
-else:
+else:  # pragma: nocover
     import csv  # NOQA
 
 
@@ -100,7 +100,7 @@ def check_duplicated_about_file_path(inventory_dict):
                 afp_list.append(component['about_file_path'])
     return errors
 
-#TODO: this should be either the CSV or the ABOUT files but not both???
+# TODO: this should be either the CSV or the ABOUT files but not both???
 def load_inventory(location, base_dir, license_notice_text_location=None,
                     mapping_file=None):
     """

src/attributecode/model.py

@@ -37,14 +37,16 @@
 
 import yaml
 import re
-import sys
 
-if sys.version_info[0] < 3:  # Python 2
+from attributecode.util import python2
+
+
+if python2:  # pragma: nocover
     import backports.csv as csv  # NOQA
     from itertools import izip_longest as zip_longest  # NOQA
     from urlparse import urljoin, urlparse  # NOQA
     from urllib2 import urlopen, Request, HTTPError  # NOQA
-else:  # Python 3
+else:  # pragma: nocover
     basestring = str  # NOQA
     import csv  # NOQA
     from itertools import zip_longest  # NOQA

src/attributecode/util.py

@@ -34,10 +34,10 @@
 
 python2 = sys.version_info[0] < 3
 
-if python2:
+if python2:  # pragma: nocover
     import backports.csv as csv  # NOQA
     from itertools import izip_longest as zip_longest  # NOQA
-else:
+else:  # pragma: nocover
     import csv  # NOQA
     from itertools import zip_longest  # NOQA