Merge lp:~andrewsomething/ssh-import-id/python3-port into lp:ssh-import-id

[Andrew Starr-Bochicchio]

Ported to Python3. Also dropped some of the work arounds for old versions of requests and urllib.

I've added and removed keys from both GitHub and Launchpad. Though, I can't guarantee I've tested every code path.

=== modified file 'bin/ssh-import-id'
--- bin/ssh-import-id	2014-02-27 15:37:37 +0000
+++ bin/ssh-import-id	2014-04-27 16:24:09 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # ssh-import-id - Authorize SSH public keys from trusted online identities
 #
@@ -188,7 +188,7 @@
 	output, _ = proc.communicate(None)
 	if proc.returncode:
 		raise Exception("Error executing protocol helper [%s]" % proto_cmd_path)
-	return output.split("\n")
+	return output.split(b"\n")
 
 
 def import_keys(proto, username):

=== modified file 'bin/ssh-import-id-gh'
--- bin/ssh-import-id-gh	2013-03-15 14:54:58 +0000
+++ bin/ssh-import-id-gh	2014-04-27 16:24:09 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # ssh-import-id - Authorize SSH public keys from trusted online identities.
 #
@@ -21,19 +21,8 @@
 import json
 import subprocess
 import sys
-try:
-	import requests
-	# Only versions >= 1.1.0 support SSL certificate verification
-	if requests.__version__ >= '1.1.0':
-		REQUESTS = True
-	else:
-		REQUESTS = False
-except:
-	REQUESTS = False
-try:
-	from urllib import quote_plus
-except (ImportError,):
-	from urllib.parse import quote_plus
+import requests
+from urllib.parse import quote_plus
 
 
 if __name__ == '__main__':
@@ -43,17 +32,7 @@
 	for ghid in sys.argv[1:]:
 		try:
 			url = "https://api.github.com/users/%s/keys" % (quote_plus(ghid))
