Skip to content

can't concatenate bytes to str in python3 problem was solved #54

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

Merged
prashanthellina merged 1 commit into from
Mar 9, 2018
Merged

can't concatenate bytes to str in python3 problem was solved #54

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ deploy:
- basescript/utils.py
- examples/adder.py
- examples/helloworld.py
name: basescript-0.2.0
tag_name: 0.2.0
name: basescript-0.2.1
tag_name: 0.2.1
on:
repo: deep-compute/basescript
- provider: pypi
Expand Down
5 changes: 5 additions & 0 deletions basescript/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,13 @@ def _proxy_to_logger(self, method_name, event, *event_args,
it also preserves positional arguments in the `event_dict` so
that the stdblib's support for format strings can be used.
"""

if isinstance(event, bytes):
event = event.decode('utf-8')

if event_args:
event_kw['positional_args'] = event_args

return super(BoundLevelLogger, self)._proxy_to_logger(method_name,
event=event,
**event_kw)
Expand Down
9 changes: 5 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def get_long_description():

long_description = get_long_description()

version = '0.2.0'
version = '0.2.1'
setup(
name="basescript",
version=version,
Expand All @@ -35,15 +35,16 @@ def get_long_description():
download_url="https://github.com/deep-compute/basescript/tarball/%s" % version,
license='MIT License',
install_requires=[
"pytz",
"structlog",
"colorama",
"pytz==2018.3",
"structlog==18.1.0",
"colorama==0.3.9",
],
package_dir={'basescript': 'basescript'},
packages=find_packages('.', exclude=['tests*']),
include_package_data=True,
classifiers=[
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.5",
"Environment :: Console",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
Expand Down