Do not require backports.csv on Python3 #280

Signed-off-by: Philippe Ombredanne <[email protected]>
Do not subclass csv.DictReader on Python 3 #280

Signed-off-by: Philippe Ombredanne <[email protected]>
Do not require backports.csv on Python3 #280

Signed-off-by: Philippe Ombredanne <[email protected]>
Do not require backports.csv on Python3 #280

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

Use proper subclass of csv.DictReader on Python 2 #280

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

Author: pombredanne

etc/conf/base.txt

@@ -16,8 +16,6 @@ six
 
 pyyaml==3.12
 
-backports.csv==1.0.5
-
 # license expression support
 license_expression
 boolean.py

setup.py

@@ -84,11 +84,14 @@ def read(*names, **kwargs):
     install_requires=[
         'jinja2 >= 2.9, < 3.0',
         'click >= 6.7, < 7.0',
-        'backports.csv;python_version<"3.6"',
+        "backports.csv ; python_version<'3.6'",
         'pyyaml >= 3.11, < 3.13',
         'boolean.py >= 3.5, < 4.0',
         'license_expression >= 0.94, < 1.0',
     ],
+    extras_require={
+    ":python_version < '3.6'": ['backports.csv'],
+    },
     entry_points={
         'console_scripts': [
             'about-code=attributecode.cmd:cli',

src/attributecode/util.py

@@ -235,17 +235,40 @@ def resource_name(path):
     return right.strip()
 
 
-class OrderedDictReader(csv.DictReader):
-    """
-    A DictReader that return OrderedDicts
-    """
-    def next(self):
-        row_dict = next(self)
-        result = OrderedDict()
-        # reorder based on fieldnames order
-        for name in self.fieldnames:
-            result[name] = row_dict[name]
-        return result
+# Python 3
+OrderedDictReader = csv.DictReader
+
+if sys.version_info[0] < 3:
+    # Python 2
+    class OrderedDictReader(csv.DictReader):
+        """
+        A DictReader that return OrderedDicts
+        Copied from csv.DictReader itself backported from Python 3
+        license: python
+        """
+        def __next__(self):
+            if self.line_num == 0:
+                # Used only for its side effect.
+                self.fieldnames
+            row = next(self.reader)
+            self.line_num = self.reader.line_num
+    
+            # unlike the basic reader, we prefer not to return blanks,
+            # because we will typically wind up with a dict full of None
+            # values
+            while row == []:
+                row = next(self.reader)
+            d = OrderedDict(zip(self.fieldnames, row))
+            lf = len(self.fieldnames)
+            lr = len(row)
+            if lf < lr:
+                d[self.restkey] = row[lf:]
+            elif lf > lr:
+                for key in self.fieldnames[lr:]:
+                    d[key] = self.restval
+            return d
+
+        next = __next__
 
 
 def get_mapping(location=None):