Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
bbf9d330
Commit
bbf9d330
authored
May 14, 2014
by
Lasse Karstensen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Walk back Python 3 changes, use python2 explicitly.
None of our automatic build environments have Python 3 currently.
parent
30f66716
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
vmodtool.py
lib/libvcc/vmodtool.py
+7
-7
No files found.
lib/libvcc/vmodtool.py
View file @
bbf9d330
#!/usr/bin/env python
3
#!/usr/bin/env python
2
#-
# Copyright (c) 2010-2014 Varnish Software AS
# All rights reserved.
...
...
@@ -699,8 +699,8 @@ class file_section(object):
if
opts
.
strict
:
raise
FormatError
(
m
,
details
)
else
:
print
(
"WARNING:
%
s:"
%
m
,
file
=
sys
.
stderr
)
print
(
details
,
file
=
sys
.
stderr
)
print
>>
sys
.
stderr
,
"WARNING:
%
s:"
%
m
print
>>
sys
.
stderr
,
details
else
:
for
ln
,
i
in
self
.
l
:
o
.
doc
(
i
)
...
...
@@ -797,12 +797,12 @@ def runmain(inputvcc, outputname="vcc_if"):
i
.
parse
(
vx
)
assert
len
(
i
.
tl
)
==
0
except
ParseError
as
e
:
print
(
"ERROR: Parse error reading
\"
%
s
\"
:"
%
inputvcc
)
print
"ERROR: Parse error reading
\"
%
s
\"
:"
%
inputvcc
pprint
(
str
(
e
))
exit
(
-
1
)
except
FormatError
as
e
:
print
(
"ERROR: Format error reading
\"
%
s
\"
:
%
s"
%
(
inputvcc
,
pformat
(
e
.
msg
)
))
print
(
e
.
details
)
print
"ERROR: Format error reading
\"
%
s
\"
:
%
s"
%
(
inputvcc
,
pformat
(
e
.
msg
))
print
e
.
details
exit
(
-
2
)
#######################################################################
...
...
@@ -878,7 +878,7 @@ if __name__ == "__main__":
if
not
inputvcc
:
inputvcc
=
"vmod.vcc"
else
:
print
(
"ERROR: No vmod.vcc file supplied or found."
,
file
=
sys
.
stderr
)
print
>>
sys
.
stderr
,
"ERROR: No vmod.vcc file supplied or found."
oparser
.
print_help
()
exit
(
-
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment