Merge pull request #61 from ipinfo/umar/isEU

UmanShahzad · web-flow · commit 17109967fae7 · 2022-08-18T13:21:59.000+05:00
added isEU in details object
diff --git a/README.md b/README.md
@@ -232,16 +232,16 @@ Request behavior can be modified by setting the `request_options` keyword argume
 
 ### Internationalization
 
-When looking up an IP address, the response object includes a `details.country_name` attribute which includes the country name based on American English. It is possible to return the country name in other languages by setting the `countries_file` keyword argument when creating the `IPinfo` object.
+When looking up an IP address, the response object includes a `details.country_name` and `details.isEU` attributes which includes the country name and true if the country is a member of EU, based on American English. It is possible to return the country name in other languages by setting the `countries_file` keyword argument when creating the `IPinfo` object.
 
 The file must be a `.json` file with the following structure:
 
 ```json
 {
-  "BD": "Bangladesh",
-  "BE": "Belgium",
-  "BF": "Burkina Faso",
-  "BG": "Bulgaria",
+  "BD": {"name":"Bangladesh", "isEU":false},
+  "BE": {"name":"Belgium", "isEU":true},
+  "BF": {"name":"Burkina Faso", "isEU":false},
+  "BG": {"name":"Bulgaria", "isEU":true},
   ...
 }
 ```
