Skip to content

Commit 25b6802

Browse files
committed
Merge branch 'issue_4' of https://github.com/kevin-brown/gitdb into kevin-brown-issue_4
Conflicts: gitdb/db/ref.py
2 parents 81707c6 + c63dcac commit 25b6802

35 files changed

+1501
-1377
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ python:
33
- "2.6"
44
- "2.7"
55
- "3.3"
6+
- "3.4"
67
# - "pypy" - won't work as smmap doesn't work (see smmap/.travis.yml for details)
78

89
script: nosetests

gitdb/__init__.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ def _init_externals():
1212
"""Initialize external projects by putting them into the path"""
1313
for module in ('async', 'smmap'):
1414
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', module))
15-
15+
1616
try:
1717
__import__(module)
1818
except ImportError:
1919
raise ImportError("'%s' could not be imported, assure it is located in your PYTHONPATH" % module)
2020
#END verify import
2121
#END handel imports
22-
22+
2323
#} END initialization
2424

2525
_init_externals()
@@ -32,7 +32,6 @@ def _init_externals():
3232

3333

3434
# default imports
35-
from db import *
36-
from base import *
37-
from stream import *
38-
35+
from gitdb.base import *
36+
from gitdb.db import *
37+
from gitdb.stream import *

0 commit comments

Comments
 (0)