diff --git a/bin/pandora_client b/bin/pandora_client index 49710d5..bdd1fd2 100755 --- a/bin/pandora_client +++ b/bin/pandora_client @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 # GPL 2012 -from __future__ import print_function import os import sys diff --git a/debian/control b/debian/control index 134cfd7..f324dc8 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Maintainer: Jan Gerber Section: python Priority: optional Build-Depends: python3-all, debhelper (>= 7.4.3), dh-python, python3-setuptools (>= 0.6b3), - python3-ox, python3-six, python3-requests, python3-twisted, python3-zeroconf, python3-netifaces + python3-ox, python3-requests, python3-twisted, python3-zeroconf, python3-netifaces Standards-Version: 3.9.1 Package: pandora-client Architecture: all -Depends: python3, ${misc:Depends}, ${python3:Depends}, ffmpeg | libav-tools, - python3-ox, python3-six, python3-requests, python3-twisted, python3-zeroconf, python3-netifaces +Depends: python3, ${misc:Depends}, ${python3:Depends}, ffmpeg, + python3-ox, python3-requests, python3-twisted, python3-zeroconf, python3-netifaces Description: pandora_client is a commandline client for pan.do/ra. You can use it to import videos into a pan.do/ra system. diff --git a/pandora_client/__init__.py b/pandora_client/__init__.py index 37359a4..5e72481 100755 --- a/pandora_client/__init__.py +++ b/pandora_client/__init__.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 # GPL 2012-2016 -from __future__ import division, with_statement, print_function, absolute_import import getpass from glob import glob @@ -17,9 +16,7 @@ import tempfile import time import pkg_resources -from six.moves.urllib.parse import urlparse -from six.moves import input -from six import string_types +from urllib.parse import urlparse import ox @@ -147,7 +144,7 @@ class Client(object): _configfile = None def __init__(self, config, offline=False): - if isinstance(config, string_types): + if isinstance(config, str): self._configfile = os.path.expanduser(config) with open(config) as f: try: diff --git a/pandora_client/client.py b/pandora_client/client.py index f43abbb..eb8fadc 100644 --- a/pandora_client/client.py +++ b/pandora_client/client.py @@ -1,6 +1,5 @@ # encoding: utf-8 # vi:si:et:sw=4:sts=4:ts=4 -from __future__ import division, with_statement, print_function, absolute_import import json import os diff --git a/pandora_client/extract.py b/pandora_client/extract.py index c3ce5dc..53478a7 100644 --- a/pandora_client/extract.py +++ b/pandora_client/extract.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 # GPL 2017 -from __future__ import division, print_function, absolute_import from glob import glob import os diff --git a/pandora_client/server.py b/pandora_client/server.py index 3b5138c..3044fe4 100644 --- a/pandora_client/server.py +++ b/pandora_client/server.py @@ -1,6 +1,5 @@ # encoding: utf-8 # vi:si:et:sw=4:sts=4:ts=4 -from __future__ import division, with_statement, print_function, absolute_import import os import json diff --git a/pandora_client/utils.py b/pandora_client/utils.py index a9448e0..cf878ff 100644 --- a/pandora_client/utils.py +++ b/pandora_client/utils.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 # GPL 2010 -from __future__ import division, with_statement, print_function import fractions import os diff --git a/setup.py b/setup.py index 3627d7a..12981b2 100644 --- a/setup.py +++ b/setup.py @@ -39,8 +39,7 @@ setup( 'pandora_client' ], install_requires=[ - 'ox >= 2.3.804,<3', - 'six', + 'ox >= 3.0.0', 'requests >= 1.1.0', 'zeroconf', 'netifaces',