Merge branch 'feature/spaces-and-cleanup-0.3' into 0.3

* feature/spaces-and-cleanup-0.3:
  Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it
  Adjusted required versions of pre-requisites, now the majority of the tests work
  tabs to 4 spaces - this won't make integrating the patches easier, but it's probably a good idea to go a little more pep8 (and fix sins of my youth ;) )

1 files changed, 36 insertions, 36 deletions

diff --git a/git/exc.py b/git/exc.py
index d2cb8d7e..3b3091e2 100644
--- a/git/exc.py
+++ b/git/exc.py
@@ -8,51 +8,51 @@
 from gitdb.exc import *
 
 class InvalidGitRepositoryError(Exception):
-	""" Thrown if the given repository appears to have an invalid format.  """
+    """ Thrown if the given repository appears to have an invalid format.  """
 
 
 class NoSuchPathError(OSError):
-	""" Thrown if a path could not be access by the system. """
+    """ Thrown if a path could not be access by the system. """
 
 
 class GitCommandError(Exception):
-	""" Thrown if execution of the git command fails with non-zero status code. """
-	def __init__(self, command, status, stderr=None):
-		self.stderr = stderr
-		self.status = status
-		self.command = command
-		
-	def __str__(self):
-		return ("'%s' returned exit status %i: %s" %
-					(' '.join(str(i) for i in self.command), self.status, self.stderr))
+    """ Thrown if execution of the git command fails with non-zero status code. """
+    def __init__(self, command, status, stderr=None):
+        self.stderr = stderr
+        self.status = status
+        self.command = command
+        
+    def __str__(self):
+        return ("'%s' returned exit status %i: %s" %
+                    (' '.join(str(i) for i in self.command), self.status, self.stderr))
 
 
 class CheckoutError( Exception ):
-	"""Thrown if a file could not be checked out from the index as it contained
-	changes.
-
-	The .failed_files attribute contains a list of relative paths that failed
-	to be checked out as they contained changes that did not exist in the index.
-
-	The .failed_reasons attribute contains a string informing about the actual
-	cause of the issue.
-
-	The .valid_files attribute contains a list of relative paths to files that
-	were checked out successfully and hence match the version stored in the
-	index"""
-	def __init__(self, message, failed_files, valid_files, failed_reasons):
-		Exception.__init__(self, message)
-		self.failed_files = failed_files
-		self.failed_reasons = failed_reasons
-		self.valid_files = valid_files
-
-	def __str__(self):
-		return Exception.__str__(self) + ":%s" % self.failed_files
-		
-		
+    """Thrown if a file could not be checked out from the index as it contained
+    changes.
+
+    The .failed_files attribute contains a list of relative paths that failed
+    to be checked out as they contained changes that did not exist in the index.
+
+    The .failed_reasons attribute contains a string informing about the actual
+    cause of the issue.
+
+    The .valid_files attribute contains a list of relative paths to files that
+    were checked out successfully and hence match the version stored in the
+    index"""
+    def __init__(self, message, failed_files, valid_files, failed_reasons):
+        Exception.__init__(self, message)
+        self.failed_files = failed_files
+        self.failed_reasons = failed_reasons
+        self.valid_files = valid_files
+
+    def __str__(self):
+        return Exception.__str__(self) + ":%s" % self.failed_files
+        
+        
 class CacheError(Exception):
-	"""Base for all errors related to the git index, which is called cache internally"""
+    """Base for all errors related to the git index, which is called cache internally"""
 
 class UnmergedEntriesError(CacheError):
-	"""Thrown if an operation cannot proceed as there are still unmerged 
-	entries in the cache"""
+    """Thrown if an operation cannot proceed as there are still unmerged 
+    entries in the cache"""