From 1b9d3b961bdf79964b883d3179f085d8835e528d Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sun, 4 Jan 2015 14:25:39 +0100 Subject: Removed 'from X import *' whereever possible --- git/test/test_fun.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'git/test/test_fun.py') diff --git a/git/test/test_fun.py b/git/test/test_fun.py index 5fa0c77b..bf178aaa 100644 --- a/git/test/test_fun.py +++ b/git/test/test_fun.py @@ -1,4 +1,7 @@ -from git.test.lib import * +from git.test.lib import ( + TestBase, + with_rw_repo +) from git.objects.fun import ( traverse_tree_recursive, traverse_trees_recursive, @@ -78,7 +81,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 | 0o644 | executable * 0o111, name) def mkcommit(name, sha): return (sha, S_IFDIR | S_IFLNK, name) -- cgit v1.2.3