Skip to content

Change pacakge name #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mapx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change pacakge name #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand All @@ -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"))

Expand Down
0 ipdb/__init__.py → ipdb_py/__init__.py
View file
Open in desktop
File renamed without changes.
0 ipdb/base_station.py → ipdb_py/base_station.py
View file
Open in desktop
File renamed without changes.
0 ipdb/city.py → ipdb_py/city.py
View file
Open in desktop
File renamed without changes.
0 ipdb/database.py → ipdb_py/database.py
View file
Open in desktop
File renamed without changes.
0 ipdb/district.py → ipdb_py/district.py
View file
Open in desktop
File renamed without changes.
0 ipdb/exceptions.py → ipdb_py/exceptions.py
View file
Open in desktop
File renamed without changes.
0 ipdb/idc.py → ipdb_py/idc.py
View file
Open in desktop
File renamed without changes.
0 ipdb/util.py → ipdb_py/util.py
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ipdb_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 = 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 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
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 ipdb_py.IPNotFound as e:
print(ip_address, e)
print("\n\ntest base_station end\n\n")

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down