summaryrefslogtreecommitdiff
path: root/git/objects/base.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-10-22 11:11:25 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-10-22 11:11:25 +0200
commitcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (patch)
tree2f688eb182f2e76091134c47c4a327681c12e15b /git/objects/base.py
parentafcd64ebbb770908bd2a751279ff070dea5bb97c (diff)
parentcc77e6b2862733a211c55cf29cc7a83c36c27919 (diff)
downloadgitpython-caa0ea7a0893fe90ea043843d4e6ad407126d7b8.tar.gz
Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ankostis-cygwin
Diffstat (limited to 'git/objects/base.py')
-rw-r--r--git/objects/base.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/git/objects/base.py b/git/objects/base.py
index 8027299c..4f078e38 100644
--- a/git/objects/base.py
+++ b/git/objects/base.py
@@ -3,14 +3,13 @@
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from .util import get_object_type_by_name
-from git.util import LazyMixin, join_path_native, stream_copy
-from gitdb.util import (
- bin_to_hex,
- basename
-)
+from git.util import LazyMixin, join_path_native, stream_copy, bin_to_hex
import gitdb.typ as dbtyp
+import os.path as osp
+
+from .util import get_object_type_by_name
+
_assertion_msg_format = "Created object %r whose python type %r disagrees with the acutal git object type %r"
@@ -170,7 +169,7 @@ class IndexObject(Object):
@property
def name(self):
""":return: Name portion of the path, effectively being the basename"""
- return basename(self.path)
+ return osp.basename(self.path)
@property
def abspath(self):