ENH: py2 => py2/3 migration

Author: bcipolli

Diff for: README.ipynb

@@ -1255,8 +1255,8 @@
      "input": [
       "def func(url):\n",
       "    # Basic function that doesn't do any caching\n",
-      "    import urllib2\n",
-      "    return urllib2.urlopen(url).read()\n",
+      "    from six.moves.urllib import request\n",
+      "    return request.urlopen(url).read()\n",
       "\n",
       "# Either pass it in on instantiation...\n",
       "ind_api = wbpy.IndicatorAPI(fetch=func)\n",

Diff for: README.rst

@@ -890,8 +890,8 @@ web page as a string.
 
     def func(url):
         # Basic function that doesn't do any caching
-        import urllib2
-        return urllib2.urlopen(url).read()
+        from six.moves.urllib import request
+        return request.urlopen(url).read()
 
     # Either pass it in on instantiation...
     ind_api = wbpy.IndicatorAPI(fetch=func)

Diff for: requirements.txt

@@ -2,3 +2,4 @@ pycountry==1.20
 ddt==1.0.1
 mock==1.3.0
 tox==2.3.1
+six

Diff for: wbpy/__init__.py

@@ -1,5 +1,5 @@
-from indicators import IndicatorAPI, IndicatorDataset
-from climate import ClimateAPI, InstrumentalDataset, ModelledDataset
+from wbpy.indicators import IndicatorAPI, IndicatorDataset
+from wbpy.climate import ClimateAPI, InstrumentalDataset, ModelledDataset
 
 __name__ = "wbpy"
 __version__ = "2.0.1"
@@ -13,4 +13,4 @@
     ClimateAPI,
     InstrumentalDataset,
     ModelledDataset,
-    ]
+]

Diff for: wbpy/climate.py

@@ -6,6 +6,7 @@
 import itertools
 
 import pycountry
+import six
 
 from . import utils
 
@@ -19,7 +20,7 @@ def __init__(self, api_calls, data_type, data_interval, call_date):
             responses can form one dataset.
 
         :param data_type:
-            eg. ``pr``, ``tas``, ``tmin_means`` 
+            eg. ``pr``, ``tas``, ``tmin_means``
 
         :param data_interval:
             eg. ``mavg``, ``decade``
@@ -212,10 +213,10 @@ def as_dict(self, sres="a2", use_datetime=False):
 
 class ClimateAPI(object):
 
-    """Request data from the World Bank Climate API. 
-    
+    """Request data from the World Bank Climate API.
+
     You can override the default tempfile cache by passing a function
-    ``fetch``, which requests a URL and returns the response as a string. 
+    ``fetch``, which requests a URL and returns the response as a string.
     """
 
     _gcm = dict(
@@ -302,7 +303,7 @@ class ClimateAPI(object):
         aanom="annualanom",
         aavg="annualavg",
         )
-    for _k, _d_key in _shorthand_codes.iteritems():
+    for _k, _d_key in _shorthand_codes.items():
         for _d in [_instrumental_types, _modelled_types,
             _instrumental_intervals, _modelled_intervals]:
             if _d_key in _d:

Diff for: wbpy/indicators.py

@@ -2,7 +2,7 @@
 import re
 import datetime
 import pprint
-import urllib
+from six.moves.urllib.parse import urlencode
 try:
     import simplejson as json
 except ImportError:
@@ -122,13 +122,13 @@ def as_dict(self, use_datetime=False):
 
 class IndicatorAPI(object):
 
-    """Request data from the World Bank Indicators API. 
-    
+    """Request data from the World Bank Indicators API.
+
     You can override the default tempfile cache by passing a function
-    ``fetch``, which requests a URL and returns the response as a string. 
+    ``fetch``, which requests a URL and returns the response as a string.
     """
 
-    BASE_URL = "http://api.worldbank.org/"
+    BASE_URL = "http://api.worldbank.org/v2/"
 
     # The API uses some non-ISO 2-digit and 3-digit codes. Make them available.
     NON_STANDARD_REGIONS = utils.NON_STANDARD_REGIONS
