Merge pull request #9 from rafaelcaricio/support-python2.7

Support Python 2.7

Author: hjacobs

.gitignore

@@ -7,3 +7,4 @@ coverage.xml
 .coverage
 htmlcov
 .cache
+.tox/

.travis.yml

@@ -1,12 +1,12 @@
 language: python
 python:
+  - "pypy"
+  - "2.7"
   - "3.4"
   - "3.5"
 install:
-  - pip install -r requirements.txt
-  - pip install coveralls flake8
+  - pip install tox tox-travis coveralls
 script:
-  - python setup.py test
-  - flake8 .
+  - tox
 after_success:
   - coveralls

README.rst

@@ -93,7 +93,7 @@ See this `example script`_ and the `shell script`_.
 ::
 
    $ ./example.py li
-   Identifier│Name     │Status │Creation Date│Description                                       │Without Title
+   Identifier|Name     |Status |Creation Date|Description                                       |Without Title
             0 Column #0 ERROR   -4228033s ago this is a verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr.. column without title
             1 Column #1 FINE    -4228033s ago this is a verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr.. column without title
             2 Column #2 WARNING -4228033s ago this is a verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr.. column without title
@@ -188,7 +188,7 @@ See this `example script`_ and the `shell script`_.
    This is a ok with message:all is fine
    This is a warning: please check this
    Start with working.. . . . . OK
-   Id│Name
+   Id|Name
     1 Test #1
     2 Test #2
    Only FYI
@@ -220,7 +220,7 @@ See this `example script`_ and the `shell script`_.
 License
 =======
 
-Copyright © 2015 Zalando SE
+Copyright (c) 2015 Zalando SE
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

clickclick/console.py

@@ -1,11 +1,19 @@
-import click
+# -*- coding: utf-8 -*-
+
 import datetime
 import json
+import numbers
 import sys
 import time
+
+import click
 import yaml
-import numbers
-import urllib.parse
+
+try:
+    from urllib.parse import urlsplit, urlunsplit
+except ImportError:  # NOQA
+    from urlparse import urlsplit, urlunsplit
+
 
 # global state is evil!
 # anyway, we are using this as a convenient hack to switch output formats
@@ -242,7 +250,7 @@ def print_table(cols, rows, styles=None, titles=None, max_column_widths=None):
         click.echo('')
 
 
-def choice(prompt: str, options: list, default=None):
+def choice(prompt, options, default=None):
     """
     Ask to user to select one option and return it
     """
@@ -342,11 +350,11 @@ def convert(self, value, param, ctx):
             self.fail('"{}" is not a valid URL'.format(value))
         if self.default_scheme and '://' not in value:
             value = '{}://{}'.format(self.default_scheme, value)
-        url = urllib.parse.urlsplit(value)
+        url = urlsplit(value)
         if self.allowed_schemes and url.scheme not in self.allowed_schemes:
             self.fail('"{}" is not one of the allowed URL schemes ({})'.format(
                       url.scheme, ', '.join(self.allowed_schemes)))
-        return urllib.parse.urlunsplit(url)
+        return urlunsplit(url)
 
     def __repr__(self):
         return 'UrlType(%r, %r)' % (self.default_scheme, self.allowed_schemes)

setup.py

@@ -95,7 +95,8 @@ def get_install_requirements(path):
 
 
 def read(fname):
-    return open(os.path.join(__location__, fname), encoding='utf-8').read()
+    with open(os.path.join(__location__, fname)) as readme:
+        return readme.read()
 
 
 def check_deps(deps):

tests/test_console.py

@@ -1,26 +1,15 @@
+# -*- coding: utf-8 -*-
+
 import datetime
-import pytest
 import time
 
 import click
-
 from click.testing import CliRunner
-from clickclick import (
-    Action,
-    action,
-    AliasedGroup,
-    choice,
-    error,
-    fatal_error,
-    FloatRange,
-    format_time,
-    info,
-    ok,
-    OutputFormat,
-    print_table,
-    UrlType,
-    warning,
-)
+from clickclick import (Action, AliasedGroup, FloatRange, OutputFormat,
+                        UrlType, action, choice, error, fatal_error,
+                        format_time, info, ok, print_table, warning)
+
+import pytest
 
 
 def test_echo():
@@ -93,7 +82,7 @@ def test_text_out(capsys):
         warning('this is a warning')
         print_table('a b'.split(), [{}, {}])
     out, err = capsys.readouterr()
-    assert 'A│B\n    \n    \n' == out
+    assert u'A│B\n    \n    \n' == out
     assert 'this is a warning\n' == err
 
 

tox.ini

@@ -1,2 +1,25 @@
 [flake8]
 max-line-length=120
+
+[tox]
+envlist=pypy,py27,py34,py35,isort-check,flake8
+
+[tox:travis]
+pypy=pypy
+2.7=py27
+3.4=py34
+3.5=py35,isort-check,flake8
+
+[testenv]
+commands=python setup.py test
+
+[testenv:flake8]
+deps=flake8
+commands=python setup.py flake8
+
+[testenv:isort-check]
+basepython=python3
+deps=isort
+commands=isort -ns __init__.py -rc -c -df {toxinidir}/clickclick {toxinidir}/tests
+
+