diff --git a/example.py b/example.py index 6efc835..2e3823d 100644 --- a/example.py +++ b/example.py @@ -1,10 +1,10 @@ from __future__ import unicode_literals -import ipdb,sys +import ipdb_py,sys def test_free(): - db = ipdb.City("c:/work/ipdb/mydata4vipweek2.ipdb") + db = ipdb_py.City("c:/work/ipdb/mydata4vipweek2.ipdb") print(db.is_ipv4(), db.is_ipv6()) print(db.languages()) print(db.fields()) @@ -22,7 +22,7 @@ def test_free(): def test_city_ipv4(): - db = ipdb.City("c:/tiantexin/download/mydata4vipday4_cn.ipdb") + db = ipdb_py.City("c:/tiantexin/download/mydata4vipday4_cn.ipdb") print(db.is_ipv4(), db.is_ipv6()) print(db.languages()) print(db.fields()) @@ -33,7 +33,7 @@ def test_city_ipv4(): def test_city_ipv6(): - db = ipdb.City("c:/work/ipdb/city.ipv6.ipdb") + db = ipdb_py.City("c:/work/ipdb/city.ipv6.ipdb") print(db.is_ipv4(), db.is_ipv6()) print(db.languages()) print(db.fields()) @@ -47,7 +47,7 @@ def test_city_ipv6(): def test_district(): - db = ipdb.District("c:/work/ipdb/china_district.ipdb") + db = ipdb_py.District("c:/work/ipdb/china_district.ipdb") print(db.is_ipv4(), db.is_ipv6()) print(db.languages()) print(db.fields()) @@ -56,21 +56,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 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 ipdb_py.IPNotFound as e: # ip not found print(e) - except ipdb.DatabaseError as e: # database file size error + except 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 = ipdb_py.BaseStation("c:/work/ipdb/base_station.ipdb") print(db.is_ipv4(), db.is_ipv6()) print(db.languages()) print(db.fields()) @@ -79,7 +79,7 @@ def test_base_station(): def test_idc_list(): - db = ipdb.IDC("c:/work/ipdb/idc_list.ipdb") + db = 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")) diff --git a/ipdb/__init__.py b/ipdb_py/__init__.py similarity index 100% rename from ipdb/__init__.py rename to ipdb_py/__init__.py diff --git a/ipdb/base_station.py b/ipdb_py/base_station.py similarity index 100% rename from ipdb/base_station.py rename to ipdb_py/base_station.py diff --git a/ipdb/city.py b/ipdb_py/city.py similarity index 100% rename from ipdb/city.py rename to ipdb_py/city.py diff --git a/ipdb/database.py b/ipdb_py/database.py similarity index 100% rename from ipdb/database.py rename to ipdb_py/database.py diff --git a/ipdb/district.py b/ipdb_py/district.py similarity index 100% rename from ipdb/district.py rename to ipdb_py/district.py diff --git a/ipdb/exceptions.py b/ipdb_py/exceptions.py similarity index 100% rename from ipdb/exceptions.py rename to ipdb_py/exceptions.py diff --git a/ipdb/idc.py b/ipdb_py/idc.py similarity index 100% rename from ipdb/idc.py rename to ipdb_py/idc.py diff --git a/ipdb/util.py b/ipdb_py/util.py similarity index 100% rename from ipdb/util.py rename to ipdb_py/util.py diff --git a/ipdb_test.py b/ipdb_test.py index e8ede7c..3f1b429 100644 --- a/ipdb_test.py +++ b/ipdb_test.py @@ -1,12 +1,12 @@ import unittest -import ipdb +import 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 = 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,7 +18,7 @@ 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 = 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 @@ -26,13 +26,13 @@ def test_district(self): 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 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 = 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 @@ -40,7 +40,7 @@ def test_station(self): 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 ipdb_py.IPNotFound as e: print(ip_address, e) print("\n\ntest base_station end\n\n") diff --git a/setup.py b/setup.py index 752ce1e..22f8a0d 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ maintainer='frk', maintainer_email='frk@ipip.net', license='Apache License Version 2.0', - packages=['ipdb'], + packages=['ipdb_py'], platforms=["all"], url='https://github.com/ipipdotnet/ipdb-python', classifiers=[