Skip to content

Commit 6d5f33d

Browse files
Merge pull request #54 from RamanjaneyuluIdavalapati/master
can't concatenate bytes to str in python3 problem was solved
2 parents cf9c8ab + f26c9f1 commit 6d5f33d

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ deploy:
2727
- basescript/utils.py
2828
- examples/adder.py
2929
- examples/helloworld.py
30-
name: basescript-0.2.0
31-
tag_name: 0.2.0
30+
name: basescript-0.2.1
31+
tag_name: 0.2.1
3232
on:
3333
repo: deep-compute/basescript
3434
- provider: pypi

basescript/log.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,13 @@ def _proxy_to_logger(self, method_name, event, *event_args,
225225
it also preserves positional arguments in the `event_dict` so
226226
that the stdblib's support for format strings can be used.
227227
"""
228+
229+
if isinstance(event, bytes):
230+
event = event.decode('utf-8')
231+
228232
if event_args:
229233
event_kw['positional_args'] = event_args
234+
230235
return super(BoundLevelLogger, self)._proxy_to_logger(method_name,
231236
event=event,
232237
**event_kw)

setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def get_long_description():
2222

2323
long_description = get_long_description()
2424

25-
version = '0.2.0'
25+
version = '0.2.1'
2626
setup(
2727
name="basescript",
2828
version=version,
@@ -35,15 +35,16 @@ def get_long_description():
3535
download_url="https://github.com/deep-compute/basescript/tarball/%s" % version,
3636
license='MIT License',
3737
install_requires=[
38-
"pytz",
39-
"structlog",
40-
"colorama",
38+
"pytz==2018.3",
39+
"structlog==18.1.0",
40+
"colorama==0.3.9",
4141
],
4242
package_dir={'basescript': 'basescript'},
4343
packages=find_packages('.', exclude=['tests*']),
4444
include_package_data=True,
4545
classifiers=[
4646
"Programming Language :: Python :: 2.7",
47+
"Programming Language :: Python :: 3.5",
4748
"Environment :: Console",
4849
"Intended Audience :: Developers",
4950
"License :: OSI Approved :: MIT License",

0 commit comments

Comments
 (0)