Merge lp:~pedronis/tanuki-agent/rpi2-sample-provkit-use-py2 into lp:tanuki-agent

[Samuele Pedroni]

convert the whole sample provkit to use py2 for consistency (also of deps)

convert the whole sample provkit to use py2 for consistency (also of deps)

[Facundo Batista (facundo)]

Awesome

review: Approve

=== modified file 'rpi2-sample-provkit/runtest'
--- rpi2-sample-provkit/runtest	2015-10-15 19:57:02 +0000
+++ rpi2-sample-provkit/runtest	2015-10-21 14:45:32 +0000
@@ -1,10 +1,13 @@
-#!/usr/bin/env python3
+#!/usr/bin/python2
+
+from __future__ import print_function
 
 import argparse
+import codecs
 import json
 import os
 import subprocess
-import urllib.parse
+import urlparse
 
 TESTS_DIR = "tests"
 
@@ -12,13 +15,13 @@
 def main(args):
     """Main entry point."""
     # get the test opportunity content
-    with open(args.test_opp, 'rt', encoding='utf8') as fh:
+    with codecs.open(args.test_opp, 'rt', encoding='utf8') as fh:
         test_opp = json.load(fh)
 
     tarball_url = test_opp['test_payload']['tarball_url']
     test_cmd = test_opp['test_payload']['test_cmd']
 
-    name = os.path.basename(urllib.parse.urlparse(tarball_url).path)
+    name = os.path.basename(urlparse.urlparse(tarball_url).path)
     if not os.path.exists(TESTS_DIR):
         os.mkdir(TESTS_DIR)
     print("Downloading {}...".format(tarball_url))

=== modified file 'rpi2-sample-provkit/setup'
--- rpi2-sample-provkit/setup	2015-10-15 19:57:02 +0000
+++ rpi2-sample-provkit/setup	2015-10-21 14:45:32 +0000
@@ -1,11 +1,14 @@
-#!/usr/bin/env python3
+#!/usr/bin/python2
+
+from __future__ import print_function
 
 import argparse
+import codecs
 import json
 import os
 import subprocess
 import sys
-import urllib
+import urlparse
 
 import requests
 
@@ -18,7 +21,7 @@
     ip = os.getenv('RPI2_IP', 'webdm.local')
     port = int(os.getenv('RPI2_SSH_PORT', 22))
     # get the test opportunity content
-    with open(args.test_opp, 'rt', encoding='utf8') as fh:
+    with codecs.open(args.test_opp, 'rt', encoding='utf8') as fh:
         test_opp = json.load(fh)
 
     # find snap(s) to upgrade
@@ -44,7 +47,7 @@
                   .format(snap_name, snap_revno, info['sequence']), file=sys.stderr)
             sys.exit(1)
         url = info['anon_download_url']
-        snap_fname = os.path.basename(urllib.parse.urlparse(url).path)
+        snap_fname = os.path.basename(urlparse.urlparse(url).path)
         subprocess.check_call(['curl', '-O', url])
         subprocess.check_call(['snappy-remote', '--url',
                                'ssh://ubuntu@{}:{}'.format(ip, port),

=== modified file 'rpi2-sample-provkit/test_tarball_content/test'
--- rpi2-sample-provkit/test_tarball_content/test	2015-10-15 19:57:02 +0000
+++ rpi2-sample-provkit/test_tarball_content/test	2015-10-21 14:45:32 +0000
@@ -1,5 +1,8 @@
-#!/usr/bin/env python3
-
+#!/usr/bin/python2
+
+from __future__ import print_function
+
+import codecs
 import json
 import os
 import subprocess
@@ -22,7 +25,7 @@
     rpi2_address = os.environ['RPI2_IP']
     rpi2_ssh_port = os.environ['RPI2_SSH_PORT']
     test_opp_path = os.environ['TEST_OPPORTUNITY']
-    with open(test_opp_path, 'rt', encoding='utf8') as fh:
+    with codecs.open(test_opp_path, 'rt', encoding='utf8') as fh:
         test_opp = json.load(fh)
 
     # find snap(s) to check version
@@ -38,9 +41,9 @@
         real_revno = check_function(rpi2_address, rpi2_ssh_port)
         expected = str(snaps[snap_name])
         assert real_revno == expected, "real={!r} != expected={!r}".format(real_revno, expected)
-    with open("../spi_test_result.json", "wt", encoding="utf8") as fh:
+    with codecs.open("../spi_test_result.json", "wt", encoding="utf8") as fh:
         json.dump({'result': 'OK'}, fh)
-        
+
 
 if __name__ == '__main__':
     main()