Merge branch 'pr-7': Python 2.6 support
This commit is contained in:
commit
dec190c6cd
|
@ -2,12 +2,14 @@ language: python
|
|||
|
||||
matrix:
|
||||
include:
|
||||
- python: 2.6
|
||||
env: TOXENV=py26
|
||||
- python: 2.7
|
||||
env: TOXENV=py27
|
||||
- python: 3.6
|
||||
env: TOXENV=py36
|
||||
# - python: 3.7 # TODO: uncomment when Travis-CI supports it
|
||||
# env: TOXENV=py37
|
||||
- python: 3.7-dev
|
||||
env: TOXENV=py37
|
||||
- python: pypy
|
||||
env: TOXENV=pypy
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ def render_command(cwd, environ, stdin, argv):
|
|||
epilog=''
|
||||
)
|
||||
parser.add_argument('-v', '--version', action='version',
|
||||
version='j2cli {}, Jinja2 {}'.format(__version__, jinja2.__version__))
|
||||
version='j2cli {0}, Jinja2 {1}'.format(__version__, jinja2.__version__))
|
||||
|
||||
parser.add_argument('-f', '--format', default='?', help='Input data format', choices=['?'] + list(FORMATS.keys()))
|
||||
parser.add_argument('template', help='Template file to process')
|
||||
|
|
|
@ -185,5 +185,5 @@ def read_context_data(format, f, environ):
|
|||
|
||||
# Parse it
|
||||
if format not in FORMATS:
|
||||
raise ValueError('{} format unavailable'.format(format))
|
||||
raise ValueError('{0} format unavailable'.format(format))
|
||||
return FORMATS[format](data_string)
|
||||
|
|
|
@ -36,7 +36,7 @@ def docker_link(value, format='{addr}:{port}'):
|
|||
# Parse the value
|
||||
m = re.match(r'(?P<proto>.+)://' r'(?P<addr>.+):' r'(?P<port>.+)$', value)
|
||||
if not m:
|
||||
raise ValueError('The provided value does not seems to be a Docker link: {}'.format(value))
|
||||
raise ValueError('The provided value does not seems to be a Docker link: {0}'.format(value))
|
||||
d = m.groupdict()
|
||||
|
||||
# Format
|
||||
|
|
Loading…
Reference in New Issue