@@ -237,7 +237,7 @@ def get_indicators(self, indicator_codes=None, search=None,
     def get_countries(self, country_codes=None, search=None,
             search_full=False, **kwargs):
         """Request country metadata.
-        
+
         eg. ISO code, coordinates, capital, income level, etc.
 
         :param country_codes:
@@ -433,7 +433,7 @@ def print_codes(self, results, search=None, search_key=None):
         :param search:
             Regexp string to filter out non-matching results.
             By default, this searches the main name of the entity.
-            
+
         :param search_key:
             A second-level KEY in your dict, eg. ``{foo: {KEY: val}}``.
             If given, will only search the value corresponding to the key.
@@ -465,7 +465,7 @@ def natural_keys(item):
                 main_value = v.get("name", v.get("value", v))
             else:
                 main_value = v
-            print u"{0:30} {1}".format(k, main_value)
+            print(u"{0:30} {1}".format(k, main_value))
 
     def search_results(self, regexp, results, key=None):
         """For a given dict of ``get_`` results, filter out all keys that do
@@ -555,7 +555,7 @@ def _generate_indicators_url(
         # always generate the same URL (for caching purposes), so need to
         # convert to a sorted list before passing to urlencode().
         sorted_kwargs = sorted([(k, v) for k, v in kwargs.items()])
-        query_string = urllib.urlencode(sorted_kwargs)
+        query_string = urlencode(sorted_kwargs)
 
         new_url = "".join([self.BASE_URL, rest_url, query_string])
         return new_url

Diff for: wbpy/tests/indicator_data.py

@@ -137,8 +137,8 @@ class Yearly(TestData):
         "id": "2",
         "value": "World Development Indicators"
     },
-    "sourceNote": "Total population is based on the de facto definition of population, which counts all residents regardless of legal status or citizenship--except for refugees not permanently settled in the country of asylum, who are generally considered part of the population of their country of origin. The values shown are midyear estimates.",
-    "sourceOrganization": "(1) United Nations Population Division. World Population Prospects, (2) United Nations Statistical Division. Population and Vital Statistics Report (various years), (3) Census reports and other statistical publications from national statistical offices, (4) Eurostat: Demographic Statistics, (5) Secretariat of the Pacific Community: Statistics and Demography Programme, and (6) U.S. Census Bureau: International Database.",
+    "sourceNote": "Total population is based on the de facto definition of population, which counts all residents regardless of legal status or citizenship. The values shown are midyear estimates.",
+    "sourceOrganization": "(1) United Nations Population Division. World Population Prospects: 2019 Revision. (2) Census reports and other statistical publications from national statistical offices, (3) Eurostat: Demographic Statistics, (4) United Nations Statistical Division. Population and Vital Statistics Reprot (various years), (5) U.S. Census Bureau: International Database, and (6) Secretariat of the Pacific Community: Statistics and Demography Programme.",
     "topics": [
         {
             "id": "8",

Diff for: wbpy/tests/test_climate.py

@@ -10,14 +10,14 @@
 from ddt import ddt, data
 
 import wbpy
-from climate_data import (
+from wbpy.tests.climate_data import (
     InstrumentalMonth,
     InstrumentalYear,
     InstrumentalDecade,
     ModelledVarMAVG,
     ModelledVarAANOM,
     ModelledStat,
-    )
+)
 
 @ddt
 class TestClimateDataBasicAttrs(unittest.TestCase):
@@ -76,11 +76,11 @@ def test_api_call_regions_decade(self):
     @data(InstrumentalMonth(), InstrumentalYear(), InstrumentalDecade())
     def test_api_call_date_attr(self, data):
         self.assertEqual(data.dataset.api_call_date, data.date)
-   
+
     @data(InstrumentalMonth(), InstrumentalYear(), InstrumentalDecade())
     def test_dates_attr(self, data):
         self.assertIn("1901", data.dataset.dates)
-     
+
 
 @ddt
 class TestInstrumentalModelDictFn(unittest.TestCase):
@@ -178,17 +178,17 @@ def test_stat_datetime(self):
 
 @ddt
 class TestModelledModelDictFn(unittest.TestCase):
-    
+
     @data(ModelledVarMAVG(), ModelledVarAANOM())
     def test_gcm_key(self, data):
         self.assertIn("ingv_echam4", data.dataset.as_dict())
-        
+
     def test_gcm_key_ensemble(self):
         data = ModelledStat()
         self.assertIn("ensemble_90", data.dataset.as_dict())
-        
-    @data([ModelledVarMAVG(), ("BR",)], 
-        [ModelledVarAANOM(), ("JP",)], 
+
+    @data([ModelledVarMAVG(), ("BR",)],
+        [ModelledVarAANOM(), ("JP",)],
         [ModelledStat(), ("AU", "NZ")],
         )
     def test_region_key(self, foo):
@@ -270,8 +270,8 @@ def test_temp_type(self):
         locs = ["AF"]
         dataset = self.api.get_modelled("tas", "mavg", locs)
         self.assertIn("tas", dataset.data_type)
-   
-    @data("ppt_days", "tmin_means", "ppt_days90th") 
+
+    @data("ppt_days", "tmin_means", "ppt_days90th")
     def test_derived_statistic_type(self, stat):
         locs = ["AF", 303]
         dataset = self.api.get_modelled(stat, "mavg", locs)
@@ -296,7 +296,7 @@ def test_value(self):
         locs = ["nzl"]
         dataset = self.api.get_modelled("tmin_means", "mavg", locs)
         res = dataset.as_dict(sres="b1")
-        self.assertEqual(res["ensemble_90"]["NZ"]["2065"][11], 
+        self.assertEqual(res["ensemble_90"]["NZ"]["2065"][11],
             14.541015999650355)
 
     def test_bad_request_raises_exc(self):
@@ -312,7 +312,7 @@ def test_multiple_locations(self):
         regions = [resp["region"][0] for resp in dataset.api_calls]
         self.assertIn("GB", regions)
         self.assertIn("302", regions)
-        
+
 
 class TestLocationCodes(TestClimateAPI):
     def test_alpha2_codes_work_as_location_arg(self):