X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=76d74f1a6907944b1cb5b3b2d5e2be31e1c54fae;hb=9d9a15df4db544958869f112af7dc5ea7403e5be;hp=65baa11c0b98b3d44d2e5d6f8fb9859cf8f86fda;hpb=58957a596533797cb9502de88cd84003abeb06f7;p=secnet.git diff --git a/make-secnet-sites b/make-secnet-sites index 65baa11..76d74f1 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -52,6 +52,7 @@ Cendio Systems AB. """ from __future__ import print_function +from __future__ import unicode_literals from builtins import int import string @@ -71,6 +72,14 @@ import ipaddrset VERSION="0.1.18" +from sys import version_info +if version_info.major == 2: # for python2 + import codecs + sys.stdin = codecs.getreader('utf-8')(sys.stdin) + sys.stdout = codecs.getwriter('utf-8')(sys.stdout) + import io + open=lambda f,m='r': io.open(f,m,encoding='utf-8') + # Are we being invoked from userv? service=0 # If we are, which group does the caller want to modify?