feat: 修改包名冲突问题

README.md

@@ -5,7 +5,7 @@ IPIP.net officially supported IP database ipdb format parsing library
 
 ## Installing
 <pre>
-<code>pip install ipip-ipdb</code>
+<code>pip install ipip-ipdb-py</code>
 </pre>
 
 ## Dependents ( python 2.x or before python 3.3 )
@@ -14,9 +14,9 @@ IPIP.net officially supported IP database ipdb format parsing library
 ## Code Example
 ### 适用于IPDB格式
   <pre><code>
-import ipdb
+import ipip_ipdb_py
 
-db = ipdb.City("/path/to/city.ipv4.ipdb")
+db = ipip_ipdb_py.City("/path/to/city.ipv4.ipdb")
 # db.reload("/path/to/city.ipv4.ipdb") # update ipdb database file reload data
 print(db.is_ipv4(), db.is_ipv6())
 print(db.languages()) # support language
@@ -55,9 +55,9 @@ anycast : ANYCAST
 
 ### 适用于IPDB格式的中国地区 IPv4 区县库
   <pre>
-import ipdb
+import ipip_ipdb_py
 
-db = ipdb.District("/path/to/china_district.ipdb")
+db = ipip_ipdb_py.District("/path/to/china_district.ipdb")
 print(db.is_ipv4(), db.is_ipv6())
 print(db.languages())
 print(db.fields())
@@ -69,8 +69,8 @@ print(db.find_info("1.12.13.255", "CN").country_name)
 
 ### 适用于IPDB格式的 IDC 库
 <pre>
-import ipdb
->>> db = ipdb.IDC("/path/to/idc_list.ipdb") 
+import ipip_ipdb_py
+>>> db = ipip_ipdb_py.IDC("/path/to/idc_list.ipdb") 
 >>> print db.find_info(u"8.142.10.33", "CN").isp_domain
 aliyun.com
 >>> print db.find_info(u"8.142.10.33", "CN").idc
@@ -79,8 +79,8 @@ IDC
 
 ### 适用于IPDB格式的基站 IPv4 库
 <pre>
-import ipdb
-db = ipdb.BaseStation("/path/to/base_station.ipdb")
+import ipip_ipdb_py
+db = ipip_ipdb_py.BaseStation("/path/to/base_station.ipdb")
 print(db.is_ipv4(), db.is_ipv6())
 print(db.languages())
 print(db.fields())

README_en.md

@@ -5,17 +5,17 @@ IPIP.net officially supported IP database ipdb format parsing library
 
 ## Installing
 <pre>
-<code>pip install ipip-ipdb</code>
+<code>pip install ipip-ipdb-py</code>
 </pre>
 
 ## Dependents ( python 2.x or before python 3.3 )
 <pre><code>pip install ipaddress</code></pre>
 
 ## Code Example
   <pre><code>
-import ipdb
+import ipip_ipdb_py
 
-db = ipdb.City("/path/to/city.ipv4.ipdb")
+db = ipip_ipdb_py.City("/path/to/city.ipv4.ipdb")
 # db.reload("/path/to/city.ipv4.ipdb") # update ipdb database file reload data
 print(db.is_ipv4(), db.is_ipv6())
 print(db.languages()) # support language
@@ -54,9 +54,9 @@ anycast : ANYCAST label
 
 ### IPDB CN District sample code :
   <pre>
-import ipdb
+import ipip_ipdb_py
 
-db = ipdb.District("/path/to/china_district.ipdb")
+db = ipip_ipdb_py.District("/path/to/china_district.ipdb")
 print(db.is_ipv4(), db.is_ipv6())
 print(db.languages())
 print(db.fields())
@@ -68,8 +68,8 @@ print(db.find_info("1.12.13.255", "CN").country_name)
 
 ### IPDB Basestation sample code :
 <pre>
-import ipdb
-db = ipdb.BaseStation("/path/to/base_station.ipdb")
+import ipip_ipdb_py
+db = ipip_ipdb_py.BaseStation("/path/to/base_station.ipdb")
 print(db.is_ipv4(), db.is_ipv6())
 print(db.languages())
 print(db.fields())

example.py

@@ -1,18 +1,18 @@
 from  __future__ import unicode_literals
-import ipdb,sys
+import ipip_ipdb_py,sys
 
 import pandas as pd
 
 def test_city_district():
-    db = ipdb.City("c:/work/ipdb/test.ipdb")
+    db = ipip_ipdb_py.City("c:/work/ipdb/test.ipdb")
     print(db.fields())
     city = db.find_info(u"111.199.81.160", "CN")
     qx = city.get_district()
     if qx != None:
         print(qx.city_name, qx.district_name)
 
 def test_free():
-    db = ipdb.City("c:/work/ipdb/mydata4vipweek2.ipdb")
+    db = ipip_ipdb_py.City("c:/work/ipdb/mydata4vipweek2.ipdb")
     print(db.is_ipv4(), db.is_ipv6())
     print(db.languages())
     print(db.fields())
@@ -30,7 +30,7 @@ def test_free():
 
 
 def test_city_ipv4():
-    db = ipdb.City("c:/tiantexin/download/mydata4vipday4_cn.ipdb")
+    db = ipip_ipdb_py.City("c:/tiantexin/download/mydata4vipday4_cn.ipdb")
     print(db.is_ipv4(), db.is_ipv6())
     print(db.languages())
     print(db.fields())
@@ -43,15 +43,15 @@ def test_city_ipv4():
 
 def test_city_ipv6_test():
 
