wallento
diff --git a/‎data/sample.csv
Lines changed: 0 additions & 2 deletions b/‎data/sample.csv
Lines changed: 0 additions & 2 deletions
diff --git a/‎setup.py
Lines changed: 2 additions & 2 deletions b/‎setup.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎spdx/config.py
Lines changed: 13 additions & 20 deletions b/‎spdx/config.py
Lines changed: 13 additions & 20 deletions
diff --git a/‎spdx/spdx_licenselist.csv
Lines changed: 0 additions & 1 deletion b/‎spdx/spdx_licenselist.csv
Lines changed: 0 additions & 1 deletion
diff --git a/‎tests/test_unicodecsv.py
Lines changed: 0 additions & 29 deletions b/‎tests/test_unicodecsv.py
Lines changed: 0 additions & 29 deletions
@@ -13,7 +13,7 @@ def test_suite():
 
 setup(
     name='spdx-tools',
-    version='0.5.0',
+    version='0.5.1',
     description='SPDX parser and tools.',
     packages=['spdx', 'spdx.parsers', 'spdx.writers', 'spdx.parsers.lexers'],
     package_data={'spdx': ['spdx_licenselist.csv']},
@@ -23,7 +23,7 @@ def test_suite():
     install_requires=[
         'ply',
         'rdflib',
-        'six'
+        'six',
     ],
     entry_points={
         'console_scripts': [
 
@@ -14,31 +14,24 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import csv
+import codecs
 import os
 
 from spdx.version import Version
 
 
-class TwoWayDict(dict):
-
-    def __setitem__(self, key, value):
-        dict.__setitem__(self, key, value)
-        dict.__setitem__(self, value, key)
-
-    def __delitem__(self, key):
-        dict.__delitem__(self, self[key])
-        dict.__delitem__(self, key)
-
-
-def load_license_list():
-    file_name = os.path.join(os.path.dirname(__file__), 'spdx_licenselist.csv')
-    with open(file_name, 'r') as file_in:
-        reader = csv.DictReader(file_in)
-        dct = TwoWayDict()
-        for entry in reader:
-            dct[entry['Full name of License']] = entry['License Identifier']
-    return dct
+def load_license_list(file_name=os.path.join(os.path.dirname(__file__), 'spdx_licenselist.csv')):
+    """
+    Return a mapping of licenses name->id and id->name loaded from a
+    CSV file as "name,identifier"
+    """
+    licenses_map = {}
+    with codecs.open(file_name, 'rb', encoding='utf-8') as licenses:
+        for line in licenses:
+            name, identifier = line.strip().split(',')
+            licenses_map[name] = identifier
+            licenses_map[identifier] = name
+    return licenses_map
 
 
 LICENSE_MAP = load_license_list()
 
@@ -1,4 +1,3 @@
-Full name of License,License Identifier
 3dfx Glide License,Glide
 Abstyles License,Abstyles
 Academic Free License v1.1,AFL-1.1
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-Full name of License,License Identifier`
`2`	`1`	`3dfx Glide License,Glide`
`3`	`2`	`Abstyles License,Abstyles`
`4`	`3`	`Academic Free License v1.1,AFL-1.1`