diff --git a/ipinfo/countries.json b/ipinfo/countries.json
@@ -1 +1,252 @@
-{"BD": "Bangladesh", "BE": "Belgium", "BF": "Burkina Faso", "BG": "Bulgaria", "BA": "Bosnia and Herzegovina", "BB": "Barbados", "WF": "Wallis and Futuna", "BL": "Saint Barthelemy", "BM": "Bermuda", "BN": "Brunei", "BO": "Bolivia", "BH": "Bahrain", "BI": "Burundi", "BJ": "Benin", "BT": "Bhutan", "JM": "Jamaica", "BV": "Bouvet Island", "BW": "Botswana", "WS": "Samoa", "BQ": "Bonaire, Saint Eustatius and Saba ", "BR": "Brazil", "BS": "Bahamas", "JE": "Jersey", "BY": "Belarus", "BZ": "Belize", "RU": "Russia", "RW": "Rwanda", "RS": "Serbia", "TL": "East Timor", "RE": "Reunion", "TM": "Turkmenistan", "TJ": "Tajikistan", "RO": "Romania", "TK": "Tokelau", "GW": "Guinea-Bissau", "GU": "Guam", "GT": "Guatemala", "GS": "South Georgia and the South Sandwich Islands", "GR": "Greece", "GQ": "Equatorial Guinea", "GP": "Guadeloupe", "JP": "Japan", "GY": "Guyana", "GG": "Guernsey", "GF": "French Guiana", "GE": "Georgia", "GD": "Grenada", "GB": "United Kingdom", "GA": "Gabon", "SV": "El Salvador", "GN": "Guinea", "GM": "Gambia", "GL": "Greenland", "GI": "Gibraltar", "GH": "Ghana", "OM": "Oman", "TN": "Tunisia", "JO": "Jordan", "HR": "Croatia", "HT": "Haiti", "HU": "Hungary", "HK": "Hong Kong", "HN": "Honduras", "HM": "Heard Island and McDonald Islands", "VE": "Venezuela", "PR": "Puerto Rico", "PS": "Palestinian Territory", "PW": "Palau", "PT": "Portugal", "SJ": "Svalbard and Jan Mayen", "PY": "Paraguay", "IQ": "Iraq", "PA": "Panama", "PF": "French Polynesia", "PG": "Papua New Guinea", "PE": "Peru", "PK": "Pakistan", "PH": "Philippines", "PN": "Pitcairn", "PL": "Poland", "PM": "Saint Pierre and Miquelon", "ZM": "Zambia", "EH": "Western Sahara", "EE": "Estonia", "EG": "Egypt", "ZA": "South Africa", "EC": "Ecuador", "IT": "Italy", "VN": "Vietnam", "SB": "Solomon Islands", "ET": "Ethiopia", "SO": "Somalia", "ZW": "Zimbabwe", "SA": "Saudi Arabia", "ES": "Spain", "ER": "Eritrea", "ME": "Montenegro", "MD": "Moldova", "MG": "Madagascar", "MF": "Saint Martin", "MA": "Morocco", "MC": "Monaco", "UZ": "Uzbekistan", "MM": "Myanmar", "ML": "Mali", "MO": "Macao", "MN": "Mongolia", "MH": "Marshall Islands", "MK": "Macedonia", "MU": "Mauritius", "MT": "Malta", "MW": "Malawi", "MV": "Maldives", "MQ": "Martinique", "MP": "Northern Mariana Islands", "MS": "Montserrat", "MR": "Mauritania", "IM": "Isle of Man", "UG": "Uganda", "TZ": "Tanzania", "MY": "Malaysia", "MX": "Mexico", "IL": "Israel", "FR": "France", "IO": "British Indian Ocean Territory", "SH": "Saint Helena", "FI": "Finland", "FJ": "Fiji", "FK": "Falkland Islands", "FM": "Micronesia", "FO": "Faroe Islands", "NI": "Nicaragua", "NL": "Netherlands", "NO": "Norway", "NA": "Namibia", "VU": "Vanuatu", "NC": "New Caledonia", "NE": "Niger", "NF": "Norfolk Island", "NG": "Nigeria", "NZ": "New Zealand", "NP": "Nepal", "NR": "Nauru", "NU": "Niue", "CK": "Cook Islands", "XK": "Kosovo", "CI": "Ivory Coast", "CH": "Switzerland", "CO": "Colombia", "CN": "China", "CM": "Cameroon", "CL": "Chile", "CC": "Cocos Islands", "CA": "Canada", "CG": "Republic of the Congo", "CF": "Central African Republic", "CD": "Democratic Republic of the Congo", "CZ": "Czech Republic", "CY": "Cyprus", "CX": "Christmas Island", "CR": "Costa Rica", "CW": "Curacao", "CV": "Cape Verde", "CU": "Cuba", "SZ": "Swaziland", "SY": "Syria", "SX": "Sint Maarten", "KG": "Kyrgyzstan", "KE": "Kenya", "SS": "South Sudan", "SR": "Suriname", "KI": "Kiribati", "KH": "Cambodia", "KN": "Saint Kitts and Nevis", "KM": "Comoros", "ST": "Sao Tome and Principe", "SK": "Slovakia", "KR": "South Korea", "SI": "Slovenia", "KP": "North Korea", "KW": "Kuwait", "SN": "Senegal", "SM": "San Marino", "SL": "Sierra Leone", "SC": "Seychelles", "KZ": "Kazakhstan", "KY": "Cayman Islands", "SG": "Singapore", "SE": "Sweden", "SD": "Sudan", "DO": "Dominican Republic", "DM": "Dominica", "DJ": "Djibouti", "DK": "Denmark", "VG": "British Virgin Islands", "DE": "Germany", "YE": "Yemen", "DZ": "Algeria", "US": "United States", "UY": "Uruguay", "YT": "Mayotte", "UM": "United States Minor Outlying Islands", "LB": "Lebanon", "LC": "Saint Lucia", "LA": "Laos", "TV": "Tuvalu", "TW": "Taiwan", "TT": "Trinidad and Tobago", "TR": "Turkey", "LK": "Sri Lanka", "LI": "Liechtenstein", "LV": "Latvia", "TO": "Tonga", "LT": "Lithuania", "LU": "Luxembourg", "LR": "Liberia", "LS": "Lesotho", "TH": "Thailand", "TF": "French Southern Territories", "TG": "Togo", "TD": "Chad", "TC": "Turks and Caicos Islands", "LY": "Libya", "VA": "Vatican", "VC": "Saint Vincent and the Grenadines", "AE": "United Arab Emirates", "AD": "Andorra", "AG": "Antigua and Barbuda", "AF": "Afghanistan", "AI": "Anguilla", "VI": "U.S. Virgin Islands", "IS": "Iceland", "IR": "Iran", "AM": "Armenia", "AL": "Albania", "AO": "Angola", "AQ": "Antarctica", "AS": "American Samoa", "AR": "Argentina", "AU": "Australia", "AT": "Austria", "AW": "Aruba", "IN": "India", "AX": "Aland Islands", "AZ": "Azerbaijan", "IE": "Ireland", "ID": "Indonesia", "UA": "Ukraine", "QA": "Qatar", "MZ": "Mozambique"}
+{
+ "BD": {"name":"Bangladesh", "isEU":false},
+ "BE": {"name":"Belgium", "isEU":true},
+ "BF": {"name":"Burkina Faso", "isEU":false},
+ "BG": {"name":"Bulgaria", "isEU":true},
+ "BA": {"name":"Bosnia and Herzegovina", "isEU":false},
+ "BB": {"name":"Barbados", "isEU":false},
+ "WF": {"name":"Wallis and Futuna", "isEU":false},
+ "BL": {"name":"Saint Barthelemy", "isEU":false},
+ "BM": {"name":"Bermuda", "isEU":false},
+ "BN": {"name":"Brunei", "isEU":false},
+ "BO": {"name":"Bolivia", "isEU":false},
+ "BH": {"name":"Bahrain", "isEU":false},
+ "BI": {"name":"Burundi", "isEU":false},
+ "BJ": {"name":"Benin", "isEU":false},
+ "BT": {"name":"Bhutan", "isEU":false},
+ "JM": {"name":"Jamaica", "isEU":false},
+ "BV": {"name":"Bouvet Island", "isEU":false},
+ "BW": {"name":"Botswana", "isEU":false},
+ "WS": {"name":"Samoa", "isEU":false},
+ "BQ": {"name":"Bonaire, Saint Eustatius and Saba ", "isEU":false},
+ "BR": {"name":"Brazil", "isEU":false},
+ "BS": {"name":"Bahamas", "isEU":false},
+ "JE": {"name":"Jersey", "isEU":false},
+ "BY": {"name":"Belarus", "isEU":false},
+ "BZ": {"name":"Belize", "isEU":false},
+ "RU": {"name":"Russia", "isEU":false},
+ "RW": {"name":"Rwanda", "isEU":false},
+ "RS": {"name":"Serbia", "isEU":false},
+ "TL": {"name":"East Timor", "isEU":false},
+ "RE": {"name":"Reunion", "isEU":false},
+ "TM": {"name":"Turkmenistan", "isEU":false},
+ "TJ": {"name":"Tajikistan", "isEU":false},
+ "RO": {"name":"Romania", "isEU":true},
+ "TK": {"name":"Tokelau", "isEU":false},
+ "GW": {"name":"Guinea-Bissau", "isEU":false},
+ "GU": {"name":"Guam", "isEU":false},
+ "GT": {"name":"Guatemala", "isEU":false},
+ "GS": {"name":"South Georgia and the South Sandwich Islands", "isEU":false},
+ "GR": {"name":"Greece", "isEU":true},
+ "GQ": {"name":"Equatorial Guinea", "isEU":false},
+ "GP": {"name":"Guadeloupe", "isEU":false},
+ "JP": {"name":"Japan", "isEU":false},
+ "GY": {"name":"Guyana", "isEU":false},
+ "GG": {"name":"Guernsey", "isEU":false},
+ "GF": {"name":"French Guiana", "isEU":false},
+ "GE": {"name":"Georgia", "isEU":false},
+ "GD": {"name":"Grenada", "isEU":false},
+ "GB": {"name":"United Kingdom", "isEU":false},
+ "GA": {"name":"Gabon", "isEU":false},
+ "SV": {"name":"El Salvador", "isEU":false},
+ "GN": {"name":"Guinea", "isEU":false},
+ "GM": {"name":"Gambia", "isEU":false},
+ "GL": {"name":"Greenland", "isEU":false},
+ "GI": {"name":"Gibraltar", "isEU":false},
+ "GH": {"name":"Ghana", "isEU":false},
+ "OM": {"name":"Oman", "isEU":false},
+ "TN": {"name":"Tunisia", "isEU":false},
+ "JO": {"name":"Jordan", "isEU":false},
+ "HR": {"name":"Croatia", "isEU":true},
+ "HT": {"name":"Haiti", "isEU":false},
+ "HU": {"name":"Hungary", "isEU":true},
+ "HK": {"name":"Hong Kong", "isEU":false},
+ "HN": {"name":"Honduras", "isEU":false},
+ "HM": {"name":"Heard Island and McDonald Islands", "isEU":false},
+ "VE": {"name":"Venezuela", "isEU":false},
+ "PR": {"name":"Puerto Rico", "isEU":false},
+ "PS": {"name":"Palestinian Territory", "isEU":false},
+ "PW": {"name":"Palau", "isEU":false},
+ "PT": {"name":"Portugal", "isEU":true},
+ "SJ": {"name":"Svalbard and Jan Mayen", "isEU":false},
+ "PY": {"name":"Paraguay", "isEU":false},
+ "IQ": {"name":"Iraq", "isEU":false},
+ "PA": {"name":"Panama", "isEU":false},
+ "PF": {"name":"French Polynesia", "isEU":false},
+ "PG": {"name":"Papua New Guinea", "isEU":false},
+ "PE": {"name":"Peru", "isEU":false},
+ "PK": {"name":"Pakistan", "isEU":false},
+ "PH": {"name":"Philippines", "isEU":false},
+ "PN": {"name":"Pitcairn", "isEU":false},
+ "PL": {"name":"Poland", "isEU":true},
+ "PM": {"name":"Saint Pierre and Miquelon", "isEU":false},
+ "ZM": {"name":"Zambia", "isEU":false},
+ "EH": {"name":"Western Sahara", "isEU":false},
+ "EE": {"name":"Estonia", "isEU":true},
+ "EG": {"name":"Egypt", "isEU":false},
+ "ZA": {"name":"South Africa", "isEU":false},
+ "EC": {"name":"Ecuador", "isEU":false},
+ "IT": {"name":"Italy", "isEU":true},
+ "VN": {"name":"Vietnam", "isEU":false},
+ "SB": {"name":"Solomon Islands", "isEU":false},
+ "ET": {"name":"Ethiopia", "isEU":false},
+ "SO": {"name":"Somalia", "isEU":false},
+ "ZW": {"name":"Zimbabwe", "isEU":false},
+ "SA": {"name":"Saudi Arabia", "isEU":false},
+ "ES": {"name":"Spain", "isEU":true},
+ "ER": {"name":"Eritrea", "isEU":false},
+ "ME": {"name":"Montenegro", "isEU":false},
+ "MD": {"name":"Moldova", "isEU":false},
+ "MG": {"name":"Madagascar", "isEU":false},
+ "MF": {"name":"Saint Martin", "isEU":false},
+ "MA": {"name":"Morocco", "isEU":false},
+ "MC": {"name":"Monaco", "isEU":false},
+ "UZ": {"name":"Uzbekistan", "isEU":false},
+ "MM": {"name":"Myanmar", "isEU":false},
+ "ML": {"name":"Mali", "isEU":false},
+ "MO": {"name":"Macao", "isEU":false},
+ "MN": {"name":"Mongolia", "isEU":false},
+ "MH": {"name":"Marshall Islands", "isEU":false},
+ "MK": {"name":"Macedonia", "isEU":false},
+ "MU": {"name":"Mauritius", "isEU":false},
+ "MT": {"name":"Malta", "isEU":true},
+ "MW": {"name":"Malawi", "isEU":false},
+ "MV": {"name":"Maldives", "isEU":false},
+ "MQ": {"name":"Martinique", "isEU":false},
+ "MP": {"name":"Northern Mariana Islands", "isEU":false},
+ "MS": {"name":"Montserrat", "isEU":false},
+ "MR": {"name":"Mauritania", "isEU":false},
+ "IM": {"name":"Isle of Man", "isEU":false},
+ "UG": {"name":"Uganda", "isEU":false},
+ "TZ": {"name":"Tanzania", "isEU":false},
+ "MY": {"name":"Malaysia", "isEU":false},
+ "MX": {"name":"Mexico", "isEU":false},
+ "IL": {"name":"Israel", "isEU":false},
+ "FR": {"name":"France", "isEU":true},
+ "IO": {"name":"British Indian Ocean Territory", "isEU":false},
+ "SH": {"name":"Saint Helena", "isEU":false},
+ "FI": {"name":"Finland", "isEU":true},
+ "FJ": {"name":"Fiji", "isEU":false},
+ "FK": {"name":"Falkland Islands", "isEU":false},
+ "FM": {"name":"Micronesia", "isEU":false},
+ "FO": {"name":"Faroe Islands", "isEU":false},
+ "NI": {"name":"Nicaragua", "isEU":false},
+ "NL": {"name":"Netherlands", "isEU":true},
+ "NO": {"name":"Norway", "isEU":false},
+ "NA": {"name":"Namibia", "isEU":false},
+ "VU": {"name":"Vanuatu", "isEU":false},
+ "NC": {"name":"New Caledonia", "isEU":false},
+ "NE": {"name":"Niger", "isEU":false},
+ "NF": {"name":"Norfolk Island", "isEU":false},
+ "NG": {"name":"Nigeria", "isEU":false},
+ "NZ": {"name":"New Zealand", "isEU":false},
+ "NP": {"name":"Nepal", "isEU":false},
+ "NR": {"name":"Nauru", "isEU":false},
+ "NU": {"name":"Niue", "isEU":false},
+ "CK": {"name":"Cook Islands", "isEU":false},
+ "XK": {"name":"Kosovo", "isEU":false},
+ "CI": {"name":"Ivory Coast", "isEU":false},
+ "CH": {"name":"Switzerland", "isEU":false},
+ "CO": {"name":"Colombia", "isEU":false},
+ "CN": {"name":"China", "isEU":false},
+ "CM": {"name":"Cameroon", "isEU":false},
+ "CL": {"name":"Chile", "isEU":false},
+ "CC": {"name":"Cocos Islands", "isEU":false},
+ "CA": {"name":"Canada", "isEU":false},
+ "CG": {"name":"Republic of the Congo", "isEU":false},
+ "CF": {"name":"Central African Republic", "isEU":false},
+ "CD": {"name":"Democratic Republic of the Congo", "isEU":false},
+ "CZ": {"name":"Czech Republic", "isEU":true},
+ "CY": {"name":"Cyprus", "isEU":true},
+ "CX": {"name":"Christmas Island", "isEU":false},
+ "CR": {"name":"Costa Rica", "isEU":false},
+ "CW": {"name":"Curacao", "isEU":false},
+ "CV": {"name":"Cape Verde", "isEU":false},
+ "CU": {"name":"Cuba", "isEU":false},
+ "SZ": {"name":"Swaziland", "isEU":false},
+ "SY": {"name":"Syria", "isEU":false},
+ "SX": {"name":"Sint Maarten", "isEU":false},
+ "KG": {"name":"Kyrgyzstan", "isEU":false},
+ "KE": {"name":"Kenya", "isEU":false},
+ "SS": {"name":"South Sudan", "isEU":false},
+ "SR": {"name":"Suriname", "isEU":false},
+ "KI": {"name":"Kiribati", "isEU":false},
+ "KH": {"name":"Cambodia", "isEU":false},
+ "KN": {"name":"Saint Kitts and Nevis", "isEU":false},
+ "KM": {"name":"Comoros", "isEU":false},
+ "ST": {"name":"Sao Tome and Principe", "isEU":false},
+ "SK": {"name":"Slovakia", "isEU":true},
+ "KR": {"name":"South Korea", "isEU":false},
+ "SI": {"name":"Slovenia", "isEU":true},
+ "KP": {"name":"North Korea", "isEU":false},
+ "KW": {"name":"Kuwait", "isEU":false},
+ "SN": {"name":"Senegal", "isEU":false},
+ "SM": {"name":"San Marino", "isEU":false},
+ "SL": {"name":"Sierra Leone", "isEU":false},
+ "SC": {"name":"Seychelles", "isEU":false},
+ "KZ": {"name":"Kazakhstan", "isEU":false},
+ "KY": {"name":"Cayman Islands", "isEU":false},
+ "SG": {"name":"Singapore", "isEU":false},
+ "SE": {"name":"Sweden", "isEU":true},
+ "SD": {"name":"Sudan", "isEU":false},
+ "DO": {"name":"Dominican Republic", "isEU":false},
+ "DM": {"name":"Dominica", "isEU":false},
+ "DJ": {"name":"Djibouti", "isEU":false},
+ "DK": {"name":"Denmark", "isEU":true},
+ "VG": {"name":"British Virgin Islands", "isEU":false},
+ "DE": {"name":"Germany", "isEU":true},
+ "YE": {"name":"Yemen", "isEU":false},
+ "DZ": {"name":"Algeria", "isEU":false},
+ "US": {"name":"United States", "isEU":false},
+ "UY": {"name":"Uruguay", "isEU":false},
+ "YT": {"name":"Mayotte", "isEU":false},
+ "UM": {"name":"United States Minor Outlying Islands", "isEU":false},
+ "LB": {"name":"Lebanon", "isEU":false},
+ "LC": {"name":"Saint Lucia", "isEU":false},
+ "LA": {"name":"Laos", "isEU":false},
+ "TV": {"name":"Tuvalu", "isEU":false},
+ "TW": {"name":"Taiwan", "isEU":false},
+ "TT": {"name":"Trinidad and Tobago", "isEU":false},
+ "TR": {"name":"Turkey", "isEU":false},
+ "LK": {"name":"Sri Lanka", "isEU":false},
+ "LI": {"name":"Liechtenstein", "isEU":false},
+ "LV": {"name":"Latvia", "isEU":true},
+ "TO": {"name":"Tonga", "isEU":false},
+ "LT": {"name":"Lithuania", "isEU":true},
+ "LU": {"name":"Luxembourg", "isEU":true},
+ "LR": {"name":"Liberia", "isEU":false},
+ "LS": {"name":"Lesotho", "isEU":false},
+ "TH": {"name":"Thailand", "isEU":false},
+ "TF": {"name":"French Southern Territories", "isEU":false},
+ "TG": {"name":"Togo", "isEU":false},
+ "TD": {"name":"Chad", "isEU":false},
+ "TC": {"name":"Turks and Caicos Islands", "isEU":false},
+ "LY": {"name":"Libya", "isEU":false},
+ "VA": {"name":"Vatican", "isEU":false},
+ "VC": {"name":"Saint Vincent and the Grenadines", "isEU":false},
+ "AE": {"name":"United Arab Emirates", "isEU":false},
+ "AD": {"name":"Andorra", "isEU":false},
+ "AG": {"name":"Antigua and Barbuda", "isEU":false},
+ "AF": {"name":"Afghanistan", "isEU":false},
+ "AI": {"name":"Anguilla", "isEU":false},
+ "VI": {"name":"U.S. Virgin Islands", "isEU":false},
+ "IS": {"name":"Iceland", "isEU":false},
+ "IR": {"name":"Iran", "isEU":false},
+ "AM": {"name":"Armenia", "isEU":false},
+ "AL": {"name":"Albania", "isEU":false},
+ "AO": {"name":"Angola", "isEU":false},
+ "AQ": {"name":"Antarctica", "isEU":false},
+ "AS": {"name":"American Samoa", "isEU":false},
+ "AR": {"name":"Argentina", "isEU":false},
+ "AU": {"name":"Australia", "isEU":false},
+ "AT": {"name":"Austria", "isEU":true},
+ "AW": {"name":"Aruba", "isEU":false},
+ "IN": {"name":"India", "isEU":false},
+ "AX": {"name":"Aland Islands", "isEU":false},
+ "AZ": {"name":"Azerbaijan", "isEU":false},
+ "IE": {"name":"Ireland", "isEU":true},
+ "ID": {"name":"Indonesia", "isEU":false},
+ "UA": {"name":"Ukraine", "isEU":false},
+ "QA": {"name":"Qatar", "isEU":false},
+ "MZ": {"name":"Mozambique","isEU":false}
+}
diff --git a/ipinfo/handler_utils.py b/ipinfo/handler_utils.py
@@ -56,7 +56,9 @@ def format_details(details, countries):
 
     The countries object can be retrieved from read_country_names.
     """
-    details["country_name"] = countries.get(details.get("country"))
+    json_details = countries.get(details.get("country"))
+    details["country_name"] = json_details["name"] if json_details else None
+    details["isEU"] = json_details["isEU"] if json_details else False
     details["latitude"], details["longitude"] = read_coords(details.get("loc"))
 
 
