X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=bin%2Fidna.py;h=fd2c8e5984d2783554863a93a646f5efe8079241;hp=a0dabc60dc26f9e81d47f304c8f04c4f63298c9b;hb=HEAD;hpb=c5883d2a782366c0a3468a989e756cf37dabbd46 diff --git a/bin/idna.py b/bin/idna.py index a0dabc6..44843ac 100755 --- a/bin/idna.py +++ b/bin/idna.py @@ -1,6 +1,8 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 import sys +from m_lib.defenc import default_encoding + l = len(sys.argv) if (l == 2) and (sys.argv[1] != '-r'): @@ -10,12 +12,13 @@ elif (l == 3) and (sys.argv[1] == '-r'): reverse = True address = sys.argv[2] else: - print >>sys.stderr, 'Usage: %s [-r] name.domain' % sys.argv[0] - sys.exit(1) - -from m_lib.defenc import default_encoding + sys.exit('Usage: %s [-r] name.domain' % sys.argv[0]) if reverse: - print address.decode("idna").encode(default_encoding) + if not isinstance(address, bytes): + address = address.encode('ascii') + print(address.decode("idna")) else: - print unicode(address, default_encoding).encode("idna") + if isinstance(address, bytes): + address = address.decode(default_encoding) + print(address.encode("idna").decode('ascii'))