diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:14:33 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:14:33 +0100 |
commit | f6aa8d116eb33293c0a9d6d600eb7c32832758b9 (patch) | |
tree | ee07288965cfd4e8326c57735e94c347ee7dd829 /git/util.py | |
parent | 3936084cdd336ce7db7d693950e345eeceab93a5 (diff) | |
download | gitpython-f6aa8d116eb33293c0a9d6d600eb7c32832758b9.tar.gz |
initial set of adjustments to make (most) imports work.
More to come, especially when it's about strings
Diffstat (limited to 'git/util.py')
-rw-r--r-- | git/util.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git/util.py b/git/util.py index fecd9fa2..b3a22883 100644 --- a/git/util.py +++ b/git/util.py @@ -15,7 +15,8 @@ import getpass # NOTE: Some of the unused imports might be used/imported by others. # Handle once test-cases are back up and running. -from exc import GitCommandError +from .exc import GitCommandError +from .compat import MAXSIZE # Most of these are unused here, but are for use by git-python modules so these # don't see gitdb all the time. Flake of course doesn't like it. @@ -548,7 +549,7 @@ class BlockingLockFile(LockFile): can never be obtained.""" __slots__ = ("_check_interval", "_max_block_time") - def __init__(self, file_path, check_interval_s=0.3, max_block_time_s=sys.maxint): + def __init__(self, file_path, check_interval_s=0.3, max_block_time_s=MAXSIZE): """Configure the instance :parm check_interval_s: |