commit: 7cdc97745c39085335b99ea0aab44029911ed4bd Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> AuthorDate: Thu Jun 9 13:39:32 2016 +0000 Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> CommitDate: Thu Jun 9 13:39:32 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=7cdc9774
dev-python/speaklater: drop obsolete dev-python/speaklater/Manifest | 1 - .../files/speaklater-1.3-python-3.x.patch | 164 --------------------- dev-python/speaklater/metadata.xml | 12 -- dev-python/speaklater/speaklater-1.3-r2.ebuild | 26 ---- 4 files changed, 203 deletions(-) diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest deleted file mode 100644 index fbf9617..0000000 --- a/dev-python/speaklater/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST speaklater-1.3.tar.gz 3582 SHA256 59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef WHIRLPOOL 9e9edc0f6b9943f515eb36a13b038402e4093dfeb302f856858000ce87316508d31aafaf85e67e332b8bdfccec518912d87c61b3e45c930bd22bafc3dae8e1f9 diff --git a/dev-python/speaklater/files/speaklater-1.3-python-3.x.patch b/dev-python/speaklater/files/speaklater-1.3-python-3.x.patch deleted file mode 100644 index a1997f8..0000000 --- a/dev-python/speaklater/files/speaklater-1.3-python-3.x.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 62dd88ee0f8f39902e3950544dc02e28af5d2a2c Mon Sep 17 00:00:00 2001 -From: Thomas Waldmann <[email protected]> -Date: Sun, 2 Jun 2013 04:01:37 +0200 -Subject: [PATCH] port to python 3.3 (and also support 2.6 / 2.7) - -added 3.3 to tox, py3 classifiers to setup.py -added some compatibility wrappers -adapted doctests so they work the same way on py2 and py3 -changed __repr__ so it gives the same on py2 and py3 (no "u" on py2) ---- - setup.py | 2 ++ - speaklater.py | 65 ++++++++++++++++++++++++++++++++++++++++++----------------- - tox.ini | 2 +- - 3 files changed, 49 insertions(+), 20 deletions(-) - -diff --git a/speaklater.py b/speaklater.py -index 67a4dc5..d14f819 100644 ---- a/speaklater.py -+++ b/speaklater.py -@@ -12,24 +12,24 @@ - - Example: - -- >>> from speaklater import make_lazy_string -+ >>> from speaklater import make_lazy_string, text_type - >>> sval = u'Hello World' - >>> string = make_lazy_string(lambda: sval) - - This lazy string will evaluate to the value of the `sval` variable. - - >>> string -- lu'Hello World' -- >>> unicode(string) -- u'Hello World' -- >>> string.upper() -- u'HELLO WORLD' -+ l'Hello World' -+ >>> text_type(string) == u'Hello World' -+ True -+ >>> string.upper() == u'HELLO WORLD' -+ True - - If you change the value, the lazy string will change as well: - - >>> sval = u'Hallo Welt' -- >>> string.upper() -- u'HALLO WELT' -+ >>> string.upper() == u'HALLO WELT' -+ True - - This is especially handy when combined with a thread local and gettext - translations or dicts of translatable strings: -@@ -40,10 +40,10 @@ - >>> l.translations = {u'Yes': 'Ja'} - >>> lazy_gettext = make_lazy_gettext(lambda: l.translations.get) - >>> yes = lazy_gettext(u'Yes') -- >>> print yes -+ >>> print(yes) - Ja - >>> l.translations[u'Yes'] = u'Si' -- >>> print yes -+ >>> print(yes) - Si - - Lazy strings are no real strings so if you pass this sort of string to -@@ -59,6 +59,9 @@ - >>> is_lazy_string(yes) - True - -+ New in version 1.4: python >= 3.3 (and also 2.6 and 2.7) support, -+ repr(lazystring) is l"foo" on py2 and py3 - no "u" on py2! -+ - New in version 1.2: It's now also possible to pass keyword arguments to - the callback used with `make_lazy_string`. - -@@ -66,6 +69,28 @@ - :license: BSD, see LICENSE for more details. - """ - -+import sys -+ -+PY2 = sys.version_info[0] == 2 -+_identity = lambda x: x -+ -+if not PY2: -+ text_type = str -+ implements_to_string = _identity -+ implements_bool = _identity -+else: -+ text_type = unicode -+ -+ def implements_to_string(cls): -+ cls.__unicode__ = cls.__str__ -+ cls.__str__ = lambda x: x.__unicode__().encode('utf-8') -+ return cls -+ -+ def implements_bool(cls): -+ cls.__nonzero__ = cls.__bool__ -+ del cls.__bool__ -+ return cls -+ - - def is_lazy_string(obj): - """Checks if the given object is a lazy string.""" -@@ -87,10 +112,10 @@ def make_lazy_gettext(lookup_func): - >>> lazy_gettext = make_lazy_gettext(lambda: translations.get) - >>> x = lazy_gettext(u'Yes') - >>> x -- lu'Ja' -+ l'Ja' - >>> translations[u'Yes'] = u'Si' - >>> x -- lu'Si' -+ l'Si' - """ - def lazy_gettext(string): - if is_lazy_string(string): -@@ -99,6 +124,8 @@ def lazy_gettext(string): - return lazy_gettext - - -+@implements_bool -+@implements_to_string - class _LazyString(object): - """Class for strings created by a function call. - -@@ -117,11 +144,11 @@ def __init__(self, func, args, kwargs): - def __contains__(self, key): - return key in self.value - -- def __nonzero__(self): -+ def __bool__(self): - return bool(self.value) - - def __dir__(self): -- return dir(unicode) -+ return dir(text_type) - - def __iter__(self): - return iter(self.value) -@@ -130,10 +157,7 @@ def __len__(self): - return len(self.value) - - def __str__(self): -- return str(self.value) -- -- def __unicode__(self): -- return unicode(self.value) -+ return text_type(self.value) - - def __add__(self, other): - return self.value + other -@@ -190,7 +214,10 @@ def __copy__(self): - - def __repr__(self): - try: -- return 'l' + repr(self.value) -+ r = repr(self.value) -+ if PY2 and r.startswith('u'): -+ r = r[1:] # make it look same as on py3 -+ return 'l' + r - except Exception: - return '<%s broken>' % self.__class__.__name__ - diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml deleted file mode 100644 index 28a065d..0000000 --- a/dev-python/speaklater/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Python</name> - </maintainer> - <upstream> - <remote-id type="pypi">speaklater</remote-id> - <remote-id type="github">mitsuhiko/speaklater</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/speaklater/speaklater-1.3-r2.ebuild b/dev-python/speaklater/speaklater-1.3-r2.ebuild deleted file mode 100644 index b8333fb..0000000 --- a/dev-python/speaklater/speaklater-1.3-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) -inherit distutils-r1 - -DESCRIPTION="Lazy strings for Python" -HOMEPAGE="https://github.com/mitsuhiko/speaklater"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -PATCHES=( "${FILESDIR}/${P}-python-3.x.patch" ) - -python_test() { - "${PYTHON}" -m doctest speaklater.py || die "Tests failed with ${EPYTHON}" -}
