Skip to content

Commit 25db6ed

Browse files
Fixed a bug in number_to_cidr function (#5)
1 parent 4b1710a commit 25db6ed

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

ip2location_csv_converter/ip2location_csv_converter.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,20 @@ def number_to_cidr(row, write_mode):
7070
remaining_columns += row[i] + '"'
7171
else:
7272
remaining_columns += row[i] + '","'
73-
if (write_mode == 'replace'):
74-
if remaining_columns == '':
75-
new_row = '"' + ar1[0] + "\"\n"
76-
else:
77-
new_row = '"' + ar1[0] + '","' + remaining_columns + "\n"
78-
# print (new_row)
79-
elif (write_mode == 'append'):
80-
if remaining_columns == '':
81-
new_row = '"' + row[0] + '","' + row[1] + '","' + ar1[0] + "\"\n"
82-
else:
83-
new_row = '"' + row[0] + '","' + row[1] + '","' + ar1[0] + '","' + remaining_columns + "\n"
84-
# print (new_row)
73+
new_row = ''
74+
for j in range(len(ar1)):
75+
if (write_mode == 'replace'):
76+
if remaining_columns == '':
77+
new_row += '"' + ar1[j] + "\"\n"
78+
else:
79+
new_row += '"' + ar1[j] + '","' + remaining_columns + "\n"
80+
# print (new_row)
81+
elif (write_mode == 'append'):
82+
if remaining_columns == '':
83+
new_row += '"' + row[0] + '","' + row[1] + '","' + ar1[j] + "\"\n"
84+
else:
85+
new_row += '"' + row[0] + '","' + row[1] + '","' + ar1[j] + '","' + remaining_columns + "\n"
86+
# print (new_row)
8587
except:
8688
print ("Skipped invalid (range) data record")
8789
return new_row

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setuptools.setup(
1212
name="ip2location-python-csv-converter",
13-
version="1.2.5",
13+
version="1.2.6",
1414
description="Python script to converts IP2Location CSV database into IP range or CIDR format.",
1515
long_description_content_type="text/markdown",
1616
long_description=long_description,

0 commit comments

Comments
 (0)