diff --git a/.gitignore b/.gitignore index d22200b..6539daf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /python3-openid-3.0.2.tar.gz /python3-openid-3.0.5.tar.gz +/python3-openid-3.0.6.tar.gz diff --git a/python3-openid-3.0.2-admin-runtests-python3.patch b/python3-openid-3.0.2-admin-runtests-python3.patch deleted file mode 100644 index fae2567..0000000 --- a/python3-openid-3.0.2-admin-runtests-python3.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- python3-openid-3.0.2/admin/runtests.orig 2013-10-22 20:42:35.000000000 +0200 -+++ python3-openid-3.0.2/admin/runtests 2013-11-29 10:24:07.524112906 +0100 -@@ -14,19 +14,19 @@ def fixpath(): - d = os.path.dirname(sys.argv[0]) - parent = os.path.normpath(os.path.join(d, '..')) - if parent not in sys.path: -- print "putting %s in sys.path" % (parent,) -+ print ("putting %s in sys.path" % (parent,)) - sys.path.insert(0, parent) - - def otherTests(): - failed = [] - for module_name in test_modules: -- print 'Testing %s...' % (module_name,) , -+ print ('Testing %s...' % (module_name,)) - sys.stdout.flush() - module_name = 'openid.test.' + module_name - try: - test_mod = __import__(module_name, {}, {}, [None]) - except ImportError: -- print 'Failed to import test %r' % (module_name,) -+ print ('Failed to import test %r' % (module_name,)) - failed.append(module_name) - else: - try: -@@ -37,7 +37,7 @@ def otherTests(): - sys.excepthook(*sys.exc_info()) - failed.append(module_name) - else: -- print 'Succeeded.' -+ print ('Succeeded.') - - - return failed -@@ -72,7 +72,7 @@ def pyunitTests(): - - try: - from openid.test import test_examples -- except ImportError, e: -+ except ImportError as e: - if 'twill' in str(e): - warnings.warn("Could not import twill; skipping test_examples.") - else: -@@ -110,10 +110,10 @@ def pyunitTests(): - m = __import__('openid.test.%s' % (name,), {}, {}, ['unused']) - try: - s.addTest(m.pyUnitTests()) -- except AttributeError, ex: -+ except AttributeError as ex: - # because the AttributeError doesn't actually say which - # object it was. -- print "Error loading tests from %s:" % (name,) -+ print ("Error loading tests from %s:" % (name,)) - raise - - runner = unittest.TextTestRunner() # verbosity=2) -@@ -125,7 +125,7 @@ def pyunitTests(): - def splitDir(d, count): - # in python2.4 and above, it's easier to spell this as - # d.rsplit(os.sep, count) -- for i in xrange(count): -+ for i in range(count): - d = os.path.dirname(d) - return d - -@@ -144,7 +144,9 @@ def _import_djopenid(): - djinit = os.path.join(djdir, '__init__.py') - - djopenid = types.ModuleType('djopenid') -- execfile(djinit, djopenid.__dict__) -+ with open(djinit) as f: -+ code = compile(f.read(), djinit, 'exec') -+ exec(code, djopenid.__dict__) - djopenid.__file__ = djinit - - # __path__ is the magic that makes child modules of the djopenid package -@@ -167,12 +169,12 @@ def django_tests(): - - try: - import django.test.simple -- except ImportError, e: -+ except ImportError as e: - warnings.warn("django.test.simple not found; " - "django examples not tested.") - return 0 - import djopenid.server.models, djopenid.consumer.models -- print "Testing Django examples:" -+ print ("Testing Django examples:") - - # These tests do get put in to a pyunit test suite, so we could run them - # with the other pyunit tests, but django also establishes a test database -@@ -193,7 +195,7 @@ def main(): - django_failures = django_tests() - - if other_failed: -- print 'Failures:', ', '.join(other_failed) -+ print ('Failures:', ', '.join(other_failed)) - - failed = (bool(other_failed) or - bool(not pyunit_result.wasSuccessful()) or diff --git a/python3-openid-3.0.2-cryptutil-bytes.patch b/python3-openid-3.0.2-cryptutil-bytes.patch deleted file mode 100644 index 7763beb..0000000 --- a/python3-openid-3.0.2-cryptutil-bytes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- python3-openid-3.0.2/openid/cryptutil.py.orig 2013-11-29 09:53:00.730273249 +0100 -+++ python3-openid-3.0.2/openid/cryptutil.py 2013-11-29 09:53:24.816217916 +0100 -@@ -101,8 +101,8 @@ else: - raise ValueError('This function only supports positive integers') - - bytes = long_to_bytes(l) -- if ord(bytes[0]) > 127: -- return '\x00' + bytes -+ if bytes[0] > 127: -+ return b'\x00' + bytes - else: - return bytes - -@@ -110,7 +110,7 @@ else: - if not bytes: - raise ValueError('Empty string passed to strToLong') - -- if ord(bytes[0]) > 127: -+ if bytes[0] > 127: - raise ValueError('This function only supports positive integers') - - return bytes_to_long(bytes) diff --git a/python3-openid-shebang.patch b/python3-openid-shebang.patch new file mode 100644 index 0000000..f8eaa9f --- /dev/null +++ b/python3-openid-shebang.patch @@ -0,0 +1,81 @@ +diff -rup python3-openid-3.0.6.orig/admin/runtests python3-openid-3.0.6/admin/runtests +--- python3-openid-3.0.6.orig/admin/runtests 2015-08-02 15:01:36.000000000 +0200 ++++ python3-openid-3.0.6/admin/runtests 2015-11-13 19:21:21.029852424 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import os.path, sys, warnings + + test_modules = [ +diff -rup python3-openid-3.0.6.orig/contrib/associate python3-openid-3.0.6/contrib/associate +--- python3-openid-3.0.6.orig/contrib/associate 2015-01-11 20:29:15.000000000 +0100 ++++ python3-openid-3.0.6/contrib/associate 2015-11-13 19:21:21.027852391 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Make an OpenID Assocition request against an endpoint + and print the results.""" + +diff -rup python3-openid-3.0.6.orig/contrib/openid-parse python3-openid-3.0.6/contrib/openid-parse +--- python3-openid-3.0.6.orig/contrib/openid-parse 2015-01-11 20:29:15.000000000 +0100 ++++ python3-openid-3.0.6/contrib/openid-parse 2015-11-13 19:21:21.028852407 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Grab URLs from the clipboard, interpret the queries as OpenID, and print. + + In addition to URLs, I also scan for queries as they appear in httpd log files, +diff -rup python3-openid-3.0.6.orig/contrib/upgrade-store-1.1-to-2.0 python3-openid-3.0.6/contrib/upgrade-store-1.1-to-2.0 +--- python3-openid-3.0.6.orig/contrib/upgrade-store-1.1-to-2.0 2015-08-02 15:57:09.000000000 +0200 ++++ python3-openid-3.0.6/contrib/upgrade-store-1.1-to-2.0 2015-11-13 19:21:21.028852407 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SQL Store Upgrade Script + # for version 1.x to 2.0 of the OpenID library. + # Doesn't depend on the openid library, so you can run this python +diff -rup python3-openid-3.0.6.orig/examples/consumer.py python3-openid-3.0.6/examples/consumer.py +--- python3-openid-3.0.6.orig/examples/consumer.py 2015-01-22 05:15:35.000000000 +0100 ++++ python3-openid-3.0.6/examples/consumer.py 2015-11-13 19:21:21.023852325 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + Simple example for an OpenID consumer. + +diff -rup python3-openid-3.0.6.orig/examples/discover python3-openid-3.0.6/examples/discover +--- python3-openid-3.0.6.orig/examples/discover 2015-01-11 20:29:15.000000000 +0100 ++++ python3-openid-3.0.6/examples/discover 2015-11-13 19:21:21.024852341 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from openid.consumer.discover import discover, DiscoveryFailure + from openid.fetchers import HTTPFetchingError + +diff -rup python3-openid-3.0.6.orig/examples/djopenid/manage.py python3-openid-3.0.6/examples/djopenid/manage.py +--- python3-openid-3.0.6.orig/examples/djopenid/manage.py 2015-01-11 20:29:15.000000000 +0100 ++++ python3-openid-3.0.6/examples/djopenid/manage.py 2015-11-13 19:21:21.024852341 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from django.core.management import execute_manager + try: + import settings # Assumed to be in the same directory. +diff -rup python3-openid-3.0.6.orig/examples/server.py python3-openid-3.0.6/examples/server.py +--- python3-openid-3.0.6.orig/examples/server.py 2015-01-22 05:15:35.000000000 +0100 ++++ python3-openid-3.0.6/examples/server.py 2015-11-13 19:21:21.027852391 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + __copyright__ = 'Copyright 2005-2008, Janrain, Inc.' + +diff -rup python3-openid-3.0.6.orig/openid/test/test_yadis_discover.py python3-openid-3.0.6/openid/test/test_yadis_discover.py +--- python3-openid-3.0.6.orig/openid/test/test_yadis_discover.py 2015-01-11 20:29:15.000000000 +0100 ++++ python3-openid-3.0.6/openid/test/test_yadis_discover.py 2015-11-13 19:21:21.021852292 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + """Tests for yadis.discover. + diff --git a/python3-openid.spec b/python3-openid.spec index 82cff24..8fd59dd 100644 --- a/python3-openid.spec +++ b/python3-openid.spec @@ -1,13 +1,12 @@ Name: python3-openid -Version: 3.0.5 -Release: 2%{?dist} +Version: 3.0.6 +Release: 1%{?dist} Summary: Python 3 port of the python-openid library Group: Development/Libraries License: ASL 2.0 URL: https://github.com/necaris/python3-openid Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz -Patch0: python3-openid-3.0.2-cryptutil-bytes.patch -Patch1: python3-openid-3.0.2-admin-runtests-python3.patch +Patch0: python3-openid-shebang.patch BuildArch: noarch @@ -24,8 +23,7 @@ including cleanups and updates to the code in general. %prep %setup -q -#%patch0 -p1 -b .cryptutil-bytes -%patch1 -p1 -b .admin-runtests-python3 +%patch0 -p 1 %build @@ -77,6 +75,9 @@ LC_ALL=en_US.UTF-8 %{__python3} admin/runtests %changelog +* Fri Nov 13 2015 Jakub Dorňák - 3.0.6-1 +- Update to version 3.0.6 + * Tue Nov 10 2015 Fedora Release Engineering - 3.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index a5f3fc8..8cdcff0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2451572f60cbd346390f929cd4188afd python3-openid-3.0.5.tar.gz +20f8024d333857eb4a3882528757f82f python3-openid-3.0.6.tar.gz