Merge branch 'autopep' into 0.3

Resolves https://github.com/gitpython-developers/GitPython/pull/182

1 files changed, 11 insertions, 11 deletions

diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 4672901c..5fa0c77b 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -1,24 +1,24 @@
 from git.test.lib import *
 from git.objects.fun import (
-                                traverse_tree_recursive,
-                                traverse_trees_recursive,
-                                tree_to_stream,
-                                tree_entries_from_data
-                            )
+    traverse_tree_recursive,
+    traverse_trees_recursive,
+    tree_to_stream,
+    tree_entries_from_data
+)
 
 from git.index.fun import (
-                            aggressive_tree_merge
-                            )
+    aggressive_tree_merge
+)
 
 from gitdb.util import bin_to_hex
 from gitdb.base import IStream
 from gitdb.typ import str_tree_type
 
 from stat import (
-                    S_IFDIR,
-                    S_IFREG,
-                    S_IFLNK
-                )
+    S_IFDIR,
+    S_IFREG,
+    S_IFLNK
+)
 
 from git.index import IndexFile
 from cStringIO import StringIO