renamed git_python to git. Removed pop_key and replaced with dict.pop. Fixed up tests so they pass except for stderr test. Modified version information retrieval.

16 files changed, 37 insertions, 40 deletions

diff --git a/lib/git/__init__.py b/lib/git/__init__.py
new file mode 100644
index 00000000..66ce9a45
--- /dev/null
+++ b/lib/git/__init__.py
@@ -0,0 +1,24 @@
+import os
+import inspect
+
+# grab the version information
+v = open(os.path.join(os.path.dirname(__file__), '..', '..', 'VERSION'))
+__version__ = v.readline().strip()
+v.close()
+
+from git.actor import Actor
+from git.blob import Blob
+from git.commit import Commit
+from git.diff import Diff
+from git.errors import InvalidGitRepositoryError, NoSuchPathError, GitCommandError
+from git.gitter import Git
+from git.head import Head
+from git.repo import Repo
+from git.stats import Stats
+from git.tag import Tag
+from git.tree import Tree
+from git.utils import dashify
+from git.utils import touch
+
+__all__ = [ name for name, obj in locals().items()
+            if not (name.startswith('_') or inspect.ismodule(obj)) ]
diff --git a/lib/git_python/actor.py b/lib/git/actor.py
index ed21d8ba..ed21d8ba 100644
--- a/lib/git_python/actor.py
+++ b/lib/git/actor.py
diff --git a/lib/git_python/blob.py b/lib/git/blob.py
index 134cb93d..134cb93d 100644
--- a/lib/git_python/blob.py
+++ b/lib/git/blob.py
diff --git a/lib/git_python/commit.py b/lib/git/commit.py
index 701f6c04..701f6c04 100644
--- a/lib/git_python/commit.py
+++ b/lib/git/commit.py
diff --git a/lib/git_python/diff.py b/lib/git/diff.py
index 075b0f87..075b0f87 100644
--- a/lib/git_python/diff.py
+++ b/lib/git/diff.py
diff --git a/lib/git_python/errors.py b/lib/git/errors.py
index f3fae26b..f3fae26b 100644
--- a/lib/git_python/errors.py
+++ b/lib/git/errors.py
diff --git a/lib/git_python/git.py b/lib/git/gitter.py
index 759c9127..422552a7 100644
--- a/lib/git_python/git.py
+++ b/lib/git/gitter.py
@@ -15,9 +15,9 @@ class Git(MethodMissingMixin):
     def __init__(self, git_dir=None):
         super(Git, self).__init__()
         if git_dir:
-            self.find_git_dir( git_dir )
+            self.find_git_dir(git_dir)
         else:
