8000 Fix repository crash if path passed is not a str by thomwiggers · Pull Request #593 · libgit2/pygit2 · GitHub
[go: up one dir, main page]
Skip to content

Fix repository crash if path passed is not a str #593

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
jdavid merged 2 commits into from
Feb 28, 2016
Merged

Fix repository crash if path passed is not a str #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc424e3
Add unit tests for bytes and unicode Repositories
thomwiggers Feb 27, 2016
735510f
Fix repository crash if path passed is not a str
thomwiggers Feb 28, 2016
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
8 changes: 6 additions & 2 deletions pygit2/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
else:
from io import BytesIO as StringIO

import six

# Import from pygit2
from _pygit2 import Repository as _Repository
from _pygit2 import Oid, GIT_OID_HEXSZ, GIT_OID_MINPREFIXLEN
Expand All @@ -56,8 +58,10 @@

class Repository(_Repository):

def __init__(self, *args, **kwargs):
super(Repository, self).__init__(*args, **kwargs)
def __init__(self, path, *args, **kwargs):
if not isinstance(path, six.string_types):
path = path.decode('utf-8')
super(Repository, self).__init__(path, *args, **kwargs)
self._common_init()

@classmethod
Expand Down
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@

# Python 2 support
# See https://github.com/libgit2/pygit2/pull/180 for a discussion about this.
# Using six isn't an option here yet, we don't necessarily have six installed
if sys.version_info[0] == 2:
u = lambda s: unicode(s, 'utf-8')
else:
Expand Down Expand Up @@ -186,7 +187,7 @@ def run(self):
if cffi_major_version == 0:
extra_args['ext_modules'].append(ffi.verifier.get_extension())
else:
extra_args['cffi_modules']=['pygit2/_run.py:ffi']
extra_args['cffi_modules'] = ['pygit2/_run.py:ffi']


setup(name='pygit2',
Expand All @@ -202,7 +203,7 @@ def run(self):
packages=['pygit2'],
package_data={'pygit2': ['decl.h']},
setup_requires=['cffi'],
install_requires=['cffi'],
install_requires=['cffi', 'six'],
zip_safe=False,
cmdclass=cmdclass,
**extra_args)
9 changes: 8 additions & 1 deletion test/test_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
from os.path import join, realpath
import sys

import six

# Import from pygit2
from pygit2 import GIT_OBJ_ANY, GIT_OBJ_BLOB, GIT_OBJ_COMMIT
from pygit2 import init_repository, clone_repository, discover_repository
Expand Down Expand Up @@ -482,12 +484,17 @@ def test_head(self):
self.assertFalse(self.repo.head_is_detached)


class BytesStringRepositoryTest(utils.NoRepoTestCase):
class StringTypesRepositoryTest(utils.NoRepoTestCase):

def test_bytes_string(self):
repo_path = b'./test/data/testrepo.git/'
pygit2.Repository(repo_path)

def test_unicode_string(self):
# String is unicode because of unicode_literals
repo_path = './test/data/testrepo.git/'
pygit2.Repository(repo_path)


class CloneRepositoryTest(utils.NoRepoTestCase):

Expand Down
0