Corrected conflict with pep8 changes from apollo13.

2 files changed, 10 insertions, 10 deletions

diff --git a/lib/git/commit.py b/lib/git/commit.py
index e35090a1..091cf78c 100644
--- a/lib/git/commit.py
+++ b/lib/git/commit.py
@@ -171,7 +171,7 @@ class Commit(LazyMixin):
         return commits
 
     @classmethod
-    def diff(cls, repo, a, b = None, paths = None):
+    def diff(cls, repo, a, b=None, paths=None):
         """
         Show diffs between two trees:
 
diff --git a/lib/git/repo.py b/lib/git/repo.py
index 47f9c2ce..2d0fb973 100644
--- a/lib/git/repo.py
+++ b/lib/git/repo.py
@@ -100,7 +100,7 @@ class Repo(object):
         """
         return Tag.find_all(self)
 
-    def commits(self, start = 'master', path = '', max_count = 10, skip = 0):
+    def commits(self, start='master', path='', max_count=10, skip=0):
         """
         A list of Commit objects representing the history of a given ref/commit
 
@@ -143,7 +143,7 @@ class Repo(object):
         """
         return Commit.find_all(self, "%s..%s" % (frm, to), path).reverse()
 
-    def commits_since(self, start = 'master', path = '', since = '1970-01-01'):
+    def commits_since(self, start='master', path='', since='1970-01-01'):
         """
         The Commits objects that are newer than the specified date.
         Commits are returned in chronological order.
@@ -164,7 +164,7 @@ class Repo(object):
 
         return Commit.find_all(self, start, path, **options)
 
-    def commit_count(self, start = 'master', path = ''):
+    def commit_count(self, start='master', path=''):
         """
         The number of commits reachable by the given branch/commit
 
@@ -200,7 +200,7 @@ class Repo(object):
             raise ValueError, 'Invalid identifier %s' % id
         return commits[0]
 
-    def commit_deltas_from(self, other_repo, ref = 'master', other_ref = 'master'):
+    def commit_deltas_from(self, other_repo, ref='master', other_ref='master'):
         """
         Returns a list of commits that is in ``other_repo`` but not in self
 
@@ -213,7 +213,7 @@ class Repo(object):
         diff_refs = list(set(other_repo_refs) - set(repo_refs))
         return map(lambda ref: Commit.find_all(other_repo, ref, max_count=1)[0], diff_refs)
 
-    def tree(self, treeish = 'master'):
+    def tree(self, treeish='master'):
         """
         The Tree object for the given treeish reference
 
@@ -242,7 +242,7 @@ class Repo(object):
         """
         return Blob(self, id=id)
 
-    def log(self, commit = 'master', path = None, **kwargs):
+    def log(self, commit='master', path=None, **kwargs):
         """
         The commit log for a treeish
 
@@ -330,7 +330,7 @@ class Repo(object):
         self.git.clone(self.path, path, **options)
         return Repo(path)
 
-    def archive_tar(self, treeish = 'master', prefix = None):
+    def archive_tar(self, treeish='master', prefix=None):
         """
         Archive the given treeish
 
@@ -359,7 +359,7 @@ class Repo(object):
             options['prefix'] = prefix
         return self.git.archive(treeish, **options)
 
-    def archive_tar_gz(self, treeish = 'master', prefix = None):
+    def archive_tar_gz(self, treeish='master', prefix=None):
         """
         Archive and gzip the given treeish
 
@@ -470,7 +470,7 @@ class Repo(object):
     def active_branch(self):
         """
         The name of the currently active branch.
-        
+
         Returns
             str (the branch name)
         """