-            self.find_git_dir( os.getcwd() )
+            self.find_git_dir(os.getcwd())
 
     def find_git_dir(self, path):
         """Find the best value for self.git_dir.
@@ -34,15 +34,15 @@ class Git(MethodMissingMixin):
 
         cdup = self.execute(["git", "rev-parse", "--show-cdup"])
         if cdup:
-            path = os.path.abspath( os.path.join( self.git_dir, cdup ) )
+            path = os.path.abspath(os.path.join(self.git_dir, cdup))
         else:
             is_bare_repository =\
-                self.rev_parse( is_bare_repository=True ) == "true"
+                self.rev_parse(is_bare_repository=True) == "true"
             is_inside_git_dir =\
-                self.rev_parse( is_inside_git_dir=True ) == "true"
+                self.rev_parse(is_inside_git_dir=True) == "true"
 
             if not is_bare_repository and is_inside_git_dir:
-                path = os.path.dirname( self.git_dir )
+                path = os.path.dirname(self.git_dir)
 
         self.git_dir = path
 
@@ -116,7 +116,7 @@ class Git(MethodMissingMixin):
         status = proc.poll()
         if with_exceptions and status != 0:
             raise GitCommandError("%s returned exit status %d"
-                                  % ( str(command), status ))
+                                  % (str(command), status))
 
         # Allow access to the command's status code
         if with_status:
@@ -167,11 +167,11 @@ class Git(MethodMissingMixin):
 
         # Handle optional arguments prior to calling transform_kwargs
         # otherwise these'll end up in args, which is bad.
-        istream = pop_key(kwargs, "istream")
-        with_status = pop_key(kwargs, "with_status")
-        with_stderr = pop_key(kwargs, "with_stderr")
-        with_exceptions = pop_key(kwargs, "with_exceptions")
-        with_raw_output = pop_key(kwargs, "with_raw_output")
+        istream = kwargs.pop("istream", None)
+        with_status = kwargs.pop("with_status", None)
+        with_stderr = kwargs.pop("with_stderr", None)
+        with_exceptions = kwargs.pop("with_exceptions", None)
+        with_raw_output = kwargs.pop("with_raw_output", None)
 
         # Prepare the argument list
         opt_args = self.transform_kwargs(**kwargs)
diff --git a/lib/git_python/head.py b/lib/git/head.py
index 58191fd8..58191fd8 100644
--- a/lib/git_python/head.py
+++ b/lib/git/head.py
diff --git a/lib/git_python/lazy.py b/lib/git/lazy.py
index 66e56c2b..66e56c2b 100644
--- a/lib/git_python/lazy.py
+++ b/lib/git/lazy.py
diff --git a/lib/git_python/method_missing.py b/lib/git/method_missing.py
index 478ee1d3..478ee1d3 100644
--- a/lib/git_python/method_missing.py
+++ b/lib/git/method_missing.py
diff --git a/lib/git_python/repo.py b/lib/git/repo.py
index c71ae6fb..c130650e 100644
--- a/lib/git_python/repo.py
+++ b/lib/git/repo.py
@@ -2,7 +2,7 @@ import os
 import re
 from errors import InvalidGitRepositoryError, NoSuchPathError
 from utils import touch
-from git import Git
+from gitter import Git
 from head import Head
 from blob import Blob
 from tag import Tag
diff --git a/lib/git_python/stats.py b/lib/git/stats.py
index 95dc875e..95dc875e 100644
--- a/lib/git_python/stats.py
+++ b/lib/git/stats.py
diff --git a/lib/git_python/tag.py b/lib/git/tag.py
index fb119f76..fb119f76 100644
--- a/lib/git_python/tag.py
+++ b/lib/git/tag.py
diff --git a/lib/git_python/tree.py b/lib/git/tree.py
index 9c4dab1d..9c4dab1d 100644
--- a/lib/git_python/tree.py
+++ b/lib/git/tree.py
diff --git a/lib/git_python/utils.py b/lib/git/utils.py
index f367c3e2..c2140ba0 100644
--- a/lib/git_python/utils.py
+++ b/lib/git/utils.py
@@ -3,9 +3,3 @@ def dashify(string):
 
 def touch(filename):
     open(filename, "a").close()
-
-def pop_key(d, key):
-    value = d.get(key, None)
-    if key in d:
-        del d[key]
-    return value
diff --git a/lib/git_python/__init__.py b/lib/git_python/__init__.py
deleted file mode 100644
index 36eb7b37..00000000
--- a/lib/git_python/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import inspect
-
-from git_python.actor import Actor
-from git_python.blob import Blob
-from git_python.commit import Commit
-from git_python.diff import Diff
-from git_python.errors import InvalidGitRepositoryError, NoSuchPathError
-from git_python.git import Git
-from git_python.head import Head
-from git_python.repo import Repo
-from git_python.stats import Stats
-from git_python.tag import Tag
-from git_python.tree import Tree
-from git_python.utils import dashify
-from git_python.utils import touch
-from git_python.utils import pop_key
-
-__all__ = [ name for name, obj in locals().items()
-            if not (name.startswith('_') or inspect.ismodule(obj)) ]
-
-__version__ = 'svn'