From d69e5e4b5af7e348bef4fe0960c1919e1d9dbe76 Mon Sep 17 00:00:00 2001 From: "ade@google.com" Date: Tue, 31 Aug 2010 15:28:20 +0100 Subject: [PATCH] Added conditional import to ensure tests will work under Python 2.5 --- tests/test_json_model.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/test_json_model.py b/tests/test_json_model.py index 3014ee4..8049568 100644 --- a/tests/test_json_model.py +++ b/tests/test_json_model.py @@ -24,7 +24,13 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)' from apiclient.discovery import JsonModel import os import unittest -import urlparse + +# Python 2.5 requires different modules +try: + from urlparse import parse_qs +except ImportError: + from cgi import parse_qs + class Model(unittest.TestCase): @@ -71,7 +77,7 @@ class Model(unittest.TestCase): self.assertEqual(headers['accept'], 'application/json') self.assertEqual(headers['content-type'], 'application/json') - query_dict = urlparse.parse_qs(query) + query_dict = parse_qs(query) self.assertEqual(query_dict['foo'], ['1']) self.assertEqual(query_dict['bar'], [u'\N{COMET}'.encode('utf-8')]) self.assertEqual(body, '{"data": {}}')