Use different test expectation on Windows #310

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

Author: pombredanne

src/attributecode/__init__.py

@@ -22,9 +22,9 @@
 import logging
 
 try:
-    basestring  # Python 2
+    unicode  # Python 2
 except NameError:
-    basestring = str  # Python 3 #NOQA
+    unicode = str  # Python 3 #NOQA
 
 
 __version__ = '3.3.0'
@@ -52,10 +52,11 @@ class Error(namedtuple('Error', ['severity', 'message'])):
     """
     def __new__(self, severity, message):
         if message:
-            if isinstance(message, basestring):
+            if isinstance(message, unicode):
                 message = clean_string(message)
             else:
-                message = clean_string(repr(message))
+                message = clean_string(unicode(repr(message), encoding='utf-8'))
+                message = message.strip('"')
 
         return super(Error, self).__new__(
             Error, severity, message)

tests/test_util.py

@@ -226,8 +226,11 @@ def test_check_file_names_with_invalid_chars_return_errors(self):
             'locations/dir2/file1',
             'Accessibilité/ périmètre'
         ]
-
-        expected = [Error(CRITICAL, "Invalid characters 'éè' in file name at: 'Accessibilité/ périmètre'")]
+        import sys
+        if sys.version_info[0] < 3: #python2
+            expected = [Error(CRITICAL, b"Invalid characters '\xe9\xe8' in file name at: 'Accessibilit\xe9/ p\xe9rim\xe8tre'")]
+        else:
+            expected = [Error(CRITICAL, "Invalid characters 'éè' in file name at: 'Accessibilité/ périmètre'")]
         result = util.check_file_names(paths)
 
         assert expected[0].message == result[0].message