From aca25db85da76eb7edec95eb9660a467a6fc49a9 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 11 Dec 2018 12:38:41 +0500 Subject: [PATCH] Python 3 --- .gitignore | 2 ++ gitosis/access.py | 2 +- gitosis/app.py | 14 +++++++------- gitosis/gitdaemon.py | 6 +++--- gitosis/gitweb.py | 6 +++--- gitosis/group.py | 2 +- gitosis/init.py | 12 ++++++------ gitosis/repository.py | 4 ++-- gitosis/run_hook.py | 4 ++-- gitosis/serve.py | 6 +++--- gitosis/ssh.py | 8 ++++---- gitosis/util.py | 4 ++-- 12 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index dc2c237..9593815 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /apidocs /gitosis/test/tmp /.coverage +.idea +venv \ No newline at end of file diff --git a/gitosis/access.py b/gitosis/access.py index c95c842..f7153b2 100644 --- a/gitosis/access.py +++ b/gitosis/access.py @@ -1,5 +1,5 @@ import os, logging -from ConfigParser import NoSectionError, NoOptionError +from configparser import NoSectionError, NoOptionError from gitosis import group diff --git a/gitosis/app.py b/gitosis/app.py index fa9772b..88106c9 100644 --- a/gitosis/app.py +++ b/gitosis/app.py @@ -3,7 +3,7 @@ import sys import logging import optparse import errno -import ConfigParser +import configparser log = logging.getLogger('gitosis.app') @@ -31,7 +31,7 @@ class App(object): cfg = self.create_config(options) try: self.read_config(options, cfg) - except CannotReadConfigError, e: + except CannotReadConfigError as e: log.error(str(e)) sys.exit(1) self.setup_logging(cfg) @@ -53,13 +53,13 @@ class App(object): return parser def create_config(self, options): - cfg = ConfigParser.RawConfigParser() + cfg = configparser.RawConfigParser() return cfg def read_config(self, options, cfg): try: - conffile = file(options.config) - except (IOError, OSError), e: + conffile = open(options.config) + except (IOError, OSError) as e: if e.errno == errno.ENOENT: # special case this because gitosis-init wants to # ignore this particular error case @@ -74,8 +74,8 @@ class App(object): def setup_logging(self, cfg): try: loglevel = cfg.get('gitosis', 'loglevel') - except (ConfigParser.NoSectionError, - ConfigParser.NoOptionError): + except (configparser.NoSectionError, + configparser.NoOptionError): pass else: try: diff --git a/gitosis/gitdaemon.py b/gitosis/gitdaemon.py index 78ca9ea..f2b55c5 100644 --- a/gitosis/gitdaemon.py +++ b/gitosis/gitdaemon.py @@ -2,7 +2,7 @@ import errno import logging import os -from ConfigParser import NoSectionError, NoOptionError +from configparser import NoSectionError, NoOptionError log = logging.getLogger('gitosis.gitdaemon') @@ -14,13 +14,13 @@ def export_ok_path(repopath): def allow_export(repopath): p = export_ok_path(repopath) - file(p, 'a').close() + open(p, 'a').close() def deny_export(repopath): p = export_ok_path(repopath) try: os.unlink(p) - except OSError, e: + except OSError as e: if e.errno == errno.ENOENT: pass else: diff --git a/gitosis/gitweb.py b/gitosis/gitweb.py index b4b538b..6d1cc67 100644 --- a/gitosis/gitweb.py +++ b/gitosis/gitweb.py @@ -27,7 +27,7 @@ To plug this into ``gitweb``, you have two choices. import os, urllib, logging -from ConfigParser import NoSectionError, NoOptionError +from configparser import NoSectionError, NoOptionError from gitosis import util @@ -106,7 +106,7 @@ def generate_project_list(config, path): """ tmp = '%s.%d.tmp' % (path, os.getpid()) - f = file(tmp, 'w') + f = open(tmp, 'w') try: generate_project_list_fp(config=config, fp=f) finally: @@ -157,7 +157,7 @@ def set_descriptions(config): 'description', ) tmp = '%s.%d.tmp' % (path, os.getpid()) - f = file(tmp, 'w') + f = open(tmp, 'w') try: print >>f, description finally: diff --git a/gitosis/group.py b/gitosis/group.py index a18a731..0a2b010 100644 --- a/gitosis/group.py +++ b/gitosis/group.py @@ -1,5 +1,5 @@ import logging -from ConfigParser import NoSectionError, NoOptionError +from configparser import NoSectionError, NoOptionError def _getMembership(config, user, seen): log = logging.getLogger('gitosis.group.getMembership') diff --git a/gitosis/init.py b/gitosis/init.py index 28e7871..214b35c 100644 --- a/gitosis/init.py +++ b/gitosis/init.py @@ -8,8 +8,8 @@ import os import sys from pkg_resources import resource_filename -from cStringIO import StringIO -from ConfigParser import RawConfigParser +from io import StringIO +from configparser import RawConfigParser from gitosis import repository from gitosis import run_hook @@ -54,7 +54,7 @@ def symlink_config(git_dir): tmp = '%s.%d.tmp' % (dst, os.getpid()) try: os.unlink(tmp) - except OSError, e: + except OSError as e: if e.errno == errno.ENOENT: pass else: @@ -80,7 +80,7 @@ def init_admin_repository( # can't rely on setuptools and all kinds of distro packaging to # have kept our templates executable, it seems - os.chmod(os.path.join(git_dir, 'hooks', 'post-update'), 0755) + os.chmod(os.path.join(git_dir, 'hooks', 'post-update'), 0o755) if not repository.has_initial_commit(git_dir): log.info('Making initial commit...') @@ -119,7 +119,7 @@ class Main(app.App): def handle_args(self, parser, cfg, options, args): super(Main, self).handle_args(parser, cfg, options, args) - os.umask(0022) + os.umask(0o022) log.info('Reading SSH public key...') pubkey = read_ssh_pubkey() @@ -141,7 +141,7 @@ class Main(app.App): user=user, ) log.info('Running post-update hook...') - util.mkdir(os.path.expanduser('~/.ssh'), 0700) + util.mkdir(os.path.expanduser('~/.ssh'), 0o700) run_hook.post_update(cfg=cfg, git_dir=admin_repository) log.info('Symlinking ~/.gitosis.conf to repository...') symlink_config(git_dir=admin_repository) diff --git a/gitosis/repository.py b/gitosis/repository.py index 9dd0291..8617afe 100644 --- a/gitosis/repository.py +++ b/gitosis/repository.py @@ -36,7 +36,7 @@ def init( if _git is None: _git = 'git' - util.mkdir(path, 0750) + util.mkdir(path, 0o750) args = [ _git, '--git-dir=.', @@ -131,7 +131,7 @@ class GitCheckoutIndexError(GitExportError): def export(git_dir, path): try: os.mkdir(path) - except OSError, e: + except OSError as e: if e.errno == errno.EEXIST: pass else: diff --git a/gitosis/run_hook.py b/gitosis/run_hook.py index e535e6a..ca35801 100644 --- a/gitosis/run_hook.py +++ b/gitosis/run_hook.py @@ -19,7 +19,7 @@ def post_update(cfg, git_dir): export = os.path.join(git_dir, 'gitosis-export') try: shutil.rmtree(export) - except OSError, e: + except OSError as e: if e.errno == errno.ENOENT: pass else: @@ -63,7 +63,7 @@ class Main(app.App): parser.error('Missing argument HOOK.') log = logging.getLogger('gitosis.run_hook') - os.umask(0022) + os.umask(0o022) git_dir = os.environ.get('GIT_DIR') if git_dir is None: diff --git a/gitosis/serve.py b/gitosis/serve.py index fdfea53..3b69f7a 100644 --- a/gitosis/serve.py +++ b/gitosis/serve.py @@ -141,7 +141,7 @@ def serve( p = topdir for segment in repopath.split(os.sep)[:-1]: p = os.path.join(p, segment) - util.mkdir(p, 0750) + util.mkdir(p, 0o750) repository.init(path=fullpath) gitweb.set_descriptions( @@ -178,7 +178,7 @@ class Main(app.App): parser.error('Missing argument USER.') main_log = logging.getLogger('gitosis.serve.main') - os.umask(0022) + os.umask(0o022) cmd = os.environ.get('SSH_ORIGINAL_COMMAND', None) if cmd is None: @@ -197,7 +197,7 @@ class Main(app.App): user=user, command=cmd, ) - except ServingError, e: + except ServingError as e: main_log.error('%s', e) sys.exit(1) diff --git a/gitosis/ssh.py b/gitosis/ssh.py index a315a5c..37c9fec 100644 --- a/gitosis/ssh.py +++ b/gitosis/ssh.py @@ -25,7 +25,7 @@ def readKeys(keydir): continue path = os.path.join(keydir, filename) - f = file(path) + f = open(path) for line in f: line = line.rstrip('\n') yield (basename, line) @@ -63,15 +63,15 @@ def filterAuthorizedKeys(fp): def writeAuthorizedKeys(path, keydir): tmp = '%s.%d.tmp' % (path, os.getpid()) try: - in_ = file(path) - except IOError, e: + in_ = open(path) + except IOError as e: if e.errno == errno.ENOENT: in_ = None else: raise try: - out = file(tmp, 'w') + out = open(tmp, 'w') try: if in_ is not None: for line in filterAuthorizedKeys(in_): diff --git a/gitosis/util.py b/gitosis/util.py index 479b2e9..f4bf05f 100644 --- a/gitosis/util.py +++ b/gitosis/util.py @@ -1,11 +1,11 @@ import errno import os -from ConfigParser import NoSectionError, NoOptionError +from configparser import NoSectionError, NoOptionError def mkdir(*a, **kw): try: os.mkdir(*a, **kw) - except OSError, e: + except OSError as e: if e.errno == errno.EEXIST: pass else: