[6.0] b1937f711 We live in the future now

Reza Naghibi reza at naghibi.com
Tue Apr 20 18:27:06 UTC 2021


commit b1937f71101d831e41b8141c2a85913c9eb52cc8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Mar 12 10:35:38 2019 +0100

    We live in the future now
    
    For a given definition of "future" or "now".

diff --git a/bin/varnishtest/witness.py b/bin/varnishtest/witness.py
index af4a56e55..f5b516ee0 100644
--- a/bin/varnishtest/witness.py
+++ b/bin/varnishtest/witness.py
@@ -7,8 +7,6 @@
 #       python witness.py
 #       dot -Tpng /tmp/_.dot > /tmp/_.png
 
-from __future__ import print_function
-
 d = dict()
 a = dict()
 
diff --git a/doc/sphinx/vtc-syntax.py b/doc/sphinx/vtc-syntax.py
index 6d4946d32..c0d9435c8 100644
--- a/doc/sphinx/vtc-syntax.py
+++ b/doc/sphinx/vtc-syntax.py
@@ -29,7 +29,6 @@
 # Process various varnishtest C files and output reStructuredText to be
 # included in vtc(7).
 
-from __future__ import print_function
 import sys
 import re
 
diff --git a/include/generate.py b/include/generate.py
index c1ea3bcbb..6d1377661 100755
--- a/include/generate.py
+++ b/include/generate.py
@@ -29,8 +29,6 @@
 #
 # Generate vcs_version.h vmod_abi.h
 
-from __future__ import print_function
-
 import subprocess
 import os
 import sys
diff --git a/include/tbl/style.py b/include/tbl/style.py
index 0e7f657fb..31435887e 100644
--- a/include/tbl/style.py
+++ b/include/tbl/style.py
@@ -2,8 +2,6 @@
 #
 # Very basic style-checker for include/tbl files.
 
-from __future__ import print_function
-
 import glob
 
 def check_file(fn):
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 0118d7956..be3dd3294 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -30,8 +30,6 @@
 # Generate various .c and .h files for the VCL compiler and the interfaces
 # for it.
 
-from __future__ import print_function
-
 #######################################################################
 # These are our tokens
 
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 14f93b11d..35c19e90f 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -33,9 +33,6 @@ Read the vmod.vcc file (inputvcc) and produce:
     vmod_${name}.rst -- Extracted documentation
 """
 
-# This script should work with both Python 2 and Python 3.
-from __future__ import print_function
-
 import os
 import sys
 import re
diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
index e65b0072f..d95b66ed5 100644
--- a/lib/libvcc/vsctool.py
+++ b/lib/libvcc/vsctool.py
@@ -35,8 +35,6 @@ the same general syntax as a `.rst` file, but for now we process
 it with this program to get a *real* `.rst` file.
 '''
 
-from __future__ import print_function
-
 import getopt
 import json
 import sys
diff --git a/tools/gcov_digest.py b/tools/gcov_digest.py
index 3fbfdf946..dc375d0f2 100644
--- a/tools/gcov_digest.py
+++ b/tools/gcov_digest.py
@@ -48,8 +48,6 @@ Options:
 
 """
 
-from __future__ import print_function
-
 import os
 import sys
 import getopt
diff --git a/tools/include_wash.py b/tools/include_wash.py
index 94c11ba2c..61a0cae91 100644
--- a/tools/include_wash.py
+++ b/tools/include_wash.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
-
 import os
 
 def check(fn):


More information about the varnish-commit mailing list