Skip to content

Commit 56d5d0c

Browse files
committed
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 ;) )
2 parents 0b820e6 + dbe78c0 commit 56d5d0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+13766
-13757
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "gitdb"]
22
path=git/ext/gitdb
3-
url=http://github.com/gitpython-developers/gitdb.git
3+
url=http://github.com/gitpython-developers/gitdb.git

‎README.rst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ The object database implementation is optimized for handling large quantities of
1111
REQUIREMENTS
1212
============
1313

14-
* Git ( tested with 1.7.3.2 )
14+
* Git ( tested with 1.8.3.4 )
1515
* Python Nose - used for running the tests
16-
* Mock by Michael Foord used for tests. Requires 0.5
16+
* Tested with nose 1.3.0
17+
* Mock by Michael Foord used for tests
18+
* Tested with 1.0.1
1719

1820
INSTALL
1921
=======

‎git/__init__.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
#{Initialization
1515
def_init_externals():
16-
"""Initialize external projects by putting them into the path"""
17-
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'gitdb'))
18-
19-
try:
20-
importgitdb
21-
exceptImportError:
22-
raiseImportError("'gitdb' could not be found in your PYTHONPATH")
23-
#END verify import
24-
16+
"""Initialize external projects by putting them into the path"""
17+
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'gitdb'))
18+
19+
try:
20+
importgitdb
21+
exceptImportError:
22+
raiseImportError("'gitdb' could not be found in your PYTHONPATH")
23+
#END verify import
24+
2525
#} END initialization
2626

2727
#################
@@ -41,14 +41,14 @@ def _init_externals():
4141
fromgit.remoteimport*
4242
fromgit.indeximport*
4343
fromgit.utilimport (
44-
LockFile,
45-
BlockingLockFile,
46-
Stats,
47-
Actor
48-
)
44+
LockFile,
45+
BlockingLockFile,
46+
Stats,
47+
Actor
48+
)
4949

5050
#} END imports
5151

5252
__all__= [ nameforname, objinlocals().items()
53-
ifnot (name.startswith('_') orinspect.ismodule(obj)) ]
54-
53+
ifnot (name.startswith('_') orinspect.ismodule(obj)) ]
54+

0 commit comments

Comments
(0)