Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
klen committed Sep 13, 2017
2 parents cff6ab4 + c07a906 commit c38d598
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,6 +1,6 @@
[bumpversion]
commit = True
current_version = 7.4.2
current_version = 7.4.3
files = pylama/__init__.py
tag = True
tag_name = {new_version}
Expand Down
2 changes: 1 addition & 1 deletion pylama/__init__.py
Expand Up @@ -4,7 +4,7 @@
:license: BSD, see LICENSE for more details.
"""

__version__ = "7.4.2"
__version__ = "7.4.3"
__project__ = "pylama"
__author__ = "Kirill Klenov <horneds@gmail.com>"
__license__ = "GNU LGPL"
6 changes: 5 additions & 1 deletion pylama/hook.py
Expand Up @@ -33,7 +33,11 @@ def git_hook(error=True):

options = parse_options()
setup_logger(options)
candidates = list(map(str, files_modified))
if sys.version_info >= (3,):
candidates = [f.decode('utf-8') for f in files_modified]
else:
candidates = [str(f) for f in files_modified]

if candidates:
process_paths(options, candidates=candidates, error=error)

Expand Down

0 comments on commit c38d598

Please sign in to comment.