Skip to content

Python3 support (via 2to3). May need some extra work. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ercpe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python3 support (via 2to3). May need some extra work. #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions httpheader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
DIGIT = '0123456789'
HEX = '0123456789ABCDEFabcdef'

import sys

# Try to get a set/frozenset implementation if possible
try:
type(frozenset)
Expand All @@ -126,7 +128,7 @@

def _is_string( obj ):
"""Returns True if the object is a string or unicode type."""
return isinstance(obj,str) or isinstance(obj,unicode)
return isinstance(obj, str) or isinstance(obj, unicode) if sys.version_info.major == 2 else isinstance(obj, str)


def http_datetime( dt=None ):
Expand Down Expand Up @@ -496,10 +498,10 @@ def _test_comments():
def _testrm( a, b, collapse ):
b2 = remove_comments( a, collapse )
if b != b2:
print 'Comment test failed:'
print ' remove_comments( %s, collapse_spaces=%s ) -> %s' \
% (repr(a), repr(collapse), repr(b2))
print ' expected %s' % repr(b)
print('Comment test failed:')
print(' remove_comments( %s, collapse_spaces=%s ) -> %s' \
% (repr(a), repr(collapse), repr(b2)))
print(' expected %s' % repr(b))
return 1
return 0
failures = 0
Expand Down Expand Up @@ -1333,20 +1335,23 @@ def _set_minor(self, s):
minor = property(_get_minor,_set_minor,doc="Minor media sub-classification")

def __nonzero__(self):
return self.__bool__()

def __bool__(self):
return True

def __str__(self):
"""String value."""
s = '%s/%s' % (self.major, self.minor)
if self.parmdict:
extra = '; '.join([ '%s=%s' % (a[0],quote_string(a[1],False)) \
for a in self.parmdict.items()])
for a in list(self.parmdict.items())])
s += '; ' + extra
return s

def __unicode__(self):
"""Unicode string value."""
return unicode(self.__str__())
return str(self.__str__())

def __repr__(self):
"""Python representation of this object."""
Expand Down Expand Up @@ -1509,7 +1514,7 @@ def acceptable_content_type( accept_header, content_types, ignore_wildcard=True
elif client_ct.minor == server_ct.minor: # something/something is a 3
matchlen = 3
# must make sure all the parms match too
for pname, pval in client_ct.parmdict.items():
for pname, pval in list(client_ct.parmdict.items()):
sval = server_ct.parmdict.get(pname)
if pname == 'charset':
# special case for charset to match aliases
Expand Down Expand Up @@ -1764,7 +1769,7 @@ def __str__(self):

def __unicode__(self):
"""The unicode string form of this language tag."""
return unicode(self.__str__())
return str(self.__str__())

def __repr__(self):
"""The python representation of this language tag."""
Expand Down