Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ matrix:
env: SPHINX="<1.3"

install:
- pip install fixtures $JINJA_REQ sphinx$SPHINX $TWISTED_REQ
- pip install fixtures $JINJA_REQ sphinx$SPHINX pyrsistent $TWISTED_REQ
- python setup.py install

script:
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pbr>=0.11
extras
pyrsistent
# 'mimeparse' has not been uploaded by the maintainer with Python3 compat
# but someone kindly uploaded a fixed version as 'python-mimeparse'.
python-mimeparse
Expand Down
5 changes: 4 additions & 1 deletion testtools/compat.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2008-2011 testtools developers. See LICENSE for details.
# Copyright (c) 2008-2015 testtools developers. See LICENSE for details.

"""Compatibility support for python 2 and 3."""

Expand All @@ -14,6 +14,7 @@
'StringIO',
'reraise',
'unicode_output_stream',
'text_or_bytes',
]

import codecs
Expand Down Expand Up @@ -66,6 +67,7 @@ def istext(x):
def classtypes():
return (type,)
str_is_unicode = True
text_or_bytes = (str, bytes)
else:
import __builtin__ as builtins
def _u(s):
Expand All @@ -83,6 +85,7 @@ def classtypes():
import types
return (type, types.ClassType)
str_is_unicode = sys.platform == "cli"
text_or_bytes = (unicode, str)

_u.__doc__ = __u_doc

Expand Down
Loading