NotificationsYou must be signed in to change notification settings
Fork114
Star535

Commit2ff1abe

committed

fmt

1 parent769d753 commit2ff1abeCopy full SHA for 2ff1abe

File tree

3 files changed

+26

-26

lines changed

ipinfo

3 files changed

+26

-26

lines changed

`‎ipinfo/handler.py‎`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,15 @@ def __init__(self, access_token=None, **kwargs):`
`43`	`43`	`# load countries file`
`44`	`44`	`self.countries=handler_utils.read_country_names(`
`45`	`45`	`kwargs.get("countries_file")`
	`46`	`+ifkwargs.get("countries_file")`
	`47`	`+elseCOUNTRY_FILE_DEFAULT`
`46`	`48`	`)`
`47`	`49`
`48`	`50`	`# load eu countries file`
`49`		`-self.eu_countries=handler_utils.read_eu_country_names(`
	`51`	`+self.eu_countries=handler_utils.read_country_names(`
`50`	`52`	`kwargs.get("eu_countries_file")`
	`53`	`+ifkwargs.get("eu_countries_file")`
	`54`	`+elseCOUNTRY_EU_FILE_DEFAULT`
`51`	`55`	`)`
`52`	`56`
`53`	`57`	`# setup req opts`
`@@ -105,7 +109,9 @@ def getDetails(self, ip_address=None, timeout=None):`
`105`	`109`	`details=response.json()`
`106`	`110`
`107`	`111`	`# format & cache`
`108`		`-handler_utils.format_details(details,self.countries,self.eu_countries)`
	`112`	`+handler_utils.format_details(`
	`113`	`+details,self.countries,self.eu_countries`
	`114`	`+ )`
`109`	`115`	`self.cache[cache_key(ip_address)]=details`
`110`	`116`
`111`	`117`	`returnDetails(details)`
`@@ -221,7 +227,9 @@ def getBatchDetails(`
`221`	`227`	`# format all`
`222`	`228`	`fordetailinresult.values():`
`223`	`229`	`ifisinstance(detail,dict):`
`224`		`-handler_utils.format_details(detail,self.countries,self.eu_countries)`
	`230`	`+handler_utils.format_details(`
	`231`	`+detail,self.countries,self.eu_countries`
	`232`	`+ )`
`225`	`233`
`226`	`234`	`returnresult`
`227`	`235`

`‎ipinfo/handler_async.py‎`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`from .exceptionsimportRequestQuotaExceededError,TimeoutExceededError`
`17`	`17`	`from .handler_utilsimport (`
`18`	`18`	`API_URL,`
	`19`	`+COUNTRY_EU_FILE_DEFAULT,`
`19`	`20`	`COUNTRY_FILE_DEFAULT,`
`20`	`21`	`BATCH_MAX_SIZE,`
`21`	`22`	`CACHE_MAXSIZE,`
`@@ -43,11 +44,15 @@ def __init__(self, access_token=None, **kwargs):`
`43`	`44`	`# load countries file`
`44`	`45`	`self.countries=handler_utils.read_country_names(`
`45`	`46`	`kwargs.get("countries_file")`
	`47`	`+ifkwargs.get("countries_file")`
	`48`	`+elseCOUNTRY_FILE_DEFAULT`
`46`	`49`	`)`
`47`	`50`
`48`	`51`	`# load eu countries file`
`49`		`-self.eu_countries=handler_utils.read_eu_country_names(`
	`52`	`+self.eu_countries=handler_utils.read_country_names(`
`50`	`53`	`kwargs.get("eu_countries_file")`
	`54`	`+ifkwargs.get("eu_countries_file")`
	`55`	`+elseCOUNTRY_EU_FILE_DEFAULT`
`51`	`56`	`)`
`52`	`57`
`53`	`58`	`# setup req opts`
`@@ -127,7 +132,9 @@ async def getDetails(self, ip_address=None, timeout=None):`
`127`	`132`	`details=awaitresp.json()`
`128`	`133`
`129`	`134`	`# format & cache`
`130`		`-handler_utils.format_details(details,self.countries,self.eu_countries)`
	`135`	`+handler_utils.format_details(`
	`136`	`+details,self.countries,self.eu_countries`
	`137`	`+ )`
`131`	`138`	`self.cache[cache_key(ip_address)]=details`
`132`	`139`
`133`	`140`	`returnDetails(details)`
`@@ -277,7 +284,9 @@ async def _do_batch_req(`
`277`	`284`	`# format & fill up cache`
`278`	`285`	`forip_address,detailsinjson_resp.items():`
`279`	`286`	`ifisinstance(details,dict):`
`280`		`-handler_utils.format_details(details,self.countries,self.eu_countries)`
	`287`	`+handler_utils.format_details(`
	`288`	`+details,self.countries,self.eu_countries`
	`289`	`+ )`
`281`	`290`	`self.cache[cache_key(ip_address)]=details`
`282`	`291`
`283`	`292`	`# merge cached results with new lookup`

`‎ipinfo/handler_utils.py‎`

Lines changed: 3 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ def get_headers(access_token):`
`52`	`52`	`returnheaders`
`53`	`53`
`54`	`54`
`55`		`-defformat_details(details,countries,eu_countries):`
	`55`	`+defformat_details(details,countries,eu_countries):`
`56`	`56`	`"""`
`57`	`57`	`Format details given a countries object.`
`58`	`58`
`@@ -77,34 +77,17 @@ def read_coords(location):`
`77`	`77`	`returnlat,lon`
`78`	`78`
`79`	`79`
`80`		`-defread_country_names(countries_file=None):`
	`80`	`+defread_country_names(countries_file):`
`81`	`81`	`"""`
`82`	`82`	`Read list of countries from specified country file or`
`83`	`83`	`default file.`
`84`	`84`	`"""`
`85`		`-ifnotcountries_file:`
`86`		`-countries_file=os.path.join(`
`87`		`-os.path.dirname(__file__),COUNTRY_FILE_DEFAULT`
`88`		`- )`
	`85`	`+countries_file=os.path.join(os.path.dirname(__file__),countries_file)`
`89`	`86`	`withopen(countries_file)asf:`
`90`	`87`	`countries_json=f.read()`
`91`	`88`
`92`	`89`	`returnjson.loads(countries_json)`
`93`	`90`
`94`		`-defread_eu_country_names(eu_countries_file=None):`
`95`		`-"""`
`96`		`- Read list of EU countries from specified country file or`
`97`		`- default file.`
`98`		`- """`
`99`		`-ifnoteu_countries_file:`
`100`		`-eu_countries_file=os.path.join(`
`101`		`-os.path.dirname(__file__),COUNTRY_EU_FILE_DEFAULT`
`102`		`- )`
`103`		`-withopen(eu_countries_file)asf:`
`104`		`-eu_countries_json=f.read()`
`105`		`-`
`106`		`-returnjson.loads(eu_countries_json)`
`107`		`-`
`108`	`91`
`109`	`92`	`defreturn_or_fail(raise_on_fail,e,v):`
`110`	`93`	`"""`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2ff1abe

File tree

3 files changed

3 files changed

`‎ipinfo/handler.py‎`

`‎ipinfo/handler_async.py‎`

`‎ipinfo/handler_utils.py‎`

0 commit comments