python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2024-11-28 08:38:44 +02:00
Code

Python 3 fixes.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-07-17 01:26:21 +02:00
parent 2d7df0afb4
commit f29c458611
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpie/pretty.py
View File

@ -40,7 +40,7 @@ class PrettyHttp(object):
if application_match:
# Strip vendor and extensions from Content-Type
vendor, extension = application_match.groups()
content_type = content_type.replace(vendor, u"")
content_type = content_type.replace(vendor, '')
try:
lexer = get_lexer_for_mimetype(content_type)

15
tests/tests.py
View File

@ -5,7 +5,7 @@ import os
import sys
import tempfile
import json
from requests.compat import is_py26
from requests.compat import is_py26, is_py3
from requests import Response
@ -453,7 +453,7 @@ class FakeResponse(Response):
return self
def __repr__(self):
return u'Mock string'
return 'Mock string'
def __unicode__(self):
return self.__repr__()
@ -470,8 +470,13 @@ class UnicodeOutputTestCase(BaseTestCase):
def test_unicode_output(self):
# some cyrillic and simplified chinese symbols
response_dict = {u'Привет': u'Мир!',
u'Hello': u'世界'}
response_dict = {'Привет': 'Мир!',
'Hello': '世界'}
if not is_py3:
response_dict = dict(
(k.decode('utf8'), v.decode('utf8'))
for k, v in response_dict.items()
)
response_body = json.dumps(response_dict)
# emulate response
response = FakeResponse(response_body)
@ -486,7 +491,7 @@ class UnicodeOutputTestCase(BaseTestCase):
# colorized output contains escape sequences
output = __main__._get_output(args, True, response)
for key, value in response_dict.iteritems():
for key, value in response_dict.items():
self.assertIn(key, output)
self.assertIn(value, output)