View difference between Paste ID: XRP0UArw and L3JLXknq

-import sys
+import sys
-import csv
+import csv
-import logging
+import logging
-import os
+import os
-import shutil
+import shutil
-from optparse import OptionParser
+from optparse import OptionParser
-
+
-def main():
+def main():
-    parser = OptionParser(version='Blah')
+    merge('fields-new.csv', 'fields.csv', ['searge', 'name', 'notch', 'sig', 'notchsig', 'classname', 'classnotch', 'package', 'side'])
-    parser.add_option('-p', '--path', dest='path', help='The Method file')
+    merge('methods-new.csv', 'methods.csv', ['searge', 'name', 'notch', 'sig', 'notchsig', 'classname', 'classnotch', 'package', 'side'])
-    options, _ = parser.parse_args()
+
-    merge('../MCP-1.1.0-Clean/conf/fields.csv', '%s/conf/fields.csv'%options.path, ['searge', 'name', 'notch', 'sig', 'notchsig', 'classname', 'classnotch', 'package', 'side'])
+def merge(newFile, oldFile, sig):
-    merge('../MCP-1.1.0-Clean/conf/methods.csv', '%s/conf/methods.csv'%options.path, ['searge', 'name', 'notch', 'sig', 'notchsig', 'classname', 'classnotch', 'package', 'side'])
+        shutil.move(oldFile, '%s.back'%oldFile)
-
+        csv.register_dialect('csvstyle', delimiter=',', quoting=csv.QUOTE_ALL)
-def merge(newFile, oldFile, sig):
+        tCsv = csv.DictReader(open(newFile, 'rb'))
-        shutil.move(oldFile, '%s.back'%oldFile)
+        newCsv = []
-        csv.register_dialect('csvstyle', delimiter=',', quoting=csv.QUOTE_ALL)
+        for row in tCsv:
-        tCsv = csv.DictReader(open(newFile, 'rb'))
+            newCsv.append(row)
-        newCsv = []
+
-        for row in tCsv:
+        tCsv = csv.DictReader(open('%s.back'%oldFile, 'rb'))
-            newCsv.append(row)
+        oldCsv = []
-
+        for row in tCsv:
-        tCsv = csv.DictReader(open('%s.back'%oldFile, 'rb'))
+            oldCsv.append(row)
-        oldCsv = []
+
-        for row in tCsv:
+        for row1 in newCsv:
-            oldCsv.append(row)
+            for row2 in oldCsv:
-
+                if (row2['searge'] == row1['searge'] and row2['side'] == row1['side']):
-        for row1 in newCsv:
+                    row2['name'] = row1['name']
-            for row2 in oldCsv:
+
-                if (row2['searge'] == row1['searge'] and row2['side'] == row1['side']):
+        with open(oldFile, 'wb') as f:
-                    row2['name'] = row1['name']
+            writer = csv.DictWriter(f, sig, dialect='csvstyle')
-
+            writer.writerow(dict(zip(writer.fieldnames, writer.fieldnames)))
-        with open(oldFile, 'wb') as f:
+            writer.writerows(oldCsv)
-            writer = csv.DictWriter(f, sig, dialect='csvstyle')
+
-            writer.writerow(dict(zip(writer.fieldnames, writer.fieldnames)))
+        #os.remove('%s.back'%oldFile)
-            writer.writerows(oldCsv)
+
-
+if __name__ == '__main__':
-        #os.remove('%s.back'%oldFile)
+