From 426c7b7374caadc1551916202e9230bbbeb58b87cb850317cc075fa8a95234b1 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 5 Feb 2025 02:22:36 +0000 Subject: [PATCH] - Actually drop BuildRequires on six. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=39 --- .gitattributes | 23 +++ .gitignore | 1 + PyICU-2.13.1.tar.gz | 3 + PyICU-2.14.tar.gz | 3 + python-PyICU.changes | 382 +++++++++++++++++++++++++++++++++++++++++++ python-PyICU.spec | 76 +++++++++ remove_six.patch | 293 +++++++++++++++++++++++++++++++++ 7 files changed, 781 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 PyICU-2.13.1.tar.gz create mode 100644 PyICU-2.14.tar.gz create mode 100644 python-PyICU.changes create mode 100644 python-PyICU.spec create mode 100644 remove_six.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/PyICU-2.13.1.tar.gz b/PyICU-2.13.1.tar.gz new file mode 100644 index 0000000..a9939ef --- /dev/null +++ b/PyICU-2.13.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4919085eaa07da12bade8ee721e7bbf7ade0151ca0f82946a26c8f4b98cdceb +size 262424 diff --git a/PyICU-2.14.tar.gz b/PyICU-2.14.tar.gz new file mode 100644 index 0000000..c7f4be0 --- /dev/null +++ b/PyICU-2.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acc7eb92bd5c554ed577249c6978450a4feda0aa6f01470152b3a7b382a02132 +size 263912 diff --git a/python-PyICU.changes b/python-PyICU.changes new file mode 100644 index 0000000..a59cacc --- /dev/null +++ b/python-PyICU.changes @@ -0,0 +1,382 @@ +------------------------------------------------------------------- +Wed Feb 5 02:22:25 UTC 2025 - Steve Kowalik + +- Actually drop BuildRequires on six. + +------------------------------------------------------------------- +Thu Nov 7 10:04:14 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 2.14 + * added wrappers for UCPMap.get|getRange and Char.getIntPropertyMap + * added wrapper for Locale.getUnicodeKeywordValue + * added wrapper for UnicodeString.remove, UnicodeString.removeBetween + * added wrapper for UnicodeString.retainBetween, UnicodeString.truncate + * fixed bogus UBool uses on stack instead of int (Martin Jansche) + * added support for ICU 76.1 + +------------------------------------------------------------------- +Fri Jun 14 08:14:34 UTC 2024 - Daniel Garcia + +- Update to 2.13.1: + - change c++11 to c++17 in setup.py as current versions of ICU require it +- 2.13 + - fixed build issues on Windows + - added wrappers for MeasureUnit(locale, width) and getUnitDisplayName() + - added wrappers for DateFormatSymbols.getEra|ZodiacNames() + - added wrappers for DateFormatSymbols.getZoneStrings() + - added wrappers for LocaleDisplayNames + - fixed bug dealloc calling wrong destructor on most types (Fredrik Roubert) + - added support for ICU 75.1 + - added wrappers for LocalizedNumber|Range|Formatter.withoutLocale() + - added wrappers for UIdentifierType, Char.hasIDType(), Char.getIDTypes() + - added wrappers for UIdentifierStatus + - added wrappers for UProperty.IDENTIFIER_TYPE, UProperty.IDENTIFIER_STATUS + +------------------------------------------------------------------- +Mon Dec 18 14:06:00 UTC 2023 - Dirk Müller + +- update to 2.12: + * fixed bug in RegexMatcher.reset() not retaining ownership + of string + - added wrappers for TimeZoneNames class + - added wrapper for TimeZone.getIanaID() + - added wrapper for + * added support for ICU 74.1 + +------------------------------------------------------------------- +Thu Jun 29 07:13:31 UTC 2023 - Andreas Schneider + +- Disable testTransition on Leap +- Fix position of sle15_python_module_pythons + +------------------------------------------------------------------- +Sun Jun 25 19:30:35 UTC 2023 - Matej Cepl + +- Clean up SPEC file. +- Add remove_six.patch which removes the need to use six. + +------------------------------------------------------------------- +Sun Jun 25 07:21:50 UTC 2023 - Andreas Schneider + +- Update to version 2.11 + * fixed bug PluralFormat.format accepting python strings, which are immutable + * fixed bug with UWordBreak wrapping wrong enum (UBreakIteratorType) + * added wrappers for UBreakIteratorType, ULine|SentenceBreakTag + * added wrappers for DateTimePatternGenerator::set|getDateTimeFormat() + * added wrappers for Precision::incrementExact() + * Locale objects can now be sorted (Fredrik Roubert) + * added wrapper for Calendar::inTemporalLeapYear() + * added wrappers for Calendar::get|getTemporalMonthCode() + * changed all Calendar setters to return self instead of None, setter chaining +- Use sle15_python_module_pythons + +------------------------------------------------------------------- +Thu Oct 27 10:57:22 UTC 2022 - Markéta Machová + +- update to version 2.10.2 + * added support for ICU 72.1 + * fixed bug in logic computing max_char for PyUnicode_New() + * added some wrappers + +------------------------------------------------------------------- +Wed Apr 13 14:40:40 UTC 2022 - Callum Farmer + +- update to version 2.9: + - deleted long deprecated PyICU.py file + - moved icu python module sources into py directory + - renamed _icu extension module to _icu_ and moved it into icu module + - added UNumberTrailingZeroDisplay, Precision.trailingZeroDisplay() + - added UNumberRoundingPriority, FractionPrecision.withSignificantDigits() + - added wrappers for UMeasurePrefix, MeasureUnit.withPrefix()|getPrefix() + - added support for ICU 71.1 + +------------------------------------------------------------------- +Thu Nov 11 15:44:28 UTC 2021 - Callum Farmer + +- updated to version 2.8: + - fixed test failure in test_DateTimeParserGenerator.py with version 70.1rc + - added wrappers for UCurrNameStyle and for ucurr_getName() onto CurrencyUnit + - added support for ICU 70.1 + - added FieldPosition-less overloads to RuleBasedNumberFormat.format() + - added pyproject.toml file to (also) build via python -m build + +------------------------------------------------------------------- +Mon Nov 8 10:34:34 UTC 2021 - Dirk Müller + +- add missing six declaration for testsuite + +------------------------------------------------------------------- +Mon Aug 16 07:51:00 UTC 2021 - Axel Braun + +- %pytest_arch added to fix Leap test issues + +------------------------------------------------------------------- +Fri Aug 13 17:36:21 UTC 2021 - Axel Braun + +- 2.7.4 + - added wrappers for UWordBreak and BreakIterator.getRuleStatusVec() + - added wrappers for MessagePattern (Roman Kalukiewicz) + - added wrapper for Collator::getKeywordValuesForLocale + - added wrappers for LocaleMatcher.acceptLanguage|FromHTTP() + - worked around limitation of Visual Studio 2017 (cgohlke) + - added missing test and samples files to distribution (foutrelis) + - added some tests for TimeZone classes + - fixed bug w/FormattedNumberRange.getFirst|SecondDecimal() gone w/ ICU 68.1+ + - fixed bug with VTimeZone.write() wrapper invoking VTimeZone.writeSimple() + - added wrapper for Locale.canonicalize() + - added wrappers for MeasureUnit.product(), reciprocal(), getDimensionality() + - added wrapper for MeasureUnit.forIdentifier() + - implemented *, /, **, 1/m for MeasureUnit in terms of product and reciprocal + - added wrappers for BasicTimeZone, RuleBasedTimeZone, VTimeZone + - added wrappers for TimeZoneTransition, TimeZoneRule and its subclasses + - added wrappers for DateTimeRule, DateRuleType, TimeRuleType + - added support for ICU 69.1 (support-icu-69.patch reomoved) + +------------------------------------------------------------------- +Wed Apr 28 08:06:12 UTC 2021 - Steve Kowalik + +- Add patch support-icu-69.patch: + * Support ICU 69 + +------------------------------------------------------------------- +Mon Dec 14 16:27:25 UTC 2020 - Callum Farmer + +- update to 2.6 + * fix build with ICU 68 + +------------------------------------------------------------------- +Fri Mar 27 09:06:35 UTC 2020 - Marketa Calabkova + +- update to 2.4.3 + * added Char.getPropertyValueName() and Char.getPropertyValueEnum() + * fixed build errors with PythonReplaceable for ICU < 55 + +------------------------------------------------------------------- +Wed Jan 15 11:35:02 UTC 2020 - Marketa Calabkova + +- update to 2.4.2 + * fixed build issues with ICU < 59 + * lots of small fixes + +------------------------------------------------------------------- +Mon Apr 29 08:05:27 UTC 2019 - Tomáš Chvátal + +- Update to 2.3.1: + * fixed build error with ICU 61, ICU 62 + +------------------------------------------------------------------- +Mon Apr 1 13:03:06 UTC 2019 - Tomáš Chvátal + +- Update to 2.3: + - added support for also trying pkg-config for build configuration (Linux) + - fixed compilation issue in collator.cpp when not using c++11 (and icu < 60) + - added support for ICU 64.1 + - filled out wrappers for missing NumberFormatter methods and classes + +------------------------------------------------------------------- +Thu Nov 1 09:00:57 UTC 2018 - Tomáš Chvátal + +- Version update to 2.2: + * Many fixes to build well with newest ICU releases +- Drop not really needed service +- Cleanup with spec-cleaner + +------------------------------------------------------------------- +Wed Jan 24 09:34:53 UTC 2018 - mlin@suse.com + +- Update to 2.0.2 + * Added wrappers for Region class and URegionType enum + * Added wrappers for MeasureFormat.formatMeasure and formatMeasurePerUnit + * Fixed build error with ICU < 53 +- Update the URL +- Removed unneed python-PyICU-1.9.7-quote_Version.patch +- Running test on python3 only, upstream has problem with running test on + python2, upstream issue #61 + +------------------------------------------------------------------- +Wed Jan 24 09:34:20 UTC 2018 - mlin@suse.com + +- Update to 2.0.1 + * Made Measure wrapper abstract when building with ICU < 53.1 + * str(Measure) uses NumberFormatter when available + +------------------------------------------------------------------- +Wed Jan 24 09:32:56 UTC 2018 - mlin@suse.com + +- Update to 2.0.0 + * Use icu-config for configuring compiler and linker (Constantine Peresypkin) + * Added wrappers for UBidiPairedBracketType enum + * Added wrappers for UWordBreakValues enum + * Added wrappers for UJoiningGroup enum + * Added wrappers for 120+ MeasureUnit static factory methods + * Added wrapper for NoUnit class + * Added wrapper for TimeUnit class + * Added missing Measure constructor(Formattable or number, MeasureUnit) + * Added wrappers for NumberFormatter and related classes and enums, and tests + * Added wrapper for SimpleFormatter and tests + * Fixed bugs in test_LocaleData.py using undefined values (Fredrik Roubert) + * Added wrapper for UMemory and made it UObject's base + * Removed unused docs.py + +------------------------------------------------------------------- +Wed Jan 24 09:30:17 UTC 2018 - mlin@suse.com + +- Update to 1.9.8 + * Fixed bugs in "UnicodeString as sequence"; it's a sequence of 16-bit UChar + * Added support for ICU 60.1 + +------------------------------------------------------------------- +Thu Jun 8 14:48:36 UTC 2017 - okurz@suse.com + +- Update to 1.9.7 + * Remove dependency on deprecated and removed ICU LayoutEngine + +------------------------------------------------------------------- +Tue May 12 07:54:33 UTC 2015 - lazy.kent@opensuse.org + +- Update to 1.9.2 (excluding openSUSE 11.4). + * Added MANIFEST.in to ensure nothing's missing in the 'sdist' + package. + * Enabled -Wwrite-strings and fixed warnings. + * Added missing conditionals around uses of features in newer ICU + versions. +- Changes in 1.9. + * Fixed utf-8 conversion error position reporting. + * Fixed delete/delete[] bug in common.cpp. + * Added support for ICU 54.1 and ICU 55.1. + * Replaced UnicodeString idna methods with new uidna.h UTS #46 + wrapper (55.1). + * Added wrapper for Char functions and related enums (from + * uchar.h). + * Added wrapper for Shape defines and shapeArabic() (from + ushape.h). + * Added wrapper for RelativeDateTimeFormatter. +- Drop the source and the patch for openSUSE 12.3. + +------------------------------------------------------------------- +Sat Aug 2 15:37:37 UTC 2014 - lazy.kent@opensuse.org + +- Update to 1.8 (excluding openSUSE 11.4 and 12.3). + * Added wrapper for Locale::getRoot(). + * Added tp_hash implemention for Locale type based on + Locale::hashCode(). + * Fixed bug 13112. + * Added support for building with PyPy. + * Added Locale(lcid) constructor calling uloc_getLocaleForLCID(). + * Added wrapper for CompactDecimalFormat and its createInstance() + method. +- Changes in 1.7. + * Added missing #include for . + * Fixed issues building against ICU 4.2. + * Added wrapper for Script.isRightToLeft(). + * Added support for ICU 53.1. + * Added wrappers for other Script functions introduced in ICU 51. +- Changes in 1.6. + * Removed wrappers for some layoutengine.cpp internal flags. + * Added wrappers for ULocaleData functions. + * Added wrappers for uscript functions and UScriptCode enum. + * Added support for ICU 52.1. + * Added wrapper for Locale::setKeywordValue(). + * Added Locale::removeKeywordValue(). + * Added support for ListFormatter. +- Change BuildRequires: python-distribute -> python-setuptools. + +------------------------------------------------------------------- +Fri Mar 15 08:07:37 UTC 2013 - lazy.kent@opensuse.org + +- Update to 1.5 (excluding openSUSE 11.4 and 12.1). + * Added wrapper for MessageFormat::format(argumentNames, + arguments, ...). + * Fixed bug in t_transliterator_filteredTransliterate passing + UBool for int. + * Added wrapper for DateFormat::format(Calendar). + * Added wrapper for Calendar::set(UCalendarDateFields field, + value). + * Added wrappers for UnicodeString::toTitle() w/o iterator. + * Added support for ICU 50.1. + * Improved test_Collator's testGetSortKey(). + * Added pypi classifiers to PyICU project info. +- Use pkgconfig(*) as build dependencies. +- Don't use "--record-rpm" during install; add to %files section. + +------------------------------------------------------------------- +Wed Jul 18 08:38:02 UTC 2012 - lazy.kent@opensuse.org + +- Fix suse_version for Factory (12.3). + +------------------------------------------------------------------- +Wed Apr 18 05:07:42 UTC 2012 - lazy.kent@opensuse.org + +- Update to 1.4. + * Added support for ICU 49.1.1. + * Added ScriptCode constants new in 49.0. + * Implemented wrapper for new NumberFormat.parseCurrency(). + * Added wrapper for Transliterator::toRules(). + * Added missing wrapper for + RuleBasedNumberFormat(URBNFRuleSetTag, Locale). + * Fixed bugs. +- Changes in 1.3. + * Added support for ICU 4.8.1.1. + * PyICU ready for Python 3.2. + * Added support for LEFontInstance and LayoutEngine. + * Fixed bugs. +- Refresh "quote_Version" patch. +- Run tests. +- Patch to fix running tests in openSUSE 11.4. + +------------------------------------------------------------------- +Wed Nov 9 18:54:32 UTC 2011 - lazy.kent@opensuse.org + +- Build reqiures python-setuptools or python-distribute (for + openSUSE >= 12.1). +- spec clean up. + +------------------------------------------------------------------- +Wed Sep 21 14:22:37 UTC 2011 - lazy.kent@opensuse.org + +- Update to 1.2. + * Fixed bugs. +- Dropped "linux3" patch (no need any more). +- Removed obsolete "clean" section and Authors from spec. + +------------------------------------------------------------------- +Sat Jul 23 12:13:08 UTC 2011 - lazy.kent@opensuse.org + +- Patch to fix compilation on linux3 platform. +- Use python-setuptools. +- Added LICENSE to docs. + +------------------------------------------------------------------- +Mon May 30 18:32:32 UTC 2011 - lazy.kent@opensuse.org + +- Renamed to python-PyICU. + +------------------------------------------------------------------- +Sat May 28 13:38:50 UTC 2011 - lazy.kent@opensuse.org + +- Update to 1.1. +- Dropped undefine_DATE patch. +- Refresh quote_Version patch. +- Provides PyICU. + +------------------------------------------------------------------- +Thu Feb 17 13:15:31 CET 2011 - pth@suse.de + +- pyconfig.h defines DATE which breaks ICU's calendar.h +- Fix quoting of PYICU_VER. + +------------------------------------------------------------------- +Sun Oct 17 11:52:49 UTC 2010 - lazy.kent.suse@gmail.com + +- Update to 1.0.1. + +------------------------------------------------------------------- +Sat Sep 25 20:20:13 UTC 2010 - lazy.kent.suse@gmail.com + +- Update to 1.0. + +------------------------------------------------------------------- +Tue Apr 6 19:28:36 UTC 2010 - lazy.kent.suse@gmail.com + +- Initial package created. + diff --git a/python-PyICU.spec b/python-PyICU.spec new file mode 100644 index 0000000..1e6449e --- /dev/null +++ b/python-PyICU.spec @@ -0,0 +1,76 @@ +# +# spec file for package python-PyICU +# +# Copyright (c) 2025 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%{?sle15_python_module_pythons} +%global modname PyICU +Name: python-%{modname} +Version: 2.14 +Release: 0 +Summary: Python Extension Wrapping the ICU C++ API +License: MIT +URL: https://gitlab.pyicu.org +Source0: https://files.pythonhosted.org/packages/source/P/PyICU/PyICU-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM remove_six.patch mcepl@suse.com +# Remove dependency on six +Patch0: remove_six.patch +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: python-rpm-macros +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(icu-uc) +Provides: %{modname} = %{version} +Provides: python-ICU = %{version} +Obsoletes: python-ICU < 1.2 +%python_subpackages + +%description +Python extension wrapping IBM's International Components for Unicode C++ +library (ICU). + +%prep +%autosetup -p1 -n pyicu-%{version} + +%build +export CXXFLAGS="%{optflags} -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" +%pyproject_wheel + +%install +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} + +%check +%if 0%{?sle_version} && 0%{?sle_version} <= 150500 +# The timezone package is not up to date +%pytest_arch -v -k 'not (testAcceptLanguage or testAcceptLanguageFromHTTP or testTransition)' -rs test +%else +%pytest_arch -v -k 'not (testAcceptLanguage or testAcceptLanguageFromHTTP)' -rs test +%endif + +%files %{python_files} +%license LICENSE +%doc CHANGES CREDITS README.md +%{python_sitearch}/icu +%{python_sitearch}/PyICU-%{version}.dist-info + +%changelog diff --git a/remove_six.patch b/remove_six.patch new file mode 100644 index 0000000..f442c97 --- /dev/null +++ b/remove_six.patch @@ -0,0 +1,293 @@ +--- + setup.py | 7 +++---- + test/test_BytesTrie.py | 2 +- + test/test_Charset.py | 4 ++-- + test/test_Collator.py | 4 ++-- + test/test_LayoutEngine.py | 2 +- + test/test_Locale.py | 2 +- + test/test_LocaleData.py | 14 +++++++------- + test/test_LocaleMatcher.py | 2 +- + test/test_PythonReplaceable.py | 2 +- + test/test_Script.py | 8 ++++---- + test/test_TimeZone.py | 2 +- + test/test_Transliterator.py | 4 ++-- + test/test_UCharsTrie.py | 2 +- + 13 files changed, 27 insertions(+), 28 deletions(-) + +Index: pyicu-2.13.1/setup.py +=================================================================== +--- pyicu-2.13.1.orig/setup.py ++++ pyicu-2.13.1/setup.py +@@ -1,4 +1,3 @@ +- + import os, sys + + try: +@@ -195,7 +194,7 @@ else: + except: + if not _cflags: + raise RuntimeError(''' +-Please install pkg-config on your system or set the PYICU_CFLAGS environment ++Please install pkg-config on your system or set the PYICU_CFLAGS environment + variable to the flags required by the C++ compiler to find the header files + for ICU, and possibly -std=c++11 if using ICU version >= 60 or -std=c++17 if using ICU version >= 75 + ''') +@@ -234,7 +233,7 @@ else: + Please install pkg-config on your system or set the PYICU_LFLAGS environment + variable to the flags required by the linker to find the libraries for ICU + ''') +- ++ + + if 'PYICU_LIBRARIES' in os.environ: + _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep) +@@ -283,4 +282,4 @@ setup(name="PyICU", + libraries=_libraries)], + package_dir={"": "py"}, + packages=['icu'], +- tests_require=['pytest', 'six']) ++ tests_require=['pytest']) +Index: pyicu-2.13.1/test/test_BytesTrie.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_BytesTrie.py ++++ pyicu-2.13.1/test/test_BytesTrie.py +@@ -21,7 +21,7 @@ + # DEALINGS IN THE SOFTWARE. + # ==================================================================== + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +Index: pyicu-2.13.1/test/test_Charset.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Charset.py ++++ pyicu-2.13.1/test/test_Charset.py +@@ -21,7 +21,7 @@ + # ==================================================================== + # + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +@@ -59,7 +59,7 @@ class TestCharset(TestCase): + def testUnicode(self): + + bytes = u'beaut\xe9 probable'.encode('iso-8859-1') +- ustring = six.text_type(CharsetDetector(bytes).detect()) ++ ustring = str(CharsetDetector(bytes).detect()) + + self.assertTrue(ustring.encode('iso-8859-1') == bytes) + +Index: pyicu-2.13.1/test/test_Collator.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Collator.py ++++ pyicu-2.13.1/test/test_Collator.py +@@ -21,7 +21,7 @@ + # ==================================================================== + # + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +@@ -44,7 +44,7 @@ class TestCollator(TestCase): + + collator = Collator.createInstance(Locale.getFrance()) + input = open(self.filePath('noms.txt'), 'rb') +- names = [six.text_type(n.strip(), 'utf-8') for n in input.readlines()] ++ names = [str(n.strip(), 'utf-8') for n in input.readlines()] + input.close() + ecole = names[0] + +Index: pyicu-2.13.1/test/test_LayoutEngine.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_LayoutEngine.py ++++ pyicu-2.13.1/test/test_LayoutEngine.py +@@ -22,7 +22,7 @@ + # ==================================================================== + # + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +Index: pyicu-2.13.1/test/test_Locale.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Locale.py ++++ pyicu-2.13.1/test/test_Locale.py +@@ -21,7 +21,7 @@ + # DEALINGS IN THE SOFTWARE. + # ==================================================================== + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +Index: pyicu-2.13.1/test/test_LocaleData.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_LocaleData.py ++++ pyicu-2.13.1/test/test_LocaleData.py +@@ -22,7 +22,7 @@ + # + # This is a python translation of ICU's LocaleDataTest.java + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +@@ -110,8 +110,8 @@ class TestLocaleData(TestCase): + break + if existsInScript == False: + print_output("ExemplarSet containment failed for locale : "+ locale) +- print_output(locale + " exemplar " + repr(six.text_type(exemplarSets[0]))) +- print_output(locale + " exemplar(case-folded) " + repr(six.text_type(exemplarSets[1]))) ++ print_output(locale + " exemplar " + repr(str(exemplarSets[0]))) ++ print_output(locale + " exemplar(case-folded) " + repr(str(exemplarSets[1]))) + self.assertTrue(locale + " case-folded is a superset", exemplarSets[1].containsAll(exemplarSets[0])) + if (exemplarSets[1] == exemplarSets[0]): + ++equalCount +@@ -156,10 +156,10 @@ class TestLocaleData(TestCase): + if existsInScript == False and h == 0: + print_output("ExemplarSet containment failed for locale,option,type : " \ + + locale + "," + str(option) + "," + str(esType)) +- print_output(locale + " exemplar(ES_STANDARD)" + repr(six.text_type(exemplarSets[0]))) +- print_output(locale + " exemplar(ES_AUXILIARY)" + repr(six.text_type(exemplarSets[1]))) +- print_output(locale + " exemplar(case-folded,ES_STANDARD)" + repr(six.text_type(exemplarSets[2]))) +- print_output(locale + " exemplar(case-folded,ES_AUXILIARY)" + repr(six.text_type(exemplarSets[3]))) ++ print_output(locale + " exemplar(ES_STANDARD)" + repr(str(exemplarSets[0]))) ++ print_output(locale + " exemplar(ES_AUXILIARY)" + repr(str(exemplarSets[1]))) ++ print_output(locale + " exemplar(case-folded,ES_STANDARD)" + repr(str(exemplarSets[2]))) ++ print_output(locale + " exemplar(case-folded,ES_AUXILIARY)" + repr(str(exemplarSets[3]))) + self.assertTrue(locale + " case-folded is a superset", exemplarSets[2].containsAll(exemplarSets[0])) + self.assertTrue(locale + " case-folder is a superset", exemplarSets[3].containsAll(exemplarSets[1])) + if (exemplarSets[2] == exemplarSets[0]): +Index: pyicu-2.13.1/test/test_LocaleMatcher.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_LocaleMatcher.py ++++ pyicu-2.13.1/test/test_LocaleMatcher.py +@@ -21,7 +21,7 @@ + # DEALINGS IN THE SOFTWARE. + # ==================================================================== + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main, SkipTest + from icu import * +Index: pyicu-2.13.1/test/test_PythonReplaceable.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_PythonReplaceable.py ++++ pyicu-2.13.1/test/test_PythonReplaceable.py +@@ -21,7 +21,7 @@ + # DEALINGS IN THE SOFTWARE. + # ==================================================================== + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +Index: pyicu-2.13.1/test/test_Script.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Script.py ++++ pyicu-2.13.1/test/test_Script.py +@@ -21,7 +21,7 @@ + # ==================================================================== + # + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +@@ -53,7 +53,7 @@ class TestScript(TestCase): + + # iterating codepoints not UChar + names = [Script.getScript(cp).getShortName() +- for cp in six.text_type(pairs)] ++ for cp in str(pairs)] + if unicode_32bit: + self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names) + else: +@@ -83,10 +83,10 @@ class TestScript(TestCase): + self.assertEqual(str(u), char) + elif is_unicode_32bit(): + self.assertEqual(len(char), 1) +- self.assertEqual(six.text_type(u), char) ++ self.assertEqual(str(u), char) + else: + self.assertEqual(len(char), 2) +- self.assertEqual(six.text_type(u), char) ++ self.assertEqual(str(u), char) + + if __name__ == "__main__": + main() +Index: pyicu-2.13.1/test/test_TimeZone.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_TimeZone.py ++++ pyicu-2.13.1/test/test_TimeZone.py +@@ -21,7 +21,7 @@ + # ==================================================================== + # + +-import sys, os, six, datetime ++import sys, os, datetime + + from unittest import TestCase, main + from icu import * +Index: pyicu-2.13.1/test/test_Transliterator.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Transliterator.py ++++ pyicu-2.13.1/test/test_Transliterator.py +@@ -22,7 +22,7 @@ + # ==================================================================== + # + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +@@ -50,7 +50,7 @@ class TestTransliterator(TestCase): + string = UnicodeString("Shang4hai3 zi4lai2shui3 lai2 zi4 hai3 shang4") + result = u'Sh\xe0ngh\u01cei z\xecl\xe1ishu\u01d0 l\xe1i z\xec h\u01cei sh\xe0ng' + +- self.assertTrue(trans.transliterate(six.text_type(string)) == result) ++ self.assertTrue(trans.transliterate(str(string)) == result) + self.assertTrue(trans.transliterate(string) == result) + self.assertTrue(string == result) + +Index: pyicu-2.13.1/test/test_UCharsTrie.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_UCharsTrie.py ++++ pyicu-2.13.1/test/test_UCharsTrie.py +@@ -21,7 +21,7 @@ + # DEALINGS IN THE SOFTWARE. + # ==================================================================== + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import * +Index: pyicu-2.13.1/test/test_Regex.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Regex.py ++++ pyicu-2.13.1/test/test_Regex.py +@@ -21,7 +21,7 @@ + # DEALINGS IN THE SOFTWARE. + # ==================================================================== + +-import sys, os, six ++import sys, os + + from unittest import TestCase, main + from icu import *