Upgrade to Python3

Author: DavidLemayian

.travis.yml

@@ -1,11 +1,6 @@
 language: python
 python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "nightly"
+  - "3.7"
 # command to install dependencies
 install:
   - pip install -r requirements.txt

Dockerfile

@@ -1,12 +1,12 @@
-FROM python:2.7
+FROM python:3.7
 ENV DEBIAN_FRONTEND noninteractive
 
 COPY . /htools-api
 
 WORKDIR /htools-api
 
 RUN pip install --upgrade pip
-RUN pip install -r requirements.txt
+RUN pip install -r requirements.txt && pip install --upgrade requests
 RUN pip install -e .
 
 EXPOSE 8000

healthtools/commands.py

@@ -1,5 +1,7 @@
+from future import standard_library
+standard_library.install_aliases()
 from elasticsearch import helpers
-import urllib2, json
+import urllib.request, urllib.error, urllib.parse, json
 from flask.cli import AppGroup
 
 from healthtools.manage import app
@@ -10,7 +12,7 @@
 @htools_cli.command('loaddata')
 def load_data():
     url = 'https://s3-eu-west-1.amazonaws.com/cfa-healthtools-ke/data/doctors.json'
-    response = urllib2.urlopen(url)
+    response = urllib.request.urlopen(url)
     helpers.bulk(es, json.load(response), index=es_index, doc_type='doctors')
 
 @htools_cli.command('resetindex')

healthtools/core.py

@@ -1,3 +1,4 @@
+from builtins import str
 import logging
 
 from werkzeug.local import LocalProxy
@@ -63,5 +64,5 @@ def get_es_index():
 class AWS4AuthNotUnicode(AWS4Auth):
     def __call__(self, req):
         req = super(AWS4AuthNotUnicode, self).__call__(req)
-        req.headers = {str(name): value for name, value in req.headers.items()}
+        req.headers = {str(name): value for name, value in list(req.headers.items())}
         return req

healthtools/search/clinicalofficers.py

@@ -1,3 +1,5 @@
+from builtins import str
+from builtins import zip
 import requests
 import logging
 from bs4 import BeautifulSoup
@@ -20,8 +22,6 @@ def get_clinical_officers(query):
     clinicalofficers = {'hits': [], 'total': 0}
     try:
         response = requests.post(COC_REGISTER_URL, data = {'search_register':'1', 'search_text': query})
-        if 'No results' in response.content:
-            return clinicalofficers
 
         # make soup for parsing out of response and get the table
         soup = BeautifulSoup(response.content, 'html.parser')

healthtools/search/elastic.py

@@ -1,3 +1,4 @@
+from builtins import str
 import logging
 from healthtools.core import es, es_index
 

healthtools/search/nurses.py

@@ -1,3 +1,5 @@
+from builtins import str
+from builtins import zip
 import requests
 import logging
 from bs4 import BeautifulSoup
@@ -20,9 +22,7 @@ def get_people(query):
     people = {'hits': [], 'total': 0}
     try:
         response = requests.post(FETCH_URL, data = {'search_register':'1', 'search_text': query})
-        if 'No results' in response.content:
-            return people
-
+        
         # make soup for parsing out of response and get the table
         soup = BeautifulSoup(response.content, 'html.parser')
         table = soup.find('table', {'class': 'datatables'}).find('tbody')

healthtools/search/query.py

@@ -81,7 +81,7 @@ def determine_doc_type_using_wit(query, doc_type=None):
     message_text = query
     resp = client.message(message_text)
     query = ''.join(nested_lookup('value', resp['entities']['query']))
-    doc_type = ''.join([var for var in (resp['entities'].keys()) if var != 'query'])
+    doc_type = ''.join([var for var in (list(resp['entities'].keys())) if var != 'query'])
     doc_type = doc_type.replace("_", "-") # changes underscore to hyphen
     if doc_exists(doc_type) == True:
         return doc_type, query

healthtools/sms/__init__.py

@@ -1,3 +1,4 @@
+from builtins import str
 import logging
 
 from healthtools.sms import twilio, mtech

healthtools/tests/nurse.py

@@ -43,7 +43,7 @@ def test_nurses_endpoint_can_retrieve_cached_result(self):
         self.client.get("search/nurses?q=Marie")
         # second time should retrieve cached result
         response = self.client.get("search/nurses?q=Marie")
-        self.assertIn(b"X-Retrieved-From-Cache", response.headers.keys())
+        self.assertIn(b"X-Retrieved-From-Cache", list(response.headers.keys()))
 
     def test_nurses_endpoint_with_bad_endpoint(self):
         """