Merge branch 'master' of git://gitorious.org/git-python/mainline

2 files changed, 10 insertions, 13 deletions

diff --git a/lib/git/__init__.py b/lib/git/__init__.py
index 54f77baf..7de5088a 100644
--- a/lib/git/__init__.py
+++ b/lib/git/__init__.py
@@ -1,10 +1,7 @@
 import os
 import inspect
 
-# grab the version information
-v = open(os.path.join(os.path.dirname(__file__), '..', '..', 'VERSION'))
-__version__ = v.readline().strip()
-v.close()
+__version__ = 'git'
 
 from git.actor import Actor
 from git.blob import Blob
diff --git a/lib/git/cmd.py b/lib/git/cmd.py
index 85d72353..afa13e2c 100644
--- a/lib/git/cmd.py
+++ b/lib/git/cmd.py
@@ -51,11 +51,11 @@ class Git(MethodMissingMixin):
         return self.git_dir
 
     def execute(self, command,
-                istream = None,
-                with_status = False,
-                with_stderr = False,
-                with_exceptions = False,
-                with_raw_output = False,
+                istream=None,
+                with_status=False,
+                with_stderr=False,
+                with_exceptions=False,
+                with_raw_output=False,
                 ):
         """
         Handles executing the command on the shell and consumes and returns
@@ -96,10 +96,10 @@ class Git(MethodMissingMixin):
 
         # Start the process
         proc = subprocess.Popen(command,
-                                cwd = self.git_dir,
-                                stdin = istream,
-                                stderr = stderr,
-                                stdout = subprocess.PIPE
+                                cwd=self.git_dir,
+                                stdin=istream,
+                                stderr=stderr,
+                                stdout=subprocess.PIPE
                                 )
 
         # Wait for the process to return