-			if REQUESTS:
-				text = requests.get(url, verify=True).text
-			else:
-				# Fall back to using good 'ole ubiquitous wget
-				p = subprocess.Popen(["wget", "--no-verbose", "-O", "-", url], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-				stdout, stderr = p.communicate()
-				sys.stderr.write(stderr.decode('utf-8'))
-				if p.returncode == 0:
-					text = stdout.decode('utf-8')
-				else:
-					raise Exception("Could not fetch URL [%s]" % url)
+			text = requests.get(url, verify=True).text
 			data = json.loads(text)
 			for keyobj in data:
 				sys.stdout.write("%s %s@github/%s\n" % (keyobj['key'], ghid, keyobj['id']))

=== modified file 'bin/ssh-import-id-lp'
--- bin/ssh-import-id-lp	2013-03-15 14:51:43 +0000
+++ bin/ssh-import-id-lp	2014-04-27 16:24:09 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # ssh-import-id - Authorize SSH public keys from trusted online identities.
 #
@@ -21,19 +21,8 @@
 import os
 import subprocess
 import sys
-try:
-	import requests
-	# Only versions >= 1.1.0 support SSL certificate verification
-	if requests.__version__ >= '1.1.0':
-		REQUESTS = True
-	else:
-		REQUESTS = False
-except:
-	REQUESTS = False
-try:
-	from urllib import quote_plus
-except (ImportError,):
-	from urllib.parse import quote_plus
+import requests
+from urllib.parse import quote_plus
 
 
 if __name__ == '__main__':
@@ -46,7 +35,7 @@
 			if url is None and os.path.exists("/etc/ssh/ssh_import_id"):
 				try:
 					conf = json.loads(open("/etc/ssh/ssh_import_id").read())
-					url = conf.get("URL", None).decode("utf-8") % (quote_plus(lpid))
+					url = conf.get("URL", None) % (quote_plus(lpid))
 				except:
 					raise Exception("Ensure that URL is defined in [/etc/ssh/ssh_import_id] is in JSON syntax")
 			elif url is not None:
@@ -54,17 +43,7 @@
 			# Finally, fall back to Launchpad
 			if url is None:
 				url = "https://launchpad.net/~%s/+sshkeys" % (quote_plus(lpid))
-			if REQUESTS:
-				text = requests.get(url, verify=True).text
-			else:
-				# Fall back to using good 'ole ubiquitous wget
-				p = subprocess.Popen(["wget", "--no-verbose", "-O", "-", url], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-				stdout, stderr = p.communicate()
-				sys.stderr.write(stderr.decode('utf-8'))
-				if p.returncode == 0:
-					text = stdout.decode('utf-8')
-				else:
-					raise Exception("Could not fetch URL [%s]" % url)
+			text = requests.get(url, verify=True).text
 			sys.stdout.write(str(text))
 			sys.stdout.write("\n")
 			sys.stdout.flush()

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-27 15:39:24 +0000
+++ debian/changelog	2014-04-27 16:24:09 +0000
@@ -1,7 +1,11 @@
 ssh-import-id (3.22) unreleased; urgency=low
 
+  [ Dustin Kirkland ]
   * UNRELEASED
 
+  [ Andrew Starr-Bochicchio ]
+  * Port to python3 (LP: #1252474).
+
  -- Dustin Kirkland <[e-mail]>  Thu, 27 Feb 2014 09:39:24 -0600
 
 ssh-import-id (3.21-0ubuntu1) trusty; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-08-16 20:31:19 +0000
+++ debian/control	2014-04-27 16:24:09 +0000
@@ -3,11 +3,12 @@
 Priority: extra
 Maintainer: Dustin Kirkland <[e-mail]>
 Uploaders: Andrew Starr-Bochicchio <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~),
-               pep8,
-               python-all (>= 2.6),
-               python-setuptools
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 8),
+               python3-pep8,
+               python3-all,
+               python3-setuptools
+Standards-Version: 3.9.5
+X-Python3-Version: >= 3.2
 Homepage: http://launchpad.net/ssh-import-id
 Vcs-Browser: http://bazaar.launchpad.net/~ssh-import-id/ssh-import-id/trunk/files
 Vcs-Bzr: https://code.launchpad.net/~ssh-import-id/ssh-import-id/trunk
@@ -16,10 +17,10 @@
 Architecture: all
 Depends: ca-certificates,
          openssh-client,
-         python-requests (>= 1.1.0),
+         python3-requests (>= 1.1.0),
          wget,
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Recommends: openssh-server
 Description: securely retrieve an SSH public key and install it locally
  This utility will securely contact a public keyserver (Launchpad.net by

=== modified file 'debian/rules'
--- debian/rules	2013-02-15 22:54:53 +0000
+++ debian/rules	2014-04-27 16:24:09 +0000
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 
-# Lucid does not have dh_python2, but we would like to be able to use this
-# rules file to build on lucid as well. Thus the branching logic.
-WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
-
 override_dh_auto_build:
 	# Check syntax
-	pep8 --verbose --repeat --ignore W191,E501,E121 bin/*
+	python3 /usr/lib/python3/dist-packages/pep8.py \
+		--verbose --repeat --ignore W191,E501,E121 bin/*
 	dh_auto_build
 
 %:
-	dh $@ ${WITH_PYTHON2}
+	dh $@ --with python3 --buildsystem=pybuild

=== modified file 'setup.py'
--- setup.py	2014-02-27 15:39:24 +0000
+++ setup.py	2014-04-27 16:24:09 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # ssh-import-id - Authorize SSH public keys from trusted online identities.
 # Copyright (c) 2013 Casey Marshall <[e-mail]>
@@ -37,6 +37,6 @@
 				'bin/ssh-import-id',
 				'bin/ssh-import-id-gh',
 				'bin/ssh-import-id-lp'],
-				install_requires=["argparse", "Requests>=1.1.0"
+				install_requires=["Requests>=1.1.0"
 		],
 )