-    db = ipdb.City("c:/work/ipdb/mydata6vipday2.ipdb")
+    db = ipip_ipdb_py.City("c:/work/ipdb/mydata6vipday2.ipdb")
 
     print(db.find("2001:44c8:4644:1191:3c41:724d:e391:51b0", "CN"))
     print(db.find_map("2a04:3543:1000:2310:ecb3:3eff:fef0:20e1", "CN"))
     print(db.find_info("2a04:3543:1000:2310:ecb3:3eff:fef0:20e1", "CN").country_name)
 
 def test_city_ipv6():
-    db4 = ipdb.City("c:/tiantexin/download/mydata4vipday4_cn.ipdb")
-    db = ipdb.City("c:/work/ipdb/mydata6vipday2.ipdb")
+    db4 = ipip_ipdb_py.City("c:/tiantexin/download/mydata4vipday4_cn.ipdb")
+    db = ipip_ipdb_py.City("c:/work/ipdb/mydata6vipday2.ipdb")
 
     df = pd.read_csv("C:\\Users\\GAOCHUNHUI\\Documents\\WeChat Files\\daxime\\FileStorage\\File\\2019-10\\ipiptest\\ip_data.csv")
     for i, row in df.iterrows():
@@ -68,7 +68,7 @@ def test_city_ipv6():
 
 
 def test_district():
-    db = ipdb.District("c:/work/ipdb/china_district.ipdb")
+    db = ipip_ipdb_py.District("c:/work/ipdb/china_district.ipdb")
     print(db.is_ipv4(), db.is_ipv6())
     print(db.languages())
     print(db.fields())
@@ -77,21 +77,21 @@ def test_district():
         for B in range (255):
             try:
                 print(db.find("%d.%d.114.144" % (A, B), "CN"))
-            except ipdb.IPNotFound as e:
+            except ipip_ipdb_py.IPNotFound as e:
                 print(e)
 
     try:
         print(db.find("1.1.1.1", "CN"))
-    except ipdb.IPNotFound as e: # ip not found
+    except ipip_ipdb_py.IPNotFound as e: # ip not found
         print(e)
-    except ipdb.DatabaseError as e: # database file size error
+    except ipip_ipdb_py.DatabaseError as e: # database file size error
         print(e)
     print(db.find_map("1.12.13.255", "CN"))
     print(db.find_info("1.12.13.255", "CN").country_name)
 
 
 def test_base_station():
-    db = ipdb.BaseStation("c:/work/ipdb/base_station.ipdb")
+    db = ipip_ipdb_py.BaseStation("c:/work/ipdb/base_station.ipdb")
     print(db.is_ipv4(), db.is_ipv6())
     print(db.languages())
     print(db.fields())
@@ -100,7 +100,7 @@ def test_base_station():
 
 
 def test_idc_list():
-    db = ipdb.IDC("c:/work/ipdb/idc_list.ipdb")
+    db = ipip_ipdb_py.IDC("c:/work/ipdb/idc_list.ipdb")
     print(db.find_map("1.1.1.1", "CN"))
     print(db.find_map("8.8.8.8", "CN"))
 

ipdb_test.py

@@ -1,12 +1,12 @@
 import unittest
 
-import ipdb
+import ipip_ipdb_py
 
 class TestIPDb(unittest.TestCase):
 
     def test_city(self):
         print("\n\ntest city start\n\n")
-        city = ipdb.City("c:/work/ipdb/city.ipv4.ipdb")
+        city = ipip_ipdb_py.City("c:/work/ipdb/city.ipv4.ipdb")
         print("ipdb.build.time:", city.build_time())
         for A in range(224):
             ip_address = u"%d.28.1.1" % A
@@ -18,29 +18,29 @@ def test_city(self):
 
     def test_district(self):
         print("\n\ntest district start\n\n")
-        district = ipdb.District("c:/work/ipdb/china_district.ipdb")
+        district = ipip_ipdb_py.District("c:/work/ipdb/china_district.ipdb")
         print("ipdb.build.time:", district.build_time())
         for A in range(224):
             ip_address = u"%d.28.1.1" % A
             try:
                 print(ip_address, district.find(ip_address, "CN"))
                 print(ip_address, district.find_map(ip_address, "CN"))
                 print(ip_address, district.find_info(ip_address, "CN"))
-            except ipdb.IPNotFound as e:
+            except ipip_ipdb_py.IPNotFound as e:
                 print(ip_address, e)
         print("\n\ntest district end\n\n")
 
     def test_station(self):
         print("\n\ntest base_station start\n\n")
-        base_station = ipdb.BaseStation("c:/work/ipdb/base_station.ipdb")
+        base_station = ipip_ipdb_py.BaseStation("c:/work/ipdb/base_station.ipdb")
         print("ipdb.build.time:", base_station.build_time())
         for A in range(224):
             ip_address = u"%d.28.1.1" % A
             try:
                 print(ip_address, base_station.find(ip_address, "CN"))
                 print(ip_address, base_station.find_map(ip_address, "CN"))
                 print(ip_address, base_station.find_info(ip_address, "CN"))
-            except ipdb.IPNotFound as e:
+            except ipip_ipdb_py.IPNotFound as e:
                 print(ip_address, e)
         print("\n\ntest base_station end\n\n")
 

setup.py

@@ -3,8 +3,8 @@
 from setuptools import setup
 
 setup(
-    name='ipip-ipdb',
-    version="1.6.0",
+    name='ipip-ipdb-py',
+    version="1.0.0",
     description=(
         'IPIP.net officially supported IP database ipdb format parsing library'
     ),
@@ -13,7 +13,7 @@
     maintainer='frk',
     maintainer_email='[email protected]',
     license='Apache License Version 2.0',
-    packages=['ipdb'],
+    packages=['ipip_ipdb_py'],
     platforms=["all"],
     url='https://github.com/ipipdotnet/ipdb-python',
     classifiers=[