Skip to content

Fix python 2 / 3 version check for basestring #28

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
dpkp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix python 2 / 3 version check for basestring #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
018f621
Fix python 2 / 3 version check for basestring
dpkp Feb 24, 2017
704b9b7
Encode non-string-type attributes with str; drop unneeded double encode.
dpkp Feb 24, 2017
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
6 changes: 3 additions & 3 deletions bernhard/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from . import pb

string_type = str
if sys.version_info[1] < 3:
if sys.version_info.major < 3:
string_type = basestring

class TransportError(Exception):
Expand Down Expand Up @@ -155,8 +155,8 @@ def __setattr__(self, name, value):
if isinstance(val, bytes):
val = val.decode('utf-8')
elif not isinstance(val, string_type):
val = string_type(val)
a.value = string_type(val)
val = str(val)
a.value = val
else:
raise TypeError("'attributes' parameter must be type 'dict'")
elif name in set(f.name for f in pb.Event.DESCRIPTOR.fields):
Expand Down