Skip to content

Commit d69e5e4

Browse files
author
ade@google.com
committed
Added conditional import to ensure tests will work under Python 2.5
1 parent 3bbbf66 commit d69e5e4

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

tests/test_json_model.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
from apiclient.discovery import JsonModel
2525
import os
2626
import unittest
27-
import urlparse
27+
28+
# Python 2.5 requires different modules
29+
try:
30+
from urlparse import parse_qs
31+
except ImportError:
32+
from cgi import parse_qs
33+
2834

2935

3036
class Model(unittest.TestCase):
@@ -71,7 +77,7 @@ def test_json_build_query(self):
7177
self.assertEqual(headers['accept'], 'application/json')
7278
self.assertEqual(headers['content-type'], 'application/json')
7379

74-
query_dict = urlparse.parse_qs(query)
80+
query_dict = parse_qs(query)
7581
self.assertEqual(query_dict['foo'], ['1'])
7682
self.assertEqual(query_dict['bar'], [u'\N{COMET}'.encode('utf-8')])
7783
self.assertEqual(body, '{"data": {}}')

0 commit comments

Comments
 (0)