Accepting request 1030298 from home:pgajdos:python

- do not require six
- added patches
  e47e62df30
  + python-flickrapi-no-python2.patch

OBS-URL: https://build.opensuse.org/request/show/1030298
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flickrapi?expand=0&rev=16

python-flickrapi-no-python2.patch

@@ -0,0 +1,872 @@
+diff --git a/flickrapi/auth.py b/flickrapi/auth.py
+index f08b23e..c1b3735 100644
+--- a/flickrapi/auth.py
++++ b/flickrapi/auth.py
+@@ -18,7 +18,6 @@
+ import random
+ import os.path
+ import sys
+-import six
+ 
+ from requests_toolbelt import MultipartEncoder
+ import requests
+@@ -38,15 +37,11 @@ def do_GET(self):
+         oauth_token = url_vars['oauth_token'][0]
+         oauth_verifier = url_vars['oauth_verifier'][0]
+ 
+-        if six.PY2:
+-            self.server.oauth_token = oauth_token.decode('utf-8')
+-            self.server.oauth_verifier = oauth_verifier.decode('utf-8')
+-        else:
+-            self.server.oauth_token = oauth_token
+-            self.server.oauth_verifier = oauth_verifier
++        self.server.oauth_token = oauth_token
++        self.server.oauth_verifier = oauth_verifier
+ 
+-        assert (isinstance(self.server.oauth_token, six.string_types))
+-        assert (isinstance(self.server.oauth_verifier, six.string_types))
++        assert isinstance(self.server.oauth_token, str)
++        assert isinstance(self.server.oauth_verifier, str)
+ 
+         self.send_response(200)
+         self.send_header('Content-type', 'text/html')
+@@ -108,13 +103,13 @@ class FlickrAccessToken(object):
+ 
+     def __init__(self, token, token_secret, access_level,
+                  fullname=u'', username=u'', user_nsid=u''):
+-        assert isinstance(token, six.text_type), 'token should be unicode text'
+-        assert isinstance(token_secret, six.text_type), 'token_secret should be unicode text'
+-        assert isinstance(access_level, six.text_type), 'access_level should be unicode text, is %r' % type(
++        assert isinstance(token, str), 'token should be unicode text'
++        assert isinstance(token_secret, str), 'token_secret should be unicode text'
++        assert isinstance(access_level, str), 'access_level should be unicode text, is %r' % type(
+             access_level)
+-        assert isinstance(fullname, six.text_type), 'fullname should be unicode text'
+-        assert isinstance(username, six.text_type), 'username should be unicode text'
+-        assert isinstance(user_nsid, six.text_type), 'user_nsid should be unicode text'
++        assert isinstance(fullname, str), 'fullname should be unicode text'
++        assert isinstance(username, str), 'username should be unicode text'
++        assert isinstance(user_nsid, str), 'user_nsid should be unicode text'
+ 
+         access_level = access_level.lower()
+         assert access_level in self.levels, 'access_level should be one of %r' % (self.levels,)
+@@ -128,7 +123,7 @@ def __init__(self, token, token_secret, access_level,
+ 
+     def __str__(self):
+         fmt = 'FlickrAccessToken(token=%s, fullname=%s, username=%s, user_nsid=%s)'
+-        return six.text_type(fmt % (self.token, self.fullname, self.username, self.user_nsid))
++        return str(fmt % (self.token, self.fullname, self.username, self.user_nsid))
+ 
+     def __repr__(self):
+         return str(self)
+@@ -154,8 +149,8 @@ class OAuthFlickrInterface(object):
+     def __init__(self, api_key, api_secret, oauth_token=None, default_timeout=None):
+         self.log = logging.getLogger('%s.%s' % (self.__class__.__module__, self.__class__.__name__))
+ 
+-        assert isinstance(api_key, six.text_type), 'api_key must be unicode string'
+-        assert isinstance(api_secret, six.text_type), 'api_secret must be unicode string'
++        assert isinstance(api_key, str), 'api_key must be unicode string'
++        assert isinstance(api_secret, str), 'api_secret must be unicode string'
+ 
+         token = None
+         secret = None
+@@ -203,7 +198,7 @@ def verifier(self):
+     def verifier(self, new_verifier):
+         """Sets the OAuth verifier"""
+ 
+-        assert isinstance(new_verifier, six.text_type), 'verifier must be unicode text type'
++        assert isinstance(new_verifier, str), 'verifier must be unicode text type'
+         self.oauth.client.verifier = new_verifier
+ 
+     @property
+@@ -315,7 +310,7 @@ def parse_oauth_response(data):
+         The keys and values of the dictionary will be text strings (i.e. not binary strings).
+         """
+ 
+-        if isinstance(data, six.binary_type):
++        if isinstance(data, bytes):
+             data = data.decode('utf-8')
+         qsl = urllib_parse.parse_qsl(data)
+ 
+diff --git a/flickrapi/core.py b/flickrapi/core.py
+index 4ef2b75..5fb5bd9 100644
+--- a/flickrapi/core.py
++++ b/flickrapi/core.py
+@@ -7,7 +7,6 @@
+ from __future__ import print_function
+ 
+ import logging
+-import six
+ import functools
+ 
+ from . import tokencache, auth
+@@ -29,15 +28,15 @@ def make_bytes(dictionary):
+ 
+     result = {}
+ 
+-    for (key, value) in six.iteritems(dictionary):
++    for (key, value) in dictionary.items():
+         # Keep binary data as-is.
+-        if isinstance(value, six.binary_type):
++        if isinstance(value, bytes):
+             result[key] = value
+             continue
+ 
+         # If it's not a string, convert it to one.
+-        if not isinstance(value, six.text_type):
+-            value = six.text_type(value)
++        if not isinstance(value, str):
++            value = str(value)
+ 
+         result[key] = value.encode('utf-8')
+ 
+@@ -191,9 +190,9 @@ def __init__(self, api_key, secret, username=None,
+         self.default_format = format
+         self._handler_cache = {}
+ 
+-        if isinstance(api_key, six.binary_type):
++        if isinstance(api_key, bytes):
+             api_key = api_key.decode('ascii')
+-        if isinstance(secret, six.binary_type):
++        if isinstance(secret, bytes):
+             secret = secret.decode('ascii')
+ 
+         if token:
+@@ -246,19 +245,19 @@ def parse_xmlnode(self, rest_xml):
+             return rsp
+ 
+         err = rsp.err[0]
+-        raise FlickrError(six.u('Error: %(code)s: %(msg)s') % err, code=err['code'])
++        raise FlickrError('Error: %(code)s: %(msg)s' % err, code=err['code'])
+ 
+     @rest_parser('parsed-json', 'json')
+     def parse_json(self, json_string):
+         """Parses a JSON response from Flickr."""
+ 
+-        if isinstance(json_string, six.binary_type):
++        if isinstance(json_string, bytes):
+             json_string = json_string.decode('utf-8')
+ 
+         import json
+         parsed = json.loads(json_string)
+         if parsed.get('stat', '') == 'fail':
+-            raise FlickrError(six.u('Error: %(code)s: %(message)s') % parsed,
++            raise FlickrError('Error: %(code)s: %(message)s' % parsed,
+                               code=parsed['code'])
+         return parsed
+ 
+@@ -294,7 +293,7 @@ def parse_etree(self, rest_xml):
+ 
+         err = rsp.find('err')
+         code = err.attrib.get('code', None)
+-        raise FlickrError(six.u('Error: %(code)s: %(msg)s') % err.attrib, code=code)
++        raise FlickrError('Error: %(code)s: %(msg)s' % err.attrib, code=code)
+ 
+     def __getattr__(self, method_name):
+         """Returns a CallBuilder for the given method name."""
+@@ -345,12 +344,12 @@ def _supply_defaults(self, args, defaults):
+         """
+ 
+         result = args.copy()
+-        for key, default_value in six.iteritems(defaults):
++        for key, default_value in defaults.items():
+             # Set the default if the parameter wasn't passed
+             if key not in args:
+                 result[key] = default_value
+ 
+-        for key, value in six.iteritems(result.copy()):
++        for key, value in result.copy().items():
+             # You are able to remove a default by assigning None, and we can't
+             # pass None to Flickr anyway.
+             if value is None:
+@@ -587,8 +586,8 @@ def authenticate_console(self, perms=u'read'):
+         the program.
+         """
+ 
+-        if isinstance(perms, six.binary_type):
+-            perms = six.u(perms)
++        if isinstance(perms, bytes):
++            perms = perms.decode('utf-8')
+ 
+         self.flickr_oauth.get_request_token()
+         self.flickr_oauth.auth_via_console(perms=perms)
+@@ -602,8 +601,8 @@ def authenticate_via_browser(self, perms=u'read'):
+         Starts the browser and waits for the user to authorize the app before continuing.
+         """
+ 
+-        if isinstance(perms, six.binary_type):
+-            perms = six.u(perms)
++        if isinstance(perms, bytes):
++            perms = perms.decode('utf-8')
+ 
+         self.flickr_oauth.get_request_token()
+         self.flickr_oauth.auth_via_browser(perms=perms)
+@@ -615,8 +614,8 @@ def authenticate_for_test(self, perms=u'read'):
+         """Skips a bit of the authentication/authorization, for unit tests.
+         """
+ 
+-        if isinstance(perms, six.binary_type):
+-            perms = six.u(perms)
++        if isinstance(perms, bytes):
++            perms = perms.decode('utf-8')
+ 
+         self.flickr_oauth.get_request_token()
+         self.flickr_oauth.auth_for_test(perms=perms)
+diff --git a/flickrapi/html.py b/flickrapi/html.py
+index e6f9c33..dfff966 100644
+--- a/flickrapi/html.py
++++ b/flickrapi/html.py
+@@ -80,6 +80,4 @@
+ </html>
+ """  # noqa: W293
+ 
+-import six
+-if six.PY3:
+-    auth_okay_html = auth_okay_html.encode('utf-8')
++auth_okay_html = auth_okay_html.encode('utf-8')
+diff --git a/flickrapi/shorturl.py b/flickrapi/shorturl.py
+index 38153ae..51b340f 100644
+--- a/flickrapi/shorturl.py
++++ b/flickrapi/shorturl.py
+@@ -11,8 +11,6 @@
+ 
+ """
+ 
+-import six
+-
+ __all__ = ['encode', 'decode', 'url', 'SHORT_URL']
+ 
+ ALPHABET = u'123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ'
+@@ -54,13 +52,13 @@ def decode(short_id):
+     decoded = 0
+     multi = 1
+ 
+-    for i in six.moves.range(len(short_id) - 1, -1, -1):
++    for i in range(len(short_id) - 1, -1, -1):
+         char = short_id[i]
+         index = ALPHABET.index(char)
+         decoded += multi * index
+         multi *= len(ALPHABET)
+ 
+-    return six.text_type(decoded)
++    return str(decoded)
+ 
+ 
+ def url(photo_id):
+diff --git a/poetry.lock b/poetry.lock
+new file mode 100644
+index 0000000..6b386e2
+--- /dev/null
++++ b/poetry.lock
+@@ -0,0 +1,559 @@
++[[package]]
++category = "main"
++description = "A configurable sidebar-enabled Sphinx theme"
++name = "alabaster"
++optional = true
++python-versions = "*"
++version = "0.7.12"
++
++[[package]]
++category = "dev"
++description = "Atomic file writes."
++name = "atomicwrites"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "1.3.0"
++
++[[package]]
++category = "dev"
++description = "Classes Without Boilerplate"
++name = "attrs"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "19.1.0"
++
++[[package]]
++category = "main"
++description = "Internationalization utilities"
++name = "babel"
++optional = true
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "2.7.0"
++
++[package.dependencies]
++pytz = ">=2015.7"
++
++[[package]]
++category = "main"
++description = "Python package for providing Mozilla's CA Bundle."
++name = "certifi"
++optional = false
++python-versions = "*"
++version = "2019.9.11"
++
++[[package]]
++category = "main"
++description = "Universal encoding detector for Python 2 and 3"
++name = "chardet"
++optional = false
++python-versions = "*"
++version = "3.0.4"
++
++[[package]]
++category = "main"
++description = "Cross-platform colored terminal text."
++marker = "sys_platform == \"win32\""
++name = "colorama"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "0.4.1"
++
++[[package]]
++category = "dev"
++description = "Code coverage measurement for Python"
++name = "coverage"
++optional = false
++python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4"
++version = "4.5.4"
++
++[[package]]
++category = "main"
++description = "Docutils -- Python Documentation Utilities"
++name = "docutils"
++optional = true
++python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
++version = "0.15.2"
++
++[[package]]
++category = "main"
++description = "Discover and load entry points from installed packages."
++name = "entrypoints"
++optional = true
++python-versions = ">=2.7"
++version = "0.3"
++
++[[package]]
++category = "dev"
++description = "A platform independent file lock."
++name = "filelock"
++optional = false
++python-versions = "*"
++version = "3.0.12"
++
++[[package]]
++category = "main"
++description = "the modular source code checker: pep8, pyflakes and co"
++name = "flake8"
++optional = true
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "3.7.8"
++
++[package.dependencies]
++entrypoints = ">=0.3.0,<0.4.0"
++mccabe = ">=0.6.0,<0.7.0"
++pycodestyle = ">=2.5.0,<2.6.0"
++pyflakes = ">=2.1.0,<2.2.0"
++
++[[package]]
++category = "main"
++description = "Internationalized Domain Names in Applications (IDNA)"
++name = "idna"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "2.8"
++
++[[package]]
++category = "main"
++description = "Getting image size from png/jpeg/jpeg2000/gif file"
++name = "imagesize"
++optional = true
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "1.1.0"
++
++[[package]]
++category = "dev"
++description = "Read metadata from Python packages"
++name = "importlib-metadata"
++optional = false
++python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3"
++version = "0.23"
++
++[package.dependencies]
++zipp = ">=0.5"
++
++[[package]]
++category = "main"
++description = "A small but fast and easy to use stand-alone template engine written in pure python."
++name = "jinja2"
++optional = true
++python-versions = "*"
++version = "2.10.1"
++
++[package.dependencies]
++MarkupSafe = ">=0.23"
++
++[[package]]
++category = "main"
++description = "Safely add untrusted strings to HTML/XML markup."
++name = "markupsafe"
++optional = true
++python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
++version = "1.1.1"
++
++[[package]]
++category = "main"
++description = "McCabe checker, plugin for flake8"
++name = "mccabe"
++optional = true
++python-versions = "*"
++version = "0.6.1"
++
++[[package]]
++category = "dev"
++description = "More routines for operating on iterables, beyond itertools"
++name = "more-itertools"
++optional = false
++python-versions = ">=3.4"
++version = "7.2.0"
++
++[[package]]
++category = "main"
++description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
++name = "oauthlib"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "3.1.0"
++
++[[package]]
++category = "main"
++description = "Core utilities for Python packages"
++name = "packaging"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "19.2"
++
++[package.dependencies]
++pyparsing = ">=2.0.2"
++six = "*"
++
++[[package]]
++category = "dev"
++description = "Object-oriented filesystem paths"
++marker = "python_version < \"3.6\""
++name = "pathlib2"
++optional = false
++python-versions = "*"
++version = "2.3.4"
++
++[package.dependencies]
++six = "*"
++
++[[package]]
++category = "dev"
++description = "plugin and hook calling mechanisms for python"
++name = "pluggy"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "0.13.0"
++
++[package.dependencies]
++[package.dependencies.importlib-metadata]
++python = "<3.8"
++version = ">=0.12"
++
++[[package]]
++category = "dev"
++description = "library with cross-python path, ini-parsing, io, code, log facilities"
++name = "py"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "1.8.0"
++
++[[package]]
++category = "main"
++description = "Python style guide checker"
++name = "pycodestyle"
++optional = true
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "2.5.0"
++
++[[package]]
++category = "main"
++description = "passive checker of Python programs"
++name = "pyflakes"
++optional = true
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "2.1.1"
++
++[[package]]
++category = "main"
++description = "Pygments is a syntax highlighting package written in Python."
++name = "pygments"
++optional = true
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
++version = "2.4.2"
++
++[[package]]
++category = "main"
++description = "Python parsing module"
++name = "pyparsing"
++optional = false
++python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
++version = "2.4.2"
++
++[[package]]
++category = "dev"
++description = "pytest: simple powerful testing with Python"
++name = "pytest"
++optional = false
++python-versions = ">=3.5"
++version = "5.0.1"
++
++[package.dependencies]
++atomicwrites = ">=1.0"
++attrs = ">=17.4.0"
++colorama = "*"
++importlib-metadata = ">=0.12"
++more-itertools = ">=4.0.0"
++packaging = "*"
++pluggy = ">=0.12,<1.0"
++py = ">=1.5.0"
++wcwidth = "*"
++
++[package.dependencies.pathlib2]
++python = "<3.6"
++version = ">=2.2.0"
++
++[[package]]
++category = "dev"
++description = "Pytest plugin for measuring coverage."
++name = "pytest-cov"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "2.7.1"
++
++[package.dependencies]
++coverage = ">=4.4"
++pytest = ">=3.6"
++
++[[package]]
++category = "main"
++description = "World timezone definitions, modern and historical"
++name = "pytz"
++optional = true
++python-versions = "*"
++version = "2019.2"
++
++[[package]]
++category = "main"
++description = "Python HTTP for Humans."
++name = "requests"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
++version = "2.22.0"
++
++[package.dependencies]
++certifi = ">=2017.4.17"
++chardet = ">=3.0.2,<3.1.0"
++idna = ">=2.5,<2.9"
++urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26"
++
++[[package]]
++category = "main"
++description = "OAuthlib authentication support for Requests."
++name = "requests-oauthlib"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "1.2.0"
++
++[package.dependencies]
++oauthlib = ">=3.0.0"
++requests = ">=2.0.0"
++
++[[package]]
++category = "main"
++description = "A utility belt for advanced users of python-requests"
++name = "requests-toolbelt"
++optional = false
++python-versions = "*"
++version = "0.9.1"
++
++[package.dependencies]
++requests = ">=2.0.1,<3.0.0"
++
++[[package]]
++category = "dev"
++description = "A utility library for mocking out the `requests` Python library."
++name = "responses"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "0.10.6"
++
++[package.dependencies]
++requests = ">=2.0"
++six = "*"
++
++[[package]]
++category = "main"
++description = "Python 2 and 3 compatibility utilities"
++name = "six"
++optional = false
++python-versions = ">=2.6, !=3.0.*, !=3.1.*"
++version = "1.12.0"
++
++[[package]]
++category = "main"
++description = "This package provides 26 stemmers for 25 languages generated from Snowball algorithms."
++name = "snowballstemmer"
++optional = true
++python-versions = "*"
++version = "1.9.1"
++
++[[package]]
++category = "main"
++description = "Python documentation generator"
++name = "sphinx"
++optional = true
++python-versions = ">=3.5"
++version = "2.2.0"
++
++[package.dependencies]
++Jinja2 = ">=2.3"
++Pygments = ">=2.0"
++alabaster = ">=0.7,<0.8"
++babel = ">=1.3,<2.0 || >2.0"
++colorama = ">=0.3.5"
++docutils = ">=0.12"
++imagesize = "*"
++packaging = "*"
++requests = ">=2.5.0"
++setuptools = "*"
++snowballstemmer = ">=1.1"
++sphinxcontrib-applehelp = "*"
++sphinxcontrib-devhelp = "*"
++sphinxcontrib-htmlhelp = "*"
++sphinxcontrib-jsmath = "*"
++sphinxcontrib-qthelp = "*"
++sphinxcontrib-serializinghtml = "*"
++
++[[package]]
++category = "main"
++description = ""
++name = "sphinxcontrib-applehelp"
++optional = true
++python-versions = "*"
++version = "1.0.1"
++
++[[package]]
++category = "main"
++description = ""
++name = "sphinxcontrib-devhelp"
++optional = true
++python-versions = "*"
++version = "1.0.1"
++
++[[package]]
++category = "main"
++description = ""
++name = "sphinxcontrib-htmlhelp"
++optional = true
++python-versions = "*"
++version = "1.0.2"
++
++[[package]]
++category = "main"
++description = "A sphinx extension which renders display math in HTML via JavaScript"
++name = "sphinxcontrib-jsmath"
++optional = true
++python-versions = ">=3.5"
++version = "1.0.1"
++
++[[package]]
++category = "main"
++description = ""
++name = "sphinxcontrib-qthelp"
++optional = true
++python-versions = "*"
++version = "1.0.2"
++
++[[package]]
++category = "main"
++description = ""
++name = "sphinxcontrib-serializinghtml"
++optional = true
++python-versions = "*"
++version = "1.1.3"
++
++[[package]]
++category = "dev"
++description = "Python Library for Tom's Obvious, Minimal Language"
++name = "toml"
++optional = false
++python-versions = "*"
++version = "0.10.0"
++
++[[package]]
++category = "dev"
++description = "tox is a generic virtualenv management and test command line tool"
++name = "tox"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "3.14.0"
++
++[package.dependencies]
++filelock = ">=3.0.0,<4"
++packaging = ">=14"
++pluggy = ">=0.12.0,<1"
++py = ">=1.4.17,<2"
++six = ">=1.0.0,<2"
++toml = ">=0.9.4"
++virtualenv = ">=14.0.0"
++
++[package.dependencies.importlib-metadata]
++python = "<3.8"
++version = ">=0.12,<1"
++
++[[package]]
++category = "main"
++description = "HTTP library with thread-safe connection pooling, file post, and more."
++name = "urllib3"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
++version = "1.25.5"
++
++[[package]]
++category = "dev"
++description = "Virtual Python Environment builder"
++name = "virtualenv"
++optional = false
++python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
++version = "16.7.5"
++
++[[package]]
++category = "dev"
++description = "Measures number of Terminal column cells of wide-character codes"
++name = "wcwidth"
++optional = false
++python-versions = "*"
++version = "0.1.7"
++
++[[package]]
++category = "dev"
++description = "Backport of pathlib-compatible object wrapper for zip files"
++name = "zipp"
++optional = false
++python-versions = ">=2.7"
++version = "0.6.0"
++
++[package.dependencies]
++more-itertools = "*"
++
++[extras]
++docs = []
++qa = ["flake8"]
++
++[metadata]
++content-hash = "a634f3e784fb833b023a8ca4562435312cd3085904eb704ff30ec63c13d9a800"
++python-versions = "^3.5"
++
++[metadata.hashes]
++alabaster = ["446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359", "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"]
++atomicwrites = ["03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"]
++attrs = ["69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399"]
++babel = ["af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"]
++certifi = ["e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50", "fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"]
++chardet = ["84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"]
++colorama = ["05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", "f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"]
++coverage = ["08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6", "0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650", "141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5", "19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d", "23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351", "245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755", "331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef", "386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca", "3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca", "60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9", "63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc", "6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5", "6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f", "7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe", "826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888", "93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5", "9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce", "af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5", "bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e", "bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e", "c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9", "dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437", "df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1", "e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c", "e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24", "e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47", "eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2", "eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28", "ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c", "efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7", "fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0", "ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"]
++docutils = ["6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", "9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"]
++entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"]
++filelock = ["18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", "929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"]
++flake8 = ["19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548", "8e9dfa3cecb2400b3738a42c54c3043e821682b9c840b0448c0503f781130696"]
++idna = ["c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"]
++imagesize = ["3f349de3eb99145973fefb7dbe38554414e5c30abd0c8e4b970a7c9d09f3a1d8", "f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5"]
++importlib-metadata = ["aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26", "d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af"]
++jinja2 = ["065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", "14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b"]
++markupsafe = ["00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", "09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", "62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", "88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", "98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", "ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", "b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", "ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"]
++mccabe = ["ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", "dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"]
++more-itertools = ["409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832", "92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"]
++oauthlib = ["bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889", "df884cd6cbe20e32633f1db1072e9356f53638e4361bef4e8b03c9127c9328ea"]
++packaging = ["28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47", "d9551545c6d761f3def1677baf08ab2a3ca17c56879e70fecba2fc4dde4ed108"]
++pathlib2 = ["2156525d6576d21c4dcaddfa427fae887ef89a7a9de5cbfe0728b3aafa78427e", "446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8"]
++pluggy = ["0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6", "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34"]
++py = ["64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", "dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"]
++pycodestyle = ["95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56", "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"]
++pyflakes = ["17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"]
++pygments = ["71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"]
++pyparsing = ["6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80", "d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4"]
++pytest = ["6ef6d06de77ce2961156013e9dff62f1b2688aa04d0dc244299fe7d67e09370d", "a736fed91c12681a7b34617c8fcefe39ea04599ca72c608751c31d89579a3f77"]
++pytest-cov = ["2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6", "e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a"]
++pytz = ["26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32", "c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"]
++requests = ["11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", "9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"]
++requests-oauthlib = ["bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57", "d3ed0c8f2e3bbc6b344fa63d6f933745ab394469da38db16bdddb461c7e25140", "dd5a0499abfefd087c6dd96693cbd5bfd28aa009719a7f85ab3fabe3956ef19a"]
++requests-toolbelt = ["380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f", "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"]
++responses = ["502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790", "97193c0183d63fba8cd3a041c75464e4b09ea0aff6328800d1546598567dde0b"]
++six = ["3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"]
++snowballstemmer = ["713e53b79cbcf97bc5245a06080a33d54a77e7cce2f789c835a143bcdb5c033e"]
++sphinx = ["0d586b0f8c2fc3cc6559c5e8fd6124628110514fda0e5d7c82e682d749d2e845", "839a3ed6f6b092bb60f492024489cc9e6991360fb9f52ed6361acd510d261069"]
++sphinxcontrib-applehelp = ["edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897", "fb8dee85af95e5c30c91f10e7eb3c8967308518e0f7488a2828ef7bc191d0d5d"]
++sphinxcontrib-devhelp = ["6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34", "9512ecb00a2b0821a146736b39f7aeb90759834b07e81e8cc23a9c70bacb9981"]
++sphinxcontrib-htmlhelp = ["4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422", "d4fd39a65a625c9df86d7fa8a2d9f3cd8299a3a4b15db63b50aac9e161d8eff7"]
++sphinxcontrib-jsmath = ["2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178", "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"]
++sphinxcontrib-qthelp = ["513049b93031beb1f57d4daea74068a4feb77aa5630f856fcff2e50de14e9a20", "79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f"]
++sphinxcontrib-serializinghtml = ["c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227", "db6615af393650bf1151a6cd39120c29abaf93cc60db8c48eb2dddbfdc3a9768"]
++toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
++tox = ["0bc216b6a2e6afe764476b4a07edf2c1dab99ed82bb146a1130b2e828f5bff5e", "c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1"]
++urllib3 = ["2f3eadfea5d92bc7899e75b5968410b749a054b492d5a6379c1344a1481bc2cb", "9c6c593cb28f52075016307fc26b0a0f8e82bc7d1ff19aaaa959b91710a56c47"]
++virtualenv = ["680af46846662bb38c5504b78bad9ed9e4f3ba2d54f54ba42494fdf94337fe30", "f78d81b62d3147396ac33fc9d77579ddc42cc2a98dd9ea38886f616b33bc7fb2"]
++wcwidth = ["3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", "f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"]
++zipp = ["3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e", "f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335"]
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 0000000..82b5f77
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,45 @@
++[tool.poetry]
++name = "flickrapi"
++version = "3.0-dev0"
++description = "The Python interface to the Flickr API"
++authors = ["Sybren A. Stüvel <sybren@stuvel.eu>"]
++license = "CNRI-Python"
++classifiers = [
++    'Development Status :: 6 - Mature',
++    'Intended Audience :: Developers',
++    'Operating System :: OS Independent',
++    'Programming Language :: Python',
++    'Programming Language :: Python :: 3',
++    'Programming Language :: Python :: 3.5',
++    'Programming Language :: Python :: 3.6',
++    'Programming Language :: Python :: 3.7',
++    'Programming Language :: Python :: Implementation :: CPython',
++    'Programming Language :: Python :: Implementation :: PyPy',
++    'Topic :: Multimedia :: Graphics',
++    'Topic :: Software Development :: Libraries :: Python Modules'
++]
++
++[tool.poetry.extras]
++docs = ["sphynx"]
++qa = ["flake8"]
++
++
++[tool.poetry.dependencies]
++python = "^3.5"
++requests = "~2"
++requests_oauthlib = ">=0.8"
++requests_toolbelt = ">=0.8"
++
++sphinx = { version = "~2", optional = true }
++flake8 = { version = "~3", optional = true }
++
++[tool.poetry.dev-dependencies]
++pytest = "~5.0"
++pytest-cov = "~2.7"
++responses = ">0.5.1"
++tox = "^3.14"
++
++
++[build-system]
++requires = ["poetry>=0.12"]
++build-backend = "poetry.masonry.api"
+

python-flickrapi.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 21 06:56:11 UTC 2022 - pgajdos@suse.com
+
+- do not require six
+- added patches
+  https://github.com/sybrenstuvel/flickrapi/commit/e47e62df304d36ae81c483230bb41e6f4dde8bfd
+  + python-flickrapi-no-python2.patch
+
 -------------------------------------------------------------------
 Tue Jun 29 07:48:52 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
 

python-flickrapi.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-flickrapi
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,10 @@ License:        Python-2.0
 Group:          Development/Libraries/Python
 URL:            http://stuvel.eu/projects/flickrapi
 Source0:        https://files.pythonhosted.org/packages/source/f/flickrapi/flickrapi-%{version}.tar.gz
+# https://github.com/sybrenstuvel/flickrapi/commit/e47e62df304d36ae81c483230bb41e6f4dde8bfd
+Patch0:         python-flickrapi-no-python2.patch
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module poetry}
 BuildRequires:  %{python_module requests-oauthlib}
 BuildRequires:  %{python_module requests-toolbelt}
 BuildRequires:  %{python_module requests}
@@ -51,13 +55,14 @@ photos, and all Flickr API functions.
 
 %prep
 %setup -q -n flickrapi-%{version}
+%patch0 -p1
 sed -i "1d" flickrapi/__init__.py # Fix non-executable script
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 rm -rf %{buildroot}%{python_sitelib}/*.txt # Remove wrongly installed documentation
 %python_expand %fdupes %{buildroot}%{$python_sitelib}