ignore difference in package naming

stonebig · stonebig · commit 0a784bd13e00 · 2015-01-25T13:42:17.000+01:00
(wheel replace '-' per '_' in package name
diff --git a/diff.py b/diff.py
@@ -55,8 +55,9 @@ def to_wiki(self):
                                              self.version, self.description)
 
     def upgrade_wiki(self, other):
-        assert self.name == other.name
-        return "  * [%s](%s) %s → %s (%s)\r\n" % (self.name, self.url,
+        # wheel replace '-' per '_' in key  
+        assert self.name.replace('-','_') == other.name.replace('-','_')
+        return "  * [%s](%s) %s  %s (%s)\r\n" % (self.name, self.url,
                                 other.version, self.version, self.description)
 
 
@@ -114,9 +115,16 @@ def from_text(self, text):
                         self.python_packages[package.name] = package
 
 
-def diff_package_dicts(dict1, dict2):
+def diff_package_dicts(dict1_in, dict2_in):
     """Return difference between package dict1 and package dict2"""
     text = ""
+    # wheel replace '-' per '_' in key        
+    dict1 = {} ; dict2 = {}
+    for key in dict1_in:
+        dict1[key.replace('-','_')] = dict1_in[key] 
+    for key in dict2_in:
+        dict2[key.replace('-','_')] = dict2_in[key]
+
     set1, set2 = set(dict1.keys()), set(dict2.keys())
     # New packages
     new = sorted(set2 - set1)
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -37,7 +37,9 @@ def get_package_metadata(database, name):
     metadata = dict(description='', url='http://pypi.python.org/pypi/' + name)
     for key in metadata:
         name1 = name.lower()
-        for name2 in (name1, name1.split('-')[0]):
+        # wheel replace '-' per '_' in key        
+        for name2 in (name1, name1.split('-')[0],
+            '_'.join(name1.split('-')[0:1])):
             try:
                 metadata[key] = db.get(name2, key)
                 break
