0x2620
/
pandora_client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python3 only, drop six, drop __future__

This commit is contained in:
j 2023-07-28 18:29:55 +02:00
parent f107727434
commit a33d6d9bc8
8 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/pandora_client
View File

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
# GPL 2012 # GPL 2012
from __future__ import print_function
import os import os
import sys import sys

6
debian/control vendored
View File

@ -3,13 +3,13 @@ Maintainer: Jan Gerber <j@mailb.org>
Section: python Section: python
Priority: optional Priority: optional
Build-Depends: python3-all, debhelper (>= 7.4.3), dh-python, python3-setuptools (>= 0.6b3), 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 Standards-Version: 3.9.1
Package: pandora-client Package: pandora-client
Architecture: all Architecture: all
Depends: python3, ${misc:Depends}, ${python3:Depends}, ffmpeg | libav-tools, Depends: python3, ${misc:Depends}, ${python3:Depends}, ffmpeg,
python3-ox, python3-six, python3-requests, python3-twisted, python3-zeroconf, python3-netifaces python3-ox, python3-requests, python3-twisted, python3-zeroconf, python3-netifaces
Description: pandora_client is a commandline client for pan.do/ra. Description: pandora_client is a commandline client for pan.do/ra.
You can use it to import videos into a pan.do/ra system. You can use it to import videos into a pan.do/ra system.

7
pandora_client/__init__.py
View File

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
# GPL 2012-2016 # GPL 2012-2016
from __future__ import division, with_statement, print_function, absolute_import
import getpass import getpass
from glob import glob from glob import glob
@ -17,9 +16,7 @@ import tempfile
import time import time
import pkg_resources import pkg_resources
from six.moves.urllib.parse import urlparse from urllib.parse import urlparse
from six.moves import input
from six import string_types
import ox import ox
@ -147,7 +144,7 @@ class Client(object):
_configfile = None _configfile = None
def __init__(self, config, offline=False): def __init__(self, config, offline=False):
if isinstance(config, string_types): if isinstance(config, str):
self._configfile = os.path.expanduser(config) self._configfile = os.path.expanduser(config)
with open(config) as f: with open(config) as f:
try: try:

1
pandora_client/client.py
View File

@ -1,6 +1,5 @@
# encoding: utf-8 # encoding: utf-8
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
from __future__ import division, with_statement, print_function, absolute_import
import json import json
import os import os

1
pandora_client/extract.py
View File

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
# GPL 2017 # GPL 2017
from __future__ import division, print_function, absolute_import
from glob import glob from glob import glob
import os import os

1
pandora_client/server.py
View File

@ -1,6 +1,5 @@
# encoding: utf-8 # encoding: utf-8
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
from __future__ import division, with_statement, print_function, absolute_import
import os import os
import json import json

1
pandora_client/utils.py
View File

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
# GPL 2010 # GPL 2010
from __future__ import division, with_statement, print_function
import fractions import fractions
import os import os

3
setup.py
View File

@ -39,8 +39,7 @@ setup(
'pandora_client' 'pandora_client'
], ],
install_requires=[ install_requires=[
'ox >= 2.3.804,<3', 'ox >= 3.0.0',
'six',
'requests >= 1.1.0', 'requests >= 1.1.0',
'zeroconf', 'zeroconf',
'netifaces', 'netifaces',