Python 3 upgrade

.travis.yml

@@ -5,7 +5,8 @@ services:
   - postgresql
 
 python:
-  - '2.7'
+  - '2.7_with_system_site_packages'
+  - '3.6'
 
 addons:
   postgresql: '9.4'
@@ -17,9 +18,6 @@ env:
   - GEOKEY='>=1.6,<1.7' DJANGO='>=1.11,<1.12' DEPLOY=0
   - GEOKEY='>=1.7,<1.8' DJANGO='>=1.11,<1.12' DEPLOY=1
 
-virtualenv:
-  system_site_packages: true
-
 install:
   - sudo -E apt-get -yq update &>> ~/apt-get-update.log
   - sudo apt-get install binutils libav-tools
@@ -54,4 +52,5 @@ deploy:
   on:
     tags: true
     branch: master
+    python: '3.6'
     condition: $DEPLOY = 1

README.rst

@@ -20,7 +20,7 @@ Install
 
 geokey-epicollect requires:
 
-- Python version 2.7
+- Python version 2.7 or 3.6
 - GeoKey version 1.6 or greater
 
 Make sure the dependencies are installed:

geokey_epicollect/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

geokey_epicollect/migrations/0002_epicollectmedia.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

geokey_epicollect/serializer.py

@@ -301,7 +301,7 @@ def serialize_entry_to_xml(self, observation):
         uploaded.text = observation.created_at.strftime('%Y-%m-%d %H:%M:%S')
         entry.append(uploaded)
 
-        for key, value in observation.properties.iteritems():
+        for key, value in observation.properties.items():
             tag_name = key.replace('-', '_')
             if key not in self.static_fields:
                 tag_name = tag_name + '_' + str(observation.category.id)
@@ -340,7 +340,7 @@ def serialize_entry_to_tsv(self, observation):
         line = line + 'created\t' + str(calendar.timegm(observation.created_at.utctimetuple())) + '\t'
         line = line + 'uploaded\t' + observation.created_at.strftime('%Y-%m-%d %H:%M:%S') + '\t'
 
-        for key, value in observation.properties.iteritems():
+        for key, value in observation.properties.items():
             tag_name = key.replace('-', '_')
             if key not in self.static_fields:
                 tag_name = tag_name + '_' + str(observation.category.id)

geokey_epicollect/tests/test_views.py

@@ -144,7 +144,7 @@ def test_get_not_existing_project(self):
         response = view(request, project_id=45454544)
         self.assertEqual(response.status_code, 403)
         self.assertIn(
-            response.content,
+            response.content.decode('utf-8'),
             '<error>The project must enabled for EpiCollect.</error>'
         )
 
@@ -182,7 +182,7 @@ def test_upload_data(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '1')
+        self.assertEqual(response.content.decode('utf-8'), '1')
 
     def test_upload_data_with_media(self):
         project = ProjectFactory.create(
@@ -214,7 +214,7 @@ def test_upload_data_with_media(self):
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(EpiCollectMedia.objects.count(), 2)
-        self.assertEqual(response.content, '1')
+        self.assertEqual(response.content.decode('utf-8'), '1')
 
     def test_upload_data_without_location(self):
         project = ProjectFactory.create(
@@ -243,7 +243,7 @@ def test_upload_data_without_location(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '0')
+        self.assertEqual(response.content.decode('utf-8'), '0')
 
     def test_upload_category_does_not_exist(self):
         project = ProjectFactory.create(
@@ -267,7 +267,7 @@ def test_upload_category_does_not_exist(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '0')
+        self.assertEqual(response.content.decode('utf-8'), '0')
 
     def test_upload_category_is_null(self):
         project = ProjectFactory.create(
@@ -291,7 +291,7 @@ def test_upload_category_is_null(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '0')
+        self.assertEqual(response.content.decode('utf-8'), '0')
 
     def test_upload_checkboxes(self):
         project = ProjectFactory.create(
@@ -325,7 +325,7 @@ def test_upload_checkboxes(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '1')
+        self.assertEqual(response.content.decode('utf-8'), '1')
 
     def test_upload_data_to_private_project(self):
         project = ProjectFactory.create()
@@ -352,7 +352,7 @@ def test_upload_data_to_private_project(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '0')
+        self.assertEqual(response.content.decode('utf-8'), '0')
 
     def test_upload_image(self):
         image = get_image()
@@ -374,7 +374,7 @@ def test_upload_image(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '1')
+        self.assertEqual(response.content.decode('utf-8'), '1')
 
     def test_upload_image_with_fullimage_flag(self):
         image = get_image()
@@ -396,7 +396,7 @@ def test_upload_image_with_fullimage_flag(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '1')
+        self.assertEqual(response.content.decode('utf-8'), '1')
 
     def test_upload_image_with_wrong_file_name(self):
         image = get_image()
@@ -418,7 +418,7 @@ def test_upload_image_with_wrong_file_name(self):
         view = EpiCollectUploadView.as_view()
         response = view(request, project_id=project.id)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '0')
+        self.assertEqual(response.content.decode('utf-8'), '0')
 
 
 class DownloadDataTest(APITestCase):

geokey_epicollect/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from views import (
+from geokey_epicollect.views import (
     IndexPage, EpiCollectProject, EpiCollectUploadView, EpiCollectDownloadView
 )
 

geokey_epicollect/views.py

@@ -16,7 +16,7 @@
 from geokey.contributions.models import ImageFile, MediaFile
 from geokey.users.models import User
 
-from serializer import ProjectFormSerializer, DataSerializer
+from geokey_epicollect.serializer import ProjectFormSerializer, DataSerializer
 from .models import (
     EpiCollectMedia,
     EpiCollectProject as EpiCollectProjectModel