diff options
| author | Tim Van Steenburgh <tvansteenburgh@gmail.com> | 2013-04-17 18:43:19 +0000 |
|---|---|---|
| committer | Tim Van Steenburgh <tvansteenburgh@gmail.com> | 2013-04-17 18:43:19 +0000 |
| commit | 5869c5c1a51d448a411ae0d51d888793c35db9c0 (patch) | |
| tree | 3f1ecb1a03893eb8b959554f02175361e0004524 | |
| parent | f122a6aa3eb386914faa58ef3bf336f27b02fab0 (diff) | |
| download | gitpython-5869c5c1a51d448a411ae0d51d888793c35db9c0.tar.gz | |
Fix whacky indentation
Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
| -rw-r--r-- | git/objects/fun.py | 14 | ||||
| -rw-r--r-- | git/test/test_fun.py | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/git/objects/fun.py b/git/objects/fun.py index 8c380644..e2d4df55 100644 --- a/git/objects/fun.py +++ b/git/objects/fun.py @@ -70,13 +70,13 @@ def tree_entries_from_data(data): # default encoding for strings in git is utf8 # Only use the respective unicode object if the byte stream was encoded name = data[ns:i] - try: - name_enc = name.decode("utf-8") - except UnicodeDecodeError: - pass - else: - if len(name) > len(name_enc): - name = name_enc + try: + name_enc = name.decode("utf-8") + except UnicodeDecodeError: + pass + else: + if len(name) > len(name_enc): + name = name_enc # END handle encoding # byte is NULL, get next 20 diff --git a/git/test/test_fun.py b/git/test/test_fun.py index 36435ae4..bbd5d159 100644 --- a/git/test/test_fun.py +++ b/git/test/test_fun.py @@ -251,6 +251,6 @@ class TestFun(TestBase): # END for each commit def test_tree_entries_from_data(): - from git.objects.fun import tree_entries_from_data - r = tree_entries_from_data(b'100644 \x9f\0aaa') - assert r == [('aaa', 33188, '\x9f')], r + from git.objects.fun import tree_entries_from_data + r = tree_entries_from_data(b'100644 \x9f\0aaa') + assert r == [('aaa', 33188, '\x9f')], r |