summaryrefslogtreecommitdiff
path: root/git/objects/blob.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-02-10 21:40:53 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-02-10 21:40:53 +0100
commit1cb02ebcaa4891c01a1d6cba11a3cd9806fad782 (patch)
tree51130c659e5089434e84404940ed1451f6c5d5cc /git/objects/blob.py
parent660bdca125aa9dcca7a7730535bec433edb8ba02 (diff)
parentf77230f618722e964a76657ebb03d822b2f73518 (diff)
downloadgitpython-1cb02ebcaa4891c01a1d6cba11a3cd9806fad782.tar.gz
Merge branch 'feature/spaces-and-cleanup-master'
* feature/spaces-and-cleanup-master: Basic fixes to get tests back on track. Of course there is much more work to be done here removed leftover gitdb - I thought it was merged into git tabs to 4 spaces - overall state of this branch is desolate, but fixable. Needs plenty of work
Diffstat (limited to 'git/objects/blob.py')
-rw-r--r--git/objects/blob.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/git/objects/blob.py b/git/objects/blob.py
index 9c51f99f..7217101f 100644
--- a/git/objects/blob.py
+++ b/git/objects/blob.py
@@ -13,24 +13,24 @@ import base
__all__ = ('Blob', )
class Blob(base.IndexObject, RepoAliasMixin):
- """A Blob encapsulates a git blob object"""
- DEFAULT_MIME_TYPE = "text/plain"
- type = ObjectType.blob
- type_id = ObjectType.blob_id
-
- # valid blob modes
- executable_mode = 0100755
- file_mode = 0100644
- link_mode = 0120000
+ """A Blob encapsulates a git blob object"""
+ DEFAULT_MIME_TYPE = "text/plain"
+ type = ObjectType.blob
+ type_id = ObjectType.blob_id
+
+ # valid blob modes
+ executable_mode = 0100755
+ file_mode = 0100644
+ link_mode = 0120000
- __slots__ = tuple()
+ __slots__ = tuple()
- @property
- def mime_type(self):
- """
- :return: String describing the mime type of this file (based on the filename)
- :note: Defaults to 'text/plain' in case the actual file type is unknown. """
- guesses = None
- if self.path:
- guesses = guess_type(self.path)
- return guesses and guesses[0] or self.DEFAULT_MIME_TYPE
+ @property
+ def mime_type(self):
+ """
+ :return: String describing the mime type of this file (based on the filename)
+ :note: Defaults to 'text/plain' in case the actual file type is unknown. """
+ guesses = None
+ if self.path:
+ guesses = guess_type(self.path)
+ return guesses and guesses[0] or self.DEFAULT_MIME_TYPE