containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1649 from jwhonce/issue/1641 

Downgrade code to support python3.4
This commit is contained in:
OpenShift Merge Robot 2018-10-23 09:05:29 -07:00 committed by GitHub
parent 41a4827f84 a7ea7e9d5c
commit 41a8bbdbe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/python/podman/MANIFEST.in
View File

@ -1,2 +1,3 @@
prune test/ prune test/
include README.md include README.md
include requirements.txt

8
contrib/python/podman/tox.ini Normal file
View File

@ -0,0 +1,8 @@
[tox]
envlist = py34,py35,py36
skipdist = True
[testenv]
deps=-rrequirements.txt
whitelist_externals = bash
commands=bash test/test_runner.sh

4
contrib/python/pypodman/pypodman/lib/actions/pod/processes_parser.py
View File

@ -10,7 +10,7 @@ class ProcessesPod(AbstractActionBase):
@classmethod @classmethod
def subparser(cls, parent): def subparser(cls, parent):
"""Add Images command to parent parser.""" """Add Pod Ps command to parent parser."""
parser = parent.add_parser('ps', help='list processes of pod') parser = parent.add_parser('ps', help='list processes of pod')
super().subparser(parser) super().subparser(parser)
@ -40,7 +40,7 @@ class ProcessesPod(AbstractActionBase):
parser.set_defaults(class_=cls, method='processes') parser.set_defaults(class_=cls, method='processes')
def __init__(self, args): def __init__(self, args):
"""Contstruct ProcessesPod class.""" """Construct ProcessesPod class."""
if args.sort == 'created': if args.sort == 'created':
args.sort = 'createdat' args.sort = 'createdat'
elif args.sort == 'count': elif args.sort == 'count':

4
contrib/python/pypodman/pypodman/lib/podman_parser.py
View File

@ -154,7 +154,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
getattr(args, 'run_dir') getattr(args, 'run_dir')
or os.environ.get('RUN_DIR') or os.environ.get('RUN_DIR')
or config['default'].get('run_dir') or config['default'].get('run_dir')
or Path(args.xdg_runtime_dir, 'pypodman') or str(Path(args.xdg_runtime_dir, 'pypodman'))
) # yapf: disable ) # yapf: disable
setattr( setattr(
@ -211,7 +211,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
args.identity_file = None args.identity_file = None
if args.host: if args.host:
args.local_socket_path = Path(args.run_dir, 'podman.socket') args.local_socket_path = str(Path(args.run_dir, 'podman.socket'))
else: else:
args.local_socket_path = args.remote_socket_path args.local_socket_path = args.remote_socket_path