From 17a6e3f3c3f16a94585d99504e8144f965701105 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Apr 26 2018 11:37:04 +0000 Subject: Fix string type check for Python 2 --- diff --git a/requirements.txt b/requirements.txt index f0a9c4b..cea0139 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,3 +26,6 @@ requests-gssapi # Database psycopg2-binary + +# Python 2 compatibility +six diff --git a/waiverdb.spec b/waiverdb.spec index 077b150..4a22ad2 100644 --- a/waiverdb.spec +++ b/waiverdb.spec @@ -43,6 +43,7 @@ BuildRequires: python3-click BuildRequires: python3-flask-migrate BuildRequires: python3-stomppy BuildRequires: python3-fedmsg +BuildRequires: python3-six BuildRequires: python-flask BuildRequires: python-sqlalchemy BuildRequires: python-flask-restful diff --git a/waiverdb/api_v1.py b/waiverdb/api_v1.py index 49426f3..5fd930b 100644 --- a/waiverdb/api_v1.py +++ b/waiverdb/api_v1.py @@ -2,6 +2,8 @@ import json +from six import string_types + import requests from flask import Blueprint, request, current_app from flask_restful import Resource, Api, reqparse, marshal_with, marshal @@ -37,7 +39,7 @@ def get_resultsdb_result(result_id): def _validate_results_filter(results): expected = { 'subject': dict, - 'testcase': str, + 'testcase': string_types, } for item in results: for k, v in item.items():