Change setup() keywords parameter to string form list.0.7.3

Also, some PEP8iziation.
Also, change home URL to the gitlab one.

2 files changed, 15 insertions, 11 deletions

diff --git a/cucutags.py b/cucutags.py
index 6531fcf..adaa6a1 100755
--- a/cucutags.py
+++ b/cucutags.py
@@ -20,18 +20,20 @@
 # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+import io
+import logging
 import os
 import os.path
-import io
 import re
 import sys
-import logging
+
+import parse
+
 logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
                     level=logging.INFO)
-import parse
 
 __docformat__ = 'reStructuredText'
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __author__ = u"Matěj Cepl <mcepl_at_redhat_dot_com>"
 
 
@@ -109,12 +111,11 @@ class SourceFile(object):
 class CodeFile(io.TextIOWrapper):
     def __init__(self, filename):
         filename = os.path.abspath(filename)
-        io.TextIOWrapper.__init__(self,
-                                  io.BufferedReader(
-                                  io.FileIO(filename, "r")))
+        io.TextIOWrapper.__init__(
+            self, io.BufferedReader(io.FileIO(filename, "r")))
 
     def process_file(self, cdir):
-        PATTERNS = {'.py': Target, '.feature': Feature}
+        PATTERNS = {'.py': Target, '.feature': Feature}  # noqa
         out = {
             'targets': [],
             'features': []
diff --git a/setup.py b/setup.py
index 1175581..8257441 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,12 @@
 # coding: utf-8
 from __future__ import absolute_import, print_function
-from setuptools import setup
+
 import os.path
+
 import cucutags
 
+from setuptools import setup
+
 
 def read(fname):
     with open(os.path.join(os.path.dirname(__file__), fname)) as inf:
@@ -16,10 +19,10 @@ setup(
     description='Generates ctags for BDD .feature/behave steps',
     author=u'Matěj Cepl',
     author_email='mcepl@redhat.com',
-    url='https://gitorious.org/cucutags/cucutags/',
+    url='https://gitlab.com/mcepl/cucutags',
     long_description=read("README"),
     test_suite='test',
-    keywords=['BDD', 'behave', 'ctags', 'tags'],
+    keywords='BDD behave ctags tags',
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",