summaryrefslogtreecommitdiff
path: root/git/test/test_fun.py
diff options
context:
space:
mode:
authorAntoine Musso <hashar@free.fr>2014-11-16 20:56:53 +0100
committerAntoine Musso <hashar@free.fr>2014-11-16 21:05:53 +0100
commit614907b7445e2ed8584c1c37df7e466e3b56170f (patch)
tree4b6e09110cd356799e9fa0f188fae55e5fa81fca /git/test/test_fun.py
parentbe34ec23c48d6d5d8fd2ef4491981f6fb4bab8e6 (diff)
downloadgitpython-614907b7445e2ed8584c1c37df7e466e3b56170f.tar.gz
pep8 linting (whitespace before/after)
E201 whitespace after '(' E202 whitespace before ')' E203 whitespace before ':' E225 missing whitespace around operator E226 missing whitespace around arithmetic operator E227 missing whitespace around bitwise or shift operator E228 missing whitespace around modulo operator E231 missing whitespace after ',' E241 multiple spaces after ',' E251 unexpected spaces around keyword / parameter equals
Diffstat (limited to 'git/test/test_fun.py')
-rw-r--r--git/test/test_fun.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index f435f31b..9d6f3ea4 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -65,7 +65,7 @@ class TestFun(TestBase):
self._assert_index_entries(aggressive_tree_merge(odb, trees), trees)
# too many trees
- self.failUnlessRaises(ValueError, aggressive_tree_merge, odb, trees*2)
+ self.failUnlessRaises(ValueError, aggressive_tree_merge, odb, trees * 2)
def mktree(self, odb, entries):
"""create a tree from the given tree entries and safe it to the database"""
@@ -78,7 +78,7 @@ class TestFun(TestBase):
@with_rw_repo('0.1.6')
def test_three_way_merge(self, rwrepo):
def mkfile(name, sha, executable=0):
- return (sha, S_IFREG | 0644 | executable*0111, name)
+ return (sha, S_IFREG | 0644 | executable * 0111, name)
def mkcommit(name, sha):
return (sha, S_IFDIR | S_IFLNK, name)
@@ -88,9 +88,9 @@ class TestFun(TestBase):
assert has_conflict == (len([e for e in entries if e.stage != 0]) > 0)
mktree = self.mktree
- shaa = "\1"*20
- shab = "\2"*20
- shac = "\3"*20
+ shaa = "\1" * 20
+ shab = "\2" * 20
+ shac = "\3" * 20
odb = rwrepo.odb