From 35a9a8a8babe5a9f395ad3003cf0dcab5ed1e80c Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 17 Dec 2018 00:38:12 +0500 Subject: [PATCH] Python3 --- gitosis/test/test_access.py | 2 +- gitosis/test/test_gitdaemon.py | 2 +- gitosis/test/test_gitweb.py | 4 ++-- gitosis/test/test_group.py | 2 +- gitosis/test/test_init.py | 4 ++-- gitosis/test/test_repository.py | 22 +++++++++++----------- gitosis/test/test_run_hook.py | 4 ++-- gitosis/test/test_serve.py | 10 +++++----- gitosis/test/test_ssh.py | 4 ++-- gitosis/test/util.py | 10 +++++----- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gitosis/test/test_access.py b/gitosis/test/test_access.py index f39444c..a65742b 100644 --- a/gitosis/test/test_access.py +++ b/gitosis/test/test_access.py @@ -1,7 +1,7 @@ from nose.tools import eq_ as eq import logging -from ConfigParser import RawConfigParser +from configparser import RawConfigParser from gitosis import access diff --git a/gitosis/test/test_gitdaemon.py b/gitosis/test/test_gitdaemon.py index 94475ac..d9547a6 100644 --- a/gitosis/test/test_gitdaemon.py +++ b/gitosis/test/test_gitdaemon.py @@ -1,7 +1,7 @@ from nose.tools import eq_ as eq import os -from ConfigParser import RawConfigParser +from configparser import RawConfigParser from gitosis import gitdaemon from gitosis.test.util import maketemp, writeFile diff --git a/gitosis/test/test_gitweb.py b/gitosis/test/test_gitweb.py index e38b881..4b35962 100644 --- a/gitosis/test/test_gitweb.py +++ b/gitosis/test/test_gitweb.py @@ -1,8 +1,8 @@ from nose.tools import eq_ as eq import os -from ConfigParser import RawConfigParser -from cStringIO import StringIO +from configparser import RawConfigParser +from io import StringIO from gitosis import gitweb from gitosis.test.util import mkdir, maketemp, readFile, writeFile diff --git a/gitosis/test/test_group.py b/gitosis/test/test_group.py index 9ea035a..4d878a8 100644 --- a/gitosis/test/test_group.py +++ b/gitosis/test/test_group.py @@ -1,6 +1,6 @@ from nose.tools import eq_ as eq, assert_raises -from ConfigParser import RawConfigParser +from configparser import RawConfigParser from gitosis import group diff --git a/gitosis/test/test_init.py b/gitosis/test/test_init.py index fb6b286..dcef74c 100644 --- a/gitosis/test/test_init.py +++ b/gitosis/test/test_init.py @@ -2,7 +2,7 @@ from nose.tools import eq_ as eq from gitosis.test.util import assert_raises, maketemp import os -from ConfigParser import RawConfigParser +from configparser import RawConfigParser from gitosis import init from gitosis import repository @@ -113,7 +113,7 @@ def test_init_admin_repository(): 'hooks', 'post-update', ) - util.check_mode(hook, 0755, is_file=True) + util.check_mode(hook, 0o755, is_file=True) got = util.readFile(hook).splitlines() assert 'gitosis-run-hook post-update' in got export_dir = os.path.join(tmp, 'export') diff --git a/gitosis/test/test_repository.py b/gitosis/test/test_repository.py index 1646e6c..9e5c7cf 100644 --- a/gitosis/test/test_repository.py +++ b/gitosis/test/test_repository.py @@ -23,17 +23,17 @@ def test_init_simple(): tmp = maketemp() path = os.path.join(tmp, 'repo.git') repository.init(path) - check_mode(path, 0750, is_dir=True) + check_mode(path, 0o750, is_dir=True) check_bare(path) def test_init_exist_dir(): tmp = maketemp() path = os.path.join(tmp, 'repo.git') - mkdir(path, 0710) - check_mode(path, 0710, is_dir=True) + mkdir(path, 0o710) + check_mode(path, 0o710, is_dir=True) repository.init(path) # my weird access mode is preserved - check_mode(path, 0710, is_dir=True) + check_mode(path, 0o710, is_dir=True) check_bare(path) def test_init_exist_git(): @@ -41,7 +41,7 @@ def test_init_exist_git(): path = os.path.join(tmp, 'repo.git') repository.init(path) repository.init(path) - check_mode(path, 0750, is_dir=True) + check_mode(path, 0o750, is_dir=True) check_bare(path) def test_init_templates(): @@ -53,7 +53,7 @@ def test_init_templates(): ) # for reproducibility - os.umask(0022) + os.umask(0o022) repository.init(path, template=templatedir) repository.init(path) @@ -61,7 +61,7 @@ def test_init_templates(): eq(got, 'i should show up\n') check_mode( os.path.join(path, 'hooks', 'post-update'), - 0755, + 0o755, is_file=True, ) got = readFile(os.path.join(path, 'hooks', 'post-update')) @@ -91,7 +91,7 @@ PATH="${PATH#*:}" exec git "$@" ''') - os.chmod(mockgit, 0755) + os.chmod(mockgit, 0o755) magic_cookie = '%d' % random.randint(1, 100000) good_path = os.environ['PATH'] try: @@ -130,7 +130,7 @@ PATH="${PATH#*:}" exec git "$@" ''') - os.chmod(mockgit, 0755) + os.chmod(mockgit, 0o755) magic_cookie = '%d' % random.randint(1, 100000) good_path = os.environ['PATH'] try: @@ -226,7 +226,7 @@ PATH="${PATH#*:}" exec git "$@" ''') - os.chmod(mockgit, 0755) + os.chmod(mockgit, 0o755) repository.init(path=git_dir) repository.fast_import( git_dir=git_dir, @@ -301,7 +301,7 @@ PATH="${PATH#*:}" exec git "$@" ''') - os.chmod(mockgit, 0755) + os.chmod(mockgit, 0o755) repository.init(path=tmp) repository.fast_import( git_dir=tmp, diff --git a/gitosis/test/test_run_hook.py b/gitosis/test/test_run_hook.py index db01e0c..ae674cc 100644 --- a/gitosis/test/test_run_hook.py +++ b/gitosis/test/test_run_hook.py @@ -1,8 +1,8 @@ from nose.tools import eq_ as eq import os -from ConfigParser import RawConfigParser -from cStringIO import StringIO +from configparser import RawConfigParser +from io import StringIO from gitosis import init, repository, run_hook from gitosis.test.util import maketemp, readFile diff --git a/gitosis/test/test_serve.py b/gitosis/test/test_serve.py index 88ce474..9d126c1 100644 --- a/gitosis/test/test_serve.py +++ b/gitosis/test/test_serve.py @@ -3,8 +3,8 @@ from gitosis.test.util import assert_raises import logging import os -from cStringIO import StringIO -from ConfigParser import RawConfigParser +from io import StringIO +from configparser import RawConfigParser from gitosis import serve from gitosis import repository @@ -354,7 +354,7 @@ def test_push_inits_subdir_parent_missing(): ) eq(os.listdir(repositories), ['foo']) foo = os.path.join(repositories, 'foo') - util.check_mode(foo, 0750, is_dir=True) + util.check_mode(foo, 0o750, is_dir=True) eq(os.listdir(foo), ['bar.git']) assert os.path.isfile(os.path.join(repositories, 'foo', 'bar.git', 'HEAD')) @@ -366,7 +366,7 @@ def test_push_inits_subdir_parent_exists(): os.mkdir(repositories) foo = os.path.join(repositories, 'foo') # silly mode on purpose; not to be touched - os.mkdir(foo, 0751) + os.mkdir(foo, 0o751) cfg.set('gitosis', 'repositories', repositories) generated = os.path.join(tmp, 'generated') os.mkdir(generated) @@ -380,7 +380,7 @@ def test_push_inits_subdir_parent_exists(): command="git-receive-pack 'foo/bar.git'", ) eq(os.listdir(repositories), ['foo']) - util.check_mode(foo, 0751, is_dir=True) + util.check_mode(foo, 0o751, is_dir=True) eq(os.listdir(foo), ['bar.git']) assert os.path.isfile(os.path.join(repositories, 'foo', 'bar.git', 'HEAD')) diff --git a/gitosis/test/test_ssh.py b/gitosis/test/test_ssh.py index fc6ecbc..8714684 100644 --- a/gitosis/test/test_ssh.py +++ b/gitosis/test/test_ssh.py @@ -1,7 +1,7 @@ from nose.tools import eq_ as eq, assert_raises import os -from cStringIO import StringIO +from io import StringIO from gitosis import ssh from gitosis.test.util import mkdir, maketemp, writeFile, readFile @@ -171,7 +171,7 @@ class WriteAuthorizedKeys_Test(object): def test_simple(self): tmp = maketemp() path = os.path.join(tmp, 'authorized_keys') - f = file(path, 'w') + f = open(path, 'w') try: f.write('''\ # foo diff --git a/gitosis/test/util.py b/gitosis/test/util.py index 592b766..6b04c9a 100644 --- a/gitosis/test/util.py +++ b/gitosis/test/util.py @@ -9,7 +9,7 @@ import sys def mkdir(*a, **kw): try: os.mkdir(*a, **kw) - except OSError, e: + except OSError as e: if e.errno == errno.EEXIST: pass else: @@ -27,7 +27,7 @@ def maketemp(): tmp = os.path.join(tmp, name) try: shutil.rmtree(tmp) - except OSError, e: + except OSError as e: if e.errno == errno.ENOENT: pass else: @@ -37,7 +37,7 @@ def maketemp(): def writeFile(path, content): tmp = '%s.tmp' % path - f = file(tmp, 'w') + f = open(tmp, 'w') try: f.write(content) finally: @@ -45,7 +45,7 @@ def writeFile(path, content): os.rename(tmp, path) def readFile(path): - f = file(path) + f = open(path) try: data = f.read() finally: @@ -58,7 +58,7 @@ def assert_raises(excClass, callableObj, *args, **kwargs): """ try: callableObj(*args, **kwargs) - except excClass, e: + except excClass as e: return e else: if hasattr(excClass,'__name__'): excName = excClass.__name__