Merge pull request #27 from scrapinghub/fixing-tests-for-python3

Fix tests for python3 using decode() on pipe output

.travis.yml

@@ -2,6 +2,9 @@ language: python
 python: 2.7
 env:
 - TOXENV=py27
+- TOXENV=pypy
+- TOXENV=py33
+- TOXENV=py34
 install:
 - "./.travis-workarounds.sh"
 - pip install -U tox

shub/deploy_reqs.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import click
 import os
 import tempfile

shub/login.py

@@ -10,7 +10,7 @@ def cli(context):
     if key and is_valid_key(key):
         descriptor = os.open(
             NETRC_FILE,
-            os.O_CREAT | os.O_RDWR | os.O_APPEND, 0600)
+            os.O_CREAT | os.O_RDWR | os.O_APPEND, 0o600)
         with os.fdopen(descriptor, 'a+') as out:
             line = 'machine scrapinghub.com login {0} password ""\n'.format(key)
             out.write(line)

shub/tool.py

@@ -26,7 +26,7 @@ def cli():
     "version": [],
 }
 
-for command, modules in module_deps.iteritems():
+for command, modules in module_deps.items():
     m = missing_modules(*modules)
     if m:
         cli.add_command(missingmod_cmd(m), command)

shub/utils.py

@@ -1,7 +1,9 @@
+from __future__ import unicode_literals
 import imp
 import os
 import netrc
 import subprocess
+import sys
 
 from glob import glob
 from os.path import isdir
@@ -18,6 +20,9 @@
 OS_WIN = True if os.name == 'nt' else False
 NETRC_FILE = os.path.expanduser('~/_netrc') if OS_WIN else os.path.expanduser('~/.netrc')
 
+FALLBACK_ENCODING = 'utf-8'
+STDOUT_ENCODING = sys.stdout.encoding or FALLBACK_ENCODING
+
 
 def missing_modules(*modules):
     """Receives a list of module names and returns those which are missing"""
@@ -71,35 +76,34 @@ def make_deploy_request(url, data, files, auth):
         raise ClickException("Deploy failed: {}".format(exc))
 
 
+def get_cmd_output(cmd):
+    return Popen(cmd, stdout=PIPE).communicate()[0].decode(STDOUT_ENCODING)
+
+
 def pwd_git_version():
-    p = Popen(['git', 'describe', '--always'], stdout=PIPE)
-    d = p.communicate()[0].strip('\n')
-    if p.wait() != 0:
-        p = Popen(['git', 'rev-list', '--count', 'HEAD'], stdout=PIPE)
-        d = 'r%s' % p.communicate()[0].strip('\n')
+    process = Popen(['git', 'describe', '--always'], stdout=PIPE)
+    commit_id = process.communicate()[0].decode(STDOUT_ENCODING).strip('\n')
+    if process.wait() != 0:
+        commit_id = get_cmd_output(['git', 'rev-list', '--count', 'HEAD']).strip('\n')
 
-    p = Popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stdout=PIPE)
-    b = p.communicate()[0].strip('\n')
-    return '%s-%s' % (d, b)
+    branch = get_cmd_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip('\n')
+    return '%s-%s' % (commit_id, branch)
 
 
 def pwd_hg_version():
-    p = Popen(['hg', 'tip', '--template', '{rev}'], stdout=PIPE)
-    d = 'r%s' % p.communicate()[0]
-    p = Popen(['hg', 'branch'], stdout=PIPE)
-    b = p.communicate()[0].strip('\n')
-    return '%s-%s' % (d, b)
+    commit_id = 'r%s' % get_cmd_output(['hg', 'tip', '--template', '{rev}'])
+
+    branch = get_cmd_output(['hg', 'branch']).strip('\n')
+    return '%s-%s' % (commit_id, branch)
 
 
 def pwd_bzr_version():
-    p = Popen(['bzr', 'revno'], stdout=PIPE)
-    d = '%s' % p.communicate()[0].strip()
-    return d
+    return '%s' % get_cmd_output(['bzr', 'revno']).strip()
 
 
 def run(cmd):
     output = subprocess.check_output(cmd, shell=True)
-    return output.strip()
+    return output.decode(STDOUT_ENCODING).strip()
 
 
 def decompress_egg_files():

tests/test_logout.py

@@ -1,6 +1,8 @@
-import unittest, os
-from shub.logout import remove_sh_key
+import os
+import unittest
 from tempfile import NamedTemporaryFile
+from shub.logout import remove_sh_key
+
 
 class LogoutTestCase(unittest.TestCase):
     _netrc_file = None
@@ -18,7 +20,7 @@ def test_was_key_removed_from_netrc(self):
     def _create_tmp_netrc(self):
         with NamedTemporaryFile(delete=False) as netrc:
             line = 'machine scrapinghub.com login ffffffffffffffffffffffffffffffff password ""'
-            netrc.write(line)
+            netrc.write(line.encode('ascii'))
         return netrc.name
 
     def _delete_tmp_netrc(self, netrc_file):