September 2017 - openSUSE Commits - openSUSE Mailing Lists

commit bcel for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package bcel for openSUSE:Factory checked in at 2017-09-29 11:54:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcel (Old) and /work/SRC/openSUSE:Factory/.bcel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bcel" Fri Sep 29 11:54:32 2017 rev:26 rq:529838 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bcel/bcel.changes 2017-05-31 13:31:53.590169379 +0200 +++ /work/SRC/openSUSE:Factory/.bcel.new/bcel.changes 2017-09-29 11:54:35.505525445 +0200 @@ -1,0 +2,9 @@ +Wed Sep 27 17:05:58 UTC 2017 - fstrba(a)suse.com + +- Allow building with any java-devel provider +- Specify java source and target level 1.6 to fix build with jdk9 +- Added patch: + * bcel-5.2-encoding.patch + + specify the correct encoding of the files + +------------------------------------------------------------------- New: ---- bcel-5.2-encoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcel.spec ++++++ --- /var/tmp/diff_new_pack.kOQJ8Z/_old 2017-09-29 11:54:36.201427316 +0200 +++ /var/tmp/diff_new_pack.kOQJ8Z/_new 2017-09-29 11:54:36.205426752 +0200 @@ -26,20 +26,18 @@ Source0: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.g… Source2: bcel.keyring +Patch0: bcel-5.2-encoding.patch BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: regexp -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 -#!BuildIgnore: xml-commons-jaxp-1.3-apis -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel -#!BuildIgnore: java-9-openjdk java-9-openjdk-devel -#!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xerces-j2-bootstrap +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis +#!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver Requires: regexp -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -66,6 +64,7 @@ %prep %setup -q +%patch0 -p1 # remove all binary libs find . -name "*.jar" -exec rm -f {} \; # very broken build @@ -75,8 +74,14 @@ %build export CLASSPATH=%(build-classpath regexp) export OPT_JAR_LIST="ant/ant-nodeps" -ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile -ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar +ant \ + -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \ + -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \ + compile +ant \ + -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \ + -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \ + jar %install # jars @@ -85,7 +90,6 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done) %files -%defattr(0644,root,root,0755) %doc LICENSE.txt %{_javadir}/* ++++++ bcel-5.2-encoding.patch ++++++ --- bcel-5.2/build.xml 2017-09-27 18:59:57.110434113 +0200 +++ bcel-5.2/build.xml 2017-09-27 19:00:39.286692143 +0200 @@ -39,7 +39,7 @@ <target name="compile" description="o Compile the code" depends="get-deps"> <mkdir dir="${classesdir}"> </mkdir> - <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" encoding="ISO-8859-1" excludes="**/package.html"> <src> <pathelement location="src/java"> </pathelement>

1 0

commit libatasmart for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package libatasmart for openSUSE:Factory checked in at 2017-09-29 11:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libatasmart (Old) and /work/SRC/openSUSE:Factory/.libatasmart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libatasmart" Fri Sep 29 11:54:13 2017 rev:22 rq:529156 version:0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/libatasmart/libatasmart.changes 2016-05-05 13:18:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libatasmart.new/libatasmart.changes 2017-09-29 11:54:14.576476648 +0200 @@ -1,0 +2,6 @@ +Wed Sep 13 18:45:50 UTC 2017 - zaitor(a)opensuse.org + +- Add libatasmart-0.19-wd-fix.patch: Fix issue with WD drives. + Fixes fdo#61998. + +------------------------------------------------------------------- New: ---- libatasmart-0.19-wd-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libatasmart.spec ++++++ --- /var/tmp/diff_new_pack.11EIZY/_old 2017-09-29 11:54:15.216386414 +0200 +++ /var/tmp/diff_new_pack.11EIZY/_new 2017-09-29 11:54:15.220385850 +0200 @@ -24,6 +24,7 @@ Group: System/Libraries Url: http://git.0pointer.net/libatasmart.git/ Source: http://0pointer.de/public/%{name}-%{version}.tar.xz +Patch0: libatasmart-0.19-wd-fix.patch BuildRequires: libudev-devel BuildRequires: pkgconfig @@ -75,6 +76,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --disable-static ++++++ libatasmart-0.19-wd-fix.patch ++++++ Author: Phillip Susi <psusi(a)ubuntu.com> Subject: fix an incorrect IO error reading SMART status Description: The read SMART status command's return status was testing for a success/failure value that included 8 bits that are "N/A" according to the standard, and required that they be zeros. At least some drives do not fill them with zeros, so correct this by masking off the undefined bits. Index: b/atasmart.c =================================================================== --- a/atasmart.c +++ b/atasmart.c @@ -925,10 +925,10 @@ /* SAT/USB bridges truncate packets, so we only check for 4F, * not for 2C on those */ if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x00C2U)) && - cmd[4] == htons(0x4F00U)) + (cmd[4] & htons(0xFF00U)) == htons(0x4F00U)) *good = TRUE; else if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x002CU)) && - cmd[4] == htons(0xF400U)) + (cmd[4] & htons(0xFF00U)) == htons(0xF400U)) *good = FALSE; else { errno = EIO;

1 0

commit gdm for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2017-09-29 11:54:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdm" Fri Sep 29 11:54:07 2017 rev:196 rq:529143 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2017-09-19 16:20:09.642694361 +0200 +++ /work/SRC/openSUSE:Factory/.gdm.new/gdm.changes 2017-09-29 11:54:09.873139867 +0200 @@ -1,0 +2,7 @@ +Thu Sep 28 07:33:15 UTC 2017 - xwang(a)suse.com + +- Add gdm-ignore-SLE-CLASSIC-MODE.patch: Ignore env + SLE_CLASSIC_MODE variable when switching from sle-classic session + to gnome-classic session (bsc#1060630). + +------------------------------------------------------------------- New: ---- gdm-ignore-SLE-CLASSIC-MODE.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.HwSBpl/_old 2017-09-29 11:54:10.841003388 +0200 +++ /var/tmp/diff_new_pack.HwSBpl/_new 2017-09-29 11:54:10.845002824 +0200 @@ -64,6 +64,8 @@ Patch49: gdm-default-wm-sle12.patch # PATCH-FIX-UPSTREAM gdm-check-for-Xwayland.patch bgo#787837 fcrozat(a)suse.com -- Don't try Wayland if Xwayland isn't installed Patch50: gdm-check-for-Xwayland.patch +# PATCH-FIX-SLE gdm-ignore-SLE-CLASSIC-MODE.patch bsc#1060630 xwang(a)suse.com -- ignore env SLE_CLASSIC_MODE variable when switching from sle-classic session to gnome-classic session +Patch51: gdm-ignore-SLE-CLASSIC-MODE.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -203,6 +205,7 @@ %patch42 -p1 %if !0%{?is_opensuse} %patch49 -p1 +%patch51 -p1 %endif %patch50 -p1 ++++++ gdm-ignore-SLE-CLASSIC-MODE.patch ++++++ diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c index b648e9de..eee31724 100644 --- a/daemon/gdm-wayland-session.c +++ b/daemon/gdm-wayland-session.c @@ -285,6 +285,7 @@ spawn_session (State *state, "WAYLAND_DISPLAY", "WAYLAND_SOCKET", "GNOME_SHELL_SESSION_MODE", + "SLE_CLASSIC_MODE", NULL }; g_debug ("Running wayland session"); diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c index 88fe96f4..c60ae04f 100644 --- a/daemon/gdm-x-session.c +++ b/daemon/gdm-x-session.c @@ -610,6 +610,7 @@ spawn_session (State *state, "WAYLAND_DISPLAY", "WAYLAND_SOCKET", "GNOME_SHELL_SESSION_MODE", + "SLE_CLASSIC_MODE", NULL }; g_debug ("Running X session");

1 0

commit gnome-shell for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2017-09-29 11:54:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell" Fri Sep 29 11:54:00 2017 rev:138 rq:529142 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2017-09-25 13:51:14.307871715 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2017-09-29 11:54:01.710290914 +0200 @@ -1,0 +2,6 @@ +Thu Sep 28 01:59:13 UTC 2017 - xwang(a)suse.com + +- Add gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch: + Fix using keyboard can't unlock screen (bgo#788169). + +------------------------------------------------------------------- New: ---- gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.bABWPG/_old 2017-09-29 11:54:02.602165149 +0200 +++ /var/tmp/diff_new_pack.bABWPG/_new 2017-09-29 11:54:02.606164586 +0200 @@ -61,6 +61,8 @@ Patch18: gnome-shell-fix-crash-hint-actor-NULL.patch # PATCH-FIX-UPSTREAM gnome-shell-only-listen-window-created-events-once.patch bgo#787361 zaitor(a)opensuse.org -- gtk-embed: ensure we only listen for window-created events once Patch19: gnome-shell-only-listen-window-created-events-once.patch +# PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bgo#788169 xwang(a)suse.com -- Avoid login dialog grabs focus when screen locked +Patch20: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch ## NOTE: Keep SLE Classic patches at bottom. # PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong(a)suse.com -- add SLE Classic support Patch1000: gs-sle-classic-ext.patch @@ -190,6 +192,7 @@ # Needs rebase #patch1 -p1 %patch2 -p1 +%patch20 -p1 %if !0%{?is_opensuse} %patch3 -p1 %patch4 -p1 ++++++ gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch ++++++ >From 8a46458bf59300fb73ac4d1271c80c5b9ab571c4 Mon Sep 17 00:00:00 2001 From: Xiaoguang Wang <xwang(a)suse.com> Date: Tue, 26 Sep 2017 16:54:15 +0800 Subject: [PATCH] gdm: Avoid loginDialog grab focus when locked https://bugzilla.gnome.org/show_bug.cgi?id=788169 --- js/gdm/loginDialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js index 1cae3db85..b83129150 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js @@ -1128,7 +1128,8 @@ var LoginDialog = new Lang.Class({ this._sessionMenuButton.close(); this._setUserListExpanded(true); this._notListedButton.show(); - this._userList.actor.grab_key_focus(); + if (!Main.screenShield.locked) + this._userList.actor.grab_key_focus(); }, _beginVerificationForItem: function(item) { -- 2.12.3 ++++++ gnome-shell-domain.patch ++++++ --- /var/tmp/diff_new_pack.bABWPG/_old 2017-09-29 11:54:02.714149358 +0200 +++ /var/tmp/diff_new_pack.bABWPG/_new 2017-09-29 11:54:02.714149358 +0200 @@ -357,9 +357,9 @@ + if (this._domainMenuButton.domain_enabled) + this._domainMenuButton.actor.show(); + this._userLayout.show(); - this._userList.actor.grab_key_focus(); + if (!Main.screenShield.locked) + this._userList.actor.grab_key_focus(); }, - Index: gnome-shell-3.26.0/po/POTFILES.in =================================================================== --- gnome-shell-3.26.0.orig/po/POTFILES.in

1 0

commit gnome-shell-extensions for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package gnome-shell-extensions for openSUSE:Factory checked in at 2017-09-29 11:53:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell-extensions (Old) and /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell-extensions" Fri Sep 29 11:53:52 2017 rev:64 rq:529141 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell-extensions/gnome-shell-extensions.changes 2017-09-25 13:51:40.540180880 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new/gnome-shell-extensions.changes 2017-09-29 11:53:53.559440271 +0200 @@ -1,0 +2,7 @@ +Wed Sep 27 08:37:53 UTC 2017 - xwang(a)suse.com + +- Enable SLE-Classic session working on Wayland. + Add sle-classic.desktop in folder '{_datadir}/wayland-sessions/' + (bsc#1058797) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell-extensions.spec ++++++ --- /var/tmp/diff_new_pack.expWQh/_old 2017-09-29 11:53:54.387323530 +0200 +++ /var/tmp/diff_new_pack.expWQh/_new 2017-09-29 11:53:54.387323530 +0200 @@ -126,6 +126,8 @@ %find_lang %{name} %{?no_lang_C} %if !0%{?is_opensuse} install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.desktop +install -d -m755 %{buildroot}%{_datadir}/wayland-sessions +install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/wayland-sessions/sle-classic.desktop # Install SLE theme tar -xzvf %{SOURCE3} install -d %{buildroot}%{_datadir}/gnome-shell/theme @@ -147,7 +149,6 @@ --remove default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop %endif - %files common %defattr(-,root,root) %doc COPYING README.SUSE @@ -181,6 +182,8 @@ %if !0%{?is_opensuse} %{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/sle-classic.desktop +%dir %{_datadir}/wayland-sessions +%{_datadir}/wayland-sessions/sle-classic.desktop %{_datadir}/gnome-shell/theme/sle-background.png %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %endif

1 0

commit gstreamer-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package gstreamer-plugins-bad for openSUSE:Factory checked in at 2017-09-29 11:53:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-bad" Fri Sep 29 11:53:44 2017 rev:65 rq:529138 version:1.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes 2017-09-25 13:55:53.440598406 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new/gstreamer-plugins-bad.changes 2017-09-29 11:53:46.768397881 +0200 @@ -1,0 +2,8 @@ +Thu Sep 28 11:42:21 UTC 2017 - dimstar(a)opensuse.org + +- Split out chromaprint plugin into + gstreamer-plugins-bad-chromaprint: the chromaprint plugin links + against ffmpeg (indirectly) which in turn can cause cycles in + various other builds, like webkit2). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.bvuVbK/_old 2017-09-29 11:53:48.176199366 +0200 +++ /var/tmp/diff_new_pack.bvuVbK/_new 2017-09-29 11:53:48.176199366 +0200 @@ -166,6 +166,13 @@ videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. +%package chromaprint +Summary: Chromaprint plugin for GStreamer +Group: Productivity/Multimedia/Other + +%description chromaprint +Add chromaprint (Audio Fingerprinting) support to any GStreamer based tool. + %package -n libgstadaptivedemux-1_0-0 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: System/Libraries @@ -572,12 +579,14 @@ # Explicitly list openSUSE only plugins %if 0%{?is_opensuse} %{_libdir}/gstreamer-%{gst_branch}/libgstbs2b.so -%{_libdir}/gstreamer-%{gst_branch}/libgstchromaprint.so %{_libdir}/gstreamer-%{gst_branch}/libgstfluidsynthmidi.so %{_libdir}/gstreamer-%{gst_branch}/libgstopenal.so %{_libdir}/gstreamer-%{gst_branch}/libgstopenjpeg.so %{_libdir}/gstreamer-%{gst_branch}/libgstteletext.so %{_libdir}/gstreamer-%{gst_branch}/libgstzbar.so + +%files chromaprint +%{_libdir}/gstreamer-%{gst_branch}/libgstchromaprint.so %endif %files -n libgstadaptivedemux-1_0-0

1 0

commit golang-github-docker-libnetwork for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package golang-github-docker-libnetwork for openSUSE:Factory checked in at 2017-09-29 11:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-github-docker-libnetwork (Old) and /work/SRC/openSUSE:Factory/.golang-github-docker-libnetwork.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-github-docker-libnetwork" Fri Sep 29 11:53:32 2017 rev:3 rq:529123 version:0.0.0+git20170119.7b2b1fe Changes: -------- --- /work/SRC/openSUSE:Factory/golang-github-docker-libnetwork/golang-github-docker-libnetwork.changes 2017-05-23 12:04:40.400693845 +0200 +++ /work/SRC/openSUSE:Factory/.golang-github-docker-libnetwork.new/golang-github-docker-libnetwork.changes 2017-09-29 11:53:37.497705152 +0200 @@ -1,0 +2,5 @@ +Thu Sep 28 09:29:01 UTC 2017 - thipp(a)suse.de + +- always use -buildmode=default + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-github-docker-libnetwork.spec ++++++ --- /var/tmp/diff_new_pack.Cc6Xct/_old 2017-09-29 11:53:38.197606459 +0200 +++ /var/tmp/diff_new_pack.Cc6Xct/_new 2017-09-29 11:53:38.201605894 +0200 @@ -61,7 +61,7 @@ %build %goprep %{import_path} export CGO_ENABLED=0 -%gobuild cmd/proxy +%gobuild -buildmode=default cmd/proxy %install %{goinstall}

1 0

commit mpg123 for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package mpg123 for openSUSE:Factory checked in at 2017-09-29 11:53:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpg123 (Old) and /work/SRC/openSUSE:Factory/.mpg123.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mpg123" Fri Sep 29 11:53:14 2017 rev:8 rq:529118 version:1.25.7 Changes: -------- --- /work/SRC/openSUSE:Factory/mpg123/mpg123.changes 2017-08-12 20:19:43.938835385 +0200 +++ /work/SRC/openSUSE:Factory/.mpg123.new/mpg123.changes 2017-09-29 11:53:25.899340655 +0200 @@ -1,0 +2,25 @@ +Tue Sep 26 17:34:59 UTC 2017 - zaitor(a)opensuse.org + +- Drop pkgconfig(esound) BuildRequires and mpg123-esound + sub-package, esound is a long obsoleted sound server. + +------------------------------------------------------------------- +Tue Sep 26 08:52:53 UTC 2017 - aloisio(a)gmx.com + +- Update to version 1.25.7 + mpg123: + * Do not play with cursor and inverse video for progress bar + when TERM=dumb. + * Fix parsing of host port for numerical IPv6 addresses (just did + not work before, only for textual host names). + libmpg123: + * Proper fix for the xrpnt overflow problems by correctly + initialising certain tables for MPEG 2.x layer III. The checks + that catch the resulting overflow are still in place, but + likely superfluous now. Note that this means certain valid + files would have been misdecoded before, if anyone actually + produced them. Thanks to Robert Hegemann for the fix! + * Silently handle granules with part2_3_length == 0, but + scalefac_compress != 0 (ignore the latter). + +------------------------------------------------------------------- Old: ---- mpg123-1.25.6.tar.bz2 mpg123-1.25.6.tar.bz2.sig New: ---- mpg123-1.25.7.tar.bz2 mpg123-1.25.7.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpg123.spec ++++++ --- /var/tmp/diff_new_pack.10W3Oc/_old 2017-09-29 11:53:28.450980844 +0200 +++ /var/tmp/diff_new_pack.10W3Oc/_new 2017-09-29 11:53:28.454980280 +0200 @@ -17,7 +17,7 @@ Name: mpg123 -Version: 1.25.6 +Version: 1.25.7 Release: 0 Summary: Console MPEG audio player and decoder library License: LGPL-2.1 @@ -30,7 +30,6 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(ao) -BuildRequires: pkgconfig(esound) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(openal) @@ -57,6 +56,7 @@ %package -n libmpg123-0 Summary: MPEG audio decoder library Group: System/Libraries +Obsoletes: mpg123-esound >= 1.25.7 %description -n libmpg123-0 MPEG 1.0/2.0/2.5 audio decoder library for layers 1, 2 and 3 (most @@ -71,19 +71,6 @@ layers 1,2 and 3 (most commonly MPEG 1.0 layer 3 aka MP3), as well as re-usable decoding and output libraries. -%package esound -Summary: Esound GNOME Sound System Daemon Support for %{name} -Group: Productivity/Multimedia/Sound/Players -Supplements: esound-daemon - -%description esound -The mpg123 distribution contains a real time MPEG 1.0/2.0/2.5 audio player/decoder for -layers 1,2 and 3 (most commonly MPEG 1.0 layer 3 aka MP3), as well as re-usable decoding -and output libraries. - -This package contains the plugin for esound (the GNOME sound system daemon) -output support. - %package openal Summary: OpenAL Support for %{name} Group: Productivity/Multimedia/Sound/Players @@ -193,10 +180,6 @@ %{_includedir}/mpg123.h %{_includedir}/out123.h -%files esound -%defattr(-,root,root) -%{_libdir}/%{name}/output_esd.so - %files pulse %defattr(-,root,root) %{_libdir}/%{name}/output_pulse.so ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.10W3Oc/_old 2017-09-29 11:53:28.490975204 +0200 +++ /var/tmp/diff_new_pack.10W3Oc/_new 2017-09-29 11:53:28.494974641 +0200 @@ -4,7 +4,6 @@ -requires mpg123-<targettype> requires "libmpg123-0-<targettype>" requires "libout123-0-<targettype>" -mpg123-esound mpg123-jack mpg123-openal mpg123-portaudio ++++++ mpg123-1.25.6.tar.bz2 -> mpg123-1.25.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/NEWS new/mpg123-1.25.7/NEWS --- old/mpg123-1.25.6/NEWS 2017-08-11 09:29:15.000000000 +0200 +++ new/mpg123-1.25.7/NEWS 2017-09-25 23:28:08.000000000 +0200 @@ -1,3 +1,20 @@ +1.25.7 +------ +- mpg123: +-- Do not play with cursor and inverse video for progress bar + when TERM=dumb. +-- Fix parsing of host port for numerical IPv6 addresses (just did + not work before, only for textual host names). +- libmpg123: +-- Proper fix for the xrpnt overflow problems by correctly + initialising certain tables for MPEG 2.x layer III. The checks that + catch the resulting overflow are still in place, but likely superfluous + now. Note that this means certain valid files would have been misdecoded + before, if anyone actually produced them. Thanks to Robert Hegemann for + the fix! +-- Silently handle granules with part2_3_length == 0, but + scalefac_compress != 0 (ignore the latter). + 1.25.6 ------ - Hotfix for bug 255: Overflow reading frame data bits in layer II decoding. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/configure new/mpg123-1.25.7/configure --- old/mpg123-1.25.6/configure 2017-08-11 09:30:00.000000000 +0200 +++ new/mpg123-1.25.7/configure 2017-08-23 14:47:40.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mpg123 1.25.6. +# Generated by GNU Autoconf 2.69 for mpg123 1.25.7. # # Report bugs to <maintainer(a)mpg123.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='mpg123' PACKAGE_TARNAME='mpg123' -PACKAGE_VERSION='1.25.6' -PACKAGE_STRING='mpg123 1.25.6' +PACKAGE_VERSION='1.25.7' +PACKAGE_STRING='mpg123 1.25.7' PACKAGE_BUGREPORT='maintainer(a)mpg123.org' PACKAGE_URL='' @@ -1567,7 +1567,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mpg123 1.25.6 to adapt to many kinds of systems. +\`configure' configures mpg123 1.25.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1637,7 +1637,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mpg123 1.25.6:";; + short | recursive ) echo "Configuration of mpg123 1.25.7:";; esac cat <<\_ACEOF @@ -1863,7 +1863,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mpg123 configure 1.25.6 +mpg123 configure 1.25.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2469,7 +2469,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mpg123 $as_me 1.25.6, which was +It was created by mpg123 $as_me 1.25.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2822,7 +2822,7 @@ API_VERSION=44 -LIB_PATCHLEVEL=5 +LIB_PATCHLEVEL=6 OUTAPI_VERSION=2 OUTLIB_PATCHLEVEL=1 @@ -3425,7 +3425,7 @@ # Define the identity of the package. PACKAGE='mpg123' - VERSION='1.25.6' + VERSION='1.25.7' cat >>confdefs.h <<_ACEOF @@ -20241,7 +20241,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mpg123 $as_me 1.25.6, which was +This file was extended by mpg123 $as_me 1.25.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20307,7 +20307,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mpg123 config.status 1.25.6 +mpg123 config.status 1.25.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/configure.ac new/mpg123-1.25.7/configure.ac --- old/mpg123-1.25.6/configure.ac 2017-08-11 09:29:23.000000000 +0200 +++ new/mpg123-1.25.7/configure.ac 2017-08-23 14:43:11.000000000 +0200 @@ -8,12 +8,12 @@ AC_PREREQ(2.57) dnl ############# Initialisation -AC_INIT([mpg123], [1.25.6], [maintainer(a)mpg123.org] +AC_INIT([mpg123], [1.25.7], [maintainer(a)mpg123.org] dnl Increment API_VERSION when the API gets changes (new functions). dnl libmpg123 API_VERSION=44 -LIB_PATCHLEVEL=5 +LIB_PATCHLEVEL=6 dnl libout123 OUTAPI_VERSION=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/mpg123.spec new/mpg123-1.25.7/mpg123.spec --- old/mpg123-1.25.6/mpg123.spec 2017-08-11 09:30:13.000000000 +0200 +++ new/mpg123-1.25.7/mpg123.spec 2017-08-23 16:01:08.000000000 +0200 @@ -3,7 +3,7 @@ # - devel packages for alsa, sdl, etc... to build the respective output modules. Summary: The fast console mpeg audio decoder/player. Name: mpg123 -Version: 1.25.6 +Version: 1.25.7 Release: 1 URL: http://www.mpg123.org/ License: GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/common.c new/mpg123-1.25.7/src/common.c --- old/mpg123-1.25.6/src/common.c 2017-08-11 09:28:58.000000000 +0200 +++ new/mpg123-1.25.7/src/common.c 2017-08-23 16:14:27.000000000 +0200 @@ -29,6 +29,29 @@ int stopped = 0; int paused = 0; +static int term_is_fun = -1; + +int term_have_fun(int fd) +{ + if(term_is_fun > -1) + return term_is_fun; + else + term_is_fun = 0; +#ifdef HAVE_TERMIOS + if(term_width(fd) > 0 && param.term_visual) + { + /* Only play with non-dumb terminals. */ + char *tname = compat_getenv("TERM"); + if(tname) + { + if(strcmp(tname, "dumb")) + term_is_fun = 1; + free(tname); + } + } +#endif + return term_is_fun; +} /* Also serves as a way to detect if we have an interactive terminal. */ int term_width(int fd) @@ -382,6 +405,7 @@ if(maxlen > 0) memset(line+len, ' ', linelen-len); #ifdef HAVE_TERMIOS + draw_bar = draw_bar && term_have_fun(STDERR_FILENO); /* Use inverse color to draw a progress bar. */ if(maxlen > 0 && draw_bar) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/common.h new/mpg123-1.25.7/src/common.h --- old/mpg123-1.25.6/src/common.h 2017-08-11 09:28:58.000000000 +0200 +++ new/mpg123-1.25.7/src/common.h 2017-08-23 14:06:39.000000000 +0200 @@ -15,6 +15,9 @@ extern int stopped; extern int paused; +/* Return non-zero if full terminal fun is desired/possible. */ +int term_have_fun(int fd); + /* Return width of terminal associated with given descriptor, -1 when there is none. */ int term_width(int fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/libmpg123/getbits.h new/mpg123-1.25.7/src/libmpg123/getbits.h --- old/mpg123-1.25.6/src/libmpg123/getbits.h 2017-08-11 09:29:15.000000000 +0200 +++ new/mpg123-1.25.7/src/libmpg123/getbits.h 2017-09-22 08:55:15.000000000 +0200 @@ -45,6 +45,7 @@ fprintf(stderr,"g%d",number_of_bits); #endif /* Safety catch until we got the nasty code fully figured out. */ + /* No, that catch stays here, even if we think we got it figured out! */ if( (long)(fr->wordpointer-fr->bsbuf)*8 + fr->bitindex+number_of_bits > (long)fr->framesize*8 ) return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/libmpg123/layer3.c new/mpg123-1.25.7/src/libmpg123/layer3.c --- old/mpg123-1.25.6/src/libmpg123/layer3.c 2017-08-11 09:28:59.000000000 +0200 +++ new/mpg123-1.25.7/src/libmpg123/layer3.c 2017-09-22 23:43:05.000000000 +0200 @@ -280,10 +280,12 @@ int *mp; int cb,lwin; const unsigned char *bdf; + int switch_idx; mp = map[j][0] = mapbuf0[j]; bdf = bi->longDiff; - for(i=0,cb = 0; cb < 8 ; cb++,i+=*bdf++) + switch_idx = (j < 3) ? 8 : 6; + for(i=0,cb = 0; cb < switch_idx ; cb++,i+=*bdf++) { *mp++ = (*bdf) >> 1; *mp++ = i; @@ -465,8 +467,14 @@ } gr_info->pow2gain = fr->gainpow2+256 - getbits_fast(fr, 8) + powdiff; if(ms_stereo) gr_info->pow2gain += 2; - gr_info->scalefac_compress = getbits(fr, tab[4]); + if(gr_info->part2_3_length == 0) + { + if(gr_info->scalefac_compress > 0) + debug1( "scalefac_compress _should_ be zero instead of %i" + , gr_info->scalefac_compress ); + gr_info->scalefac_compress = 0; + } if(get1bit(fr)) { /* window switch flag */ @@ -553,6 +561,14 @@ int num0 = slen[0][gr_info->scalefac_compress]; int num1 = slen[1][gr_info->scalefac_compress]; + if(gr_info->part2_3_length == 0) + { + int i; + for(i=0;i<39;i++) + *scf++ = 0; + return 0; + } + if(gr_info->block_type == 2) { int i=18; @@ -667,6 +683,14 @@ pnt = stab[n][(slen>>12)&0x7]; + if(gr_info->part2_3_length == 0) + { + int i; + for(i=0;i<39;i++) + *scf++ = 0; + return 0; + } + for(i=0;i<4;i++) { int num = slen & 0x7; @@ -680,7 +704,7 @@ else for(j=0;j<(int)(pnt[i]);j++) *scf++ = 0; } - + n = (n << 1) + 1; for(i=0;i<n;i++) *scf++ = 0; @@ -735,6 +759,12 @@ int gainpow2_scale_idx = 378; #endif + /* Assumption: If there is some part2_3_length at all, there should be + enough of it to work with properly. In case of zero length we silently + zero things. */ + if(gr_info->part2_3_length > 0) + { + /* mhipp tree has this split up a bit... */ int num=getbitoffset(fr); MASK_TYPE mask; @@ -1197,6 +1227,18 @@ backbits(fr, num); num = 0; + } + else + { + part2remain = 0; + /* Not entirely sure what good values are, must be > 0. */ + gr_info->maxband[0] = + gr_info->maxband[1] = + gr_info->maxband[2] = + gr_info->maxbandl = 0; + gr_info->maxb = 1; + } + while(xrpnt < &xr[SBLIMIT][0]) *xrpnt++ = DOUBLE_TO_REAL(0.0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/mpg123.c new/mpg123-1.25.7/src/mpg123.c --- old/mpg123-1.25.6/src/mpg123.c 2017-08-11 09:28:59.000000000 +0200 +++ new/mpg123-1.25.7/src/mpg123.c 2017-08-23 14:50:04.000000000 +0200 @@ -64,7 +64,8 @@ NULL, /* output device */ 0, /* destination (headphones, ...) */ #ifdef HAVE_TERMIOS - FALSE , /* term control */ + FALSE, /* term control */ + TRUE, /* term visuals */ MPG123_TERM_USR1, MPG123_TERM_USR2, #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/mpg123app.h new/mpg123-1.25.7/src/mpg123app.h --- old/mpg123-1.25.6/src/mpg123app.h 2017-08-11 09:28:59.000000000 +0200 +++ new/mpg123-1.25.7/src/mpg123app.h 2017-08-23 14:06:39.000000000 +0200 @@ -57,6 +57,7 @@ long output_flags; /* out123 flags */ #ifdef HAVE_TERMIOS int term_ctrl; + int term_visual; /* Those are supposed to be single characters. */ char* term_usr1; char* term_usr2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/resolver.c new/mpg123-1.25.7/src/resolver.c --- old/mpg123-1.25.6/src/resolver.c 2017-08-11 09:28:58.000000000 +0200 +++ new/mpg123-1.25.7/src/resolver.c 2017-09-04 01:51:39.000000000 +0200 @@ -42,6 +42,9 @@ { size_t pos = 0; /* current position in input URL */ size_t pos2 = 0; /* another position in input URL */ +#ifdef IPV6 + size_t pos3 = 0; /* yet another (for IPv6 port) */ +#endif char *part = NULL; /* a part of url we work on */ int ret = TRUE; /* return code */ /* Zeroing the output strings; not freeing to avoid unnecessary mallocs. */ @@ -92,16 +95,22 @@ if( (part = strchr(url->p+pos,']')) != NULL) { pos2 = part-url->p; + pos3 = pos2+1; /* : after ] */ } else { error("Malformed IPv6 URL!"); return FALSE; } } else + { #endif for(pos2=pos; pos2 < url->fill-1; ++pos2) { char a = url->p[pos2]; if( a == ':' || a == '/') break; } +#ifdef IPV6 + pos3 = pos2; + } +#endif /* At pos2 there is now either a delimiter or the end. */ debug4("hostname between %lu and %lu, %lu chars of %s", (unsigned long)pos, (unsigned long)pos2, (unsigned long)(pos2-pos), url->p + pos); if(host != NULL && !mpg123_set_substring(host, url->p, pos, pos2-pos)) @@ -109,7 +118,11 @@ error("Cannot set host string (out of mem?)."); return FALSE; } +#ifdef IPV6 + pos = pos3; /* Look after ], if present. */ +#else pos = pos2; +#endif /* Now for the port... */ if(url->p[pos] == ':') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.25.6/src/term.c new/mpg123-1.25.7/src/term.c --- old/mpg123-1.25.6/src/term.c 2017-08-11 09:28:59.000000000 +0200 +++ new/mpg123-1.25.7/src/term.c 2017-08-23 16:15:19.000000000 +0200 @@ -109,7 +109,7 @@ const char hide_cursor[] = "\x1b[?25l"; debug("term_init"); - if(term_width(STDERR_FILENO) >= 0) + if(term_have_fun(STDERR_FILENO)) write(STDERR_FILENO, hide_cursor, sizeof(hide_cursor)); debug1("param.term_ctrl: %i", param.term_ctrl); @@ -550,7 +550,7 @@ { const char cursor_restore[] = "\x1b[?25h"; /* Bring cursor back. */ - if(term_width(STDERR_FILENO) >= 0) + if(term_have_fun(STDERR_FILENO)) write(STDERR_FILENO, cursor_restore, sizeof(cursor_restore)); if(!term_enable) return;

1 0

commit python-six for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package python-six for openSUSE:Factory checked in at 2017-09-29 11:52:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-six (Old) and /work/SRC/openSUSE:Factory/.python-six.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-six" Fri Sep 29 11:52:53 2017 rev:26 rq:529092 version:1.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-six/python-six-doc.changes 2017-02-27 18:28:31.705430166 +0100 +++ /work/SRC/openSUSE:Factory/.python-six.new/python-six-doc.changes 2017-09-29 11:53:02.402653969 +0200 @@ -1,0 +2,25 @@ +Thu Sep 28 07:47:18 UTC 2017 - tbechtold(a)suse.com + +- Fix Source url + +------------------------------------------------------------------- +Sat Sep 23 20:49:03 UTC 2017 - arun(a)gmx.de + +- README->README.rst, add CHANGES + +- update to version 1.11.0: + * Pull request #178: `with_metaclass` now properly proxies + `__prepare__` to the underlying metaclass. + * Pull request #191: Allow `with_metaclass` to work with metaclasses + implemented in C. + * Pull request #203: Add parse_http_list and parse_keqv_list to + moved urllib.request. + * Pull request #172 and issue #171: Add unquote_to_bytes to moved + urllib.parse. + * Pull request #167: Add `six.moves.getoutput`. + * Pull request #80: Add `six.moves.urllib_parse.splitvalue`. + * Pull request #75: Add `six.moves.email_mime_image`. + * Pull request #72: Avoid creating reference cycles through + tracebacks in `reraise`. + +------------------------------------------------------------------- python-six.changes: same change Old: ---- six-1.10.0.tar.gz New: ---- six-1.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-six-doc.spec ++++++ --- /var/tmp/diff_new_pack.cz54wU/_old 2017-09-29 11:53:11.785330897 +0200 +++ /var/tmp/diff_new_pack.cz54wU/_new 2017-09-29 11:53:11.789330333 +0200 @@ -18,13 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-six-doc -Version: 1.10.0 +Version: 1.11.0 Release: 0 Url: http://pypi.python.org/pypi/six/ Summary: Python 2 and 3 compatibility utilities License: MIT Group: Development/Libraries/Python -Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module six} # require old python 2 explicitly to get the ssl module @@ -67,6 +67,6 @@ %files %defattr(-,root,root) -%doc LICENSE README documentation/_build/html +%doc LICENSE README.rst CHANGES documentation/_build/html %changelog ++++++ python-six.spec ++++++ --- /var/tmp/diff_new_pack.cz54wU/_old 2017-09-29 11:53:11.809327513 +0200 +++ /var/tmp/diff_new_pack.cz54wU/_new 2017-09-29 11:53:11.809327513 +0200 @@ -18,13 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-six -Version: 1.10.0 +Version: 1.11.0 Release: 0 Url: http://pypi.python.org/pypi/six/ Summary: Python 2 and 3 compatibility utilities License: MIT Group: Development/Libraries/Python -Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module base} BuildRequires: python-rpm-macros @@ -61,7 +61,7 @@ %files %python_files %defattr(-,root,root) -%doc LICENSE README +%doc LICENSE README.rst CHANGES %{python_sitelib}/six.py* %pycache_only %{python3_sitelib}/__pycache__/* %{python_sitelib}/six-%{version}-py*.egg-info ++++++ six-1.10.0.tar.gz -> six-1.11.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/CHANGES new/six-1.11.0/CHANGES --- old/six-1.10.0/CHANGES 2015-10-07 05:13:01.000000000 +0200 +++ new/six-1.11.0/CHANGES 2017-09-17 20:46:32.000000000 +0200 @@ -3,6 +3,29 @@ This file lists the changes in each six version. +1.11.0 +------ + +- Pull request #178: `with_metaclass` now properly proxies `__prepare__` to the + underlying metaclass. + +- Pull request #191: Allow `with_metaclass` to work with metaclasses implemented + in C. + +- Pull request #203: Add parse_http_list and parse_keqv_list to moved + urllib.request. + +- Pull request #172 and issue #171: Add unquote_to_bytes to moved urllib.parse. + +- Pull request #167: Add `six.moves.getoutput`. + +- Pull request #80: Add `six.moves.urllib_parse.splitvalue`. + +- Pull request #75: Add `six.moves.email_mime_image`. + +- Pull request #72: Avoid creating reference cycles through tracebacks in + `reraise`. + 1.10.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/LICENSE new/six-1.11.0/LICENSE --- old/six-1.10.0/LICENSE 2015-01-02 17:31:35.000000000 +0100 +++ new/six-1.11.0/LICENSE 2017-09-17 20:46:32.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2010-2015 Benjamin Peterson +Copyright (c) 2010-2017 Benjamin Peterson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/PKG-INFO new/six-1.11.0/PKG-INFO --- old/six-1.10.0/PKG-INFO 2015-10-07 05:17:36.000000000 +0200 +++ new/six-1.11.0/PKG-INFO 2017-09-17 20:46:53.000000000 +0200 @@ -1,12 +1,21 @@ Metadata-Version: 1.1 Name: six -Version: 1.10.0 +Version: 1.11.0 Summary: Python 2 and 3 compatibility utilities Home-page: http://pypi.python.org/pypi/six/ Author: Benjamin Peterson Author-email: benjamin(a)python.org License: MIT -Description: Six is a Python 2 and 3 compatibility library. It provides utility functions +Description: .. image:: http://img.shields.io/pypi/v/six.svg + :target: https://pypi.python.org/pypi/six + + .. image:: https://travis-ci.org/benjaminp/six.svg?branch=master + :target: https://travis-ci.org/benjaminp/six + + .. image:: http://img.shields.io/badge/license-MIT-green.svg + :target: https://github.com/benjaminp/six/blob/master/LICENSE + + Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on both Python versions. See the documentation for more information on what is provided. @@ -15,9 +24,9 @@ file, so it can be easily copied into your project. (The copyright and license notice must be retained.) - Online documentation is at https://pythonhosted.org/six/. + Online documentation is at http://six.rtfd.org. - Bugs can be reported to https://bitbucket.org/gutworth/six. The code can also + Bugs can be reported to https://github.com/benjaminp/six. The code can also be found there. For questions about six or porting in general, email the python-porting mailing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/README new/six-1.11.0/README --- old/six-1.10.0/README 2015-04-30 20:10:14.000000000 +0200 +++ new/six-1.11.0/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Six is a Python 2 and 3 compatibility library. It provides utility functions -for smoothing over the differences between the Python versions with the goal of -writing Python code that is compatible on both Python versions. See the -documentation for more information on what is provided. - -Six supports every Python version since 2.6. It is contained in only one Python -file, so it can be easily copied into your project. (The copyright and license -notice must be retained.) - -Online documentation is at https://pythonhosted.org/six/. - -Bugs can be reported to https://bitbucket.org/gutworth/six. The code can also -be found there. - -For questions about six or porting in general, email the python-porting mailing -list: https://mail.python.org/mailman/listinfo/python-porting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/README.rst new/six-1.11.0/README.rst --- old/six-1.10.0/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/six-1.11.0/README.rst 2017-09-17 20:46:32.000000000 +0200 @@ -0,0 +1,25 @@ +.. image:: http://img.shields.io/pypi/v/six.svg + :target: https://pypi.python.org/pypi/six + +.. image:: https://travis-ci.org/benjaminp/six.svg?branch=master + :target: https://travis-ci.org/benjaminp/six + +.. image:: http://img.shields.io/badge/license-MIT-green.svg + :target: https://github.com/benjaminp/six/blob/master/LICENSE + +Six is a Python 2 and 3 compatibility library. It provides utility functions +for smoothing over the differences between the Python versions with the goal of +writing Python code that is compatible on both Python versions. See the +documentation for more information on what is provided. + +Six supports every Python version since 2.6. It is contained in only one Python +file, so it can be easily copied into your project. (The copyright and license +notice must be retained.) + +Online documentation is at http://six.rtfd.org. + +Bugs can be reported to https://github.com/benjaminp/six. The code can also +be found there. + +For questions about six or porting in general, email the python-porting mailing +list: https://mail.python.org/mailman/listinfo/python-porting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/documentation/conf.py new/six-1.11.0/documentation/conf.py --- old/six-1.10.0/documentation/conf.py 2015-01-02 17:31:23.000000000 +0100 +++ new/six-1.11.0/documentation/conf.py 2017-09-17 20:46:32.000000000 +0200 @@ -33,7 +33,7 @@ # General information about the project. project = u"six" -copyright = u"2010-2015, Benjamin Peterson" +copyright = u"2010-2017, Benjamin Peterson" sys.path.append(os.path.abspath(os.path.join(".", ".."))) from six import __version__ as six_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/documentation/index.rst new/six-1.11.0/documentation/index.rst --- old/six-1.10.0/documentation/index.rst 2015-10-07 05:05:52.000000000 +0200 +++ new/six-1.11.0/documentation/index.rst 2017-09-17 20:46:32.000000000 +0200 @@ -13,8 +13,8 @@ without modification. six consists of only one Python file, so it is painless to copy into a project. -Six can be downloaded on `PyPi <http://pypi.python.org/pypi/six/>`_. Its bug -tracker and code hosting is on `BitBucket <http://bitbucket.org/gutworth/six>`_. +Six can be downloaded on `PyPi <https://pypi.python.org/pypi/six/>`_. Its bug +tracker and code hosting is on `GitHub <https://github.com/benjaminp/six>`_. The name, "six", comes from the fact that 2*3 equals 6. Why not addition? Multiplication is more powerful, and, anyway, "five" has already been snatched @@ -104,7 +104,7 @@ Object model compatibility >>>>>>>>>>>>>>>>>>>>>>>>>> -Python 3 renamed the attributes of several intepreter data structures. The +Python 3 renamed the attributes of several interpreter data structures. The following accessors are available. Note that the recommended way to inspect functions and methods is the stdlib :mod:`py3:inspect` module. @@ -164,7 +164,9 @@ Get the next item of iterator *it*. :exc:`py3:StopIteration` is raised if the iterator is exhausted. This is a replacement for calling ``it.next()`` - in Python 2 and ``next(it)`` in Python 3. + in Python 2 and ``next(it)`` in Python 3. Python 2.6 and above have a + builtin ``next`` function, so six's version is only necessary for Python 2.5 + compatibility. .. function:: callable(obj) @@ -345,7 +347,7 @@ on Python 3 or :: class MyClass(object): - __metaclass__ = MyMeta + __metaclass__ = Meta on Python 2. @@ -361,7 +363,7 @@ >>>>>>>>>>>>>>>>>>>> Python 3 enforces the distinction between byte strings and text strings far more -rigoriously than Python 2 does; binary data cannot be automatically coerced to +rigorously than Python 2 does; binary data cannot be automatically coerced to or from text data. six provides several functions to assist in classifying string data in all Python versions. @@ -376,7 +378,7 @@ .. note:: Since all Python versions 2.6 and after support the ``b`` prefix, - :func:`b`, code without 2.5 support doesn't need :func:`b`. + code without 2.5 support doesn't need :func:`b`. .. function:: u(text) @@ -433,7 +435,7 @@ .. data:: StringIO - This is an fake file object for textual data. It's an alias for + This is a fake file object for textual data. It's an alias for :class:`py2:StringIO.StringIO` in Python 2 and :class:`py3:io.StringIO` in Python 3. @@ -509,7 +511,7 @@ Python 3. When the new Python 3 name is a package, the components of the name are separated by underscores. For example, ``html.parser`` becomes ``html_parser``. In some cases where several modules have been combined, the -Python 2 name is retained. This is so the appropiate modules can be found when +Python 2 name is retained. This is so the appropriate modules can be found when running on Python 2. For example, ``BaseHTTPServer`` which is in ``http.server`` in Python 3 is aliased as ``BaseHTTPServer``. @@ -530,14 +532,14 @@ from six.moves.cPickle import loads - work, six places special proxy objects in in :data:`py3:sys.modules`. These + work, six places special proxy objects in :data:`py3:sys.modules`. These proxies lazily load the underlying module when an attribute is fetched. This will fail if the underlying module is not available in the Python interpreter. For example, ``sys.modules["six.moves.winreg"].LoadKey`` would fail on any non-Windows platform. Unfortunately, some applications try to load attributes on every module in :data:`py3:sys.modules`. six mitigates this problem for some applications by pretending attributes on unimportable - modules don't exist. This hack doesn't work in every case, though. If you are + modules do not exist. This hack does not work in every case, though. If you are encountering problems with the lazy modules and don't use any from imports directly from ``six.moves`` modules, you can workaround the issue by removing the six proxy modules:: @@ -548,139 +550,143 @@ Supported renames: -+------------------------------+-------------------------------------+-------------------------------------+ -| Name | Python 2 name | Python 3 name | -+==============================+=====================================+=====================================+ -| ``builtins`` | :mod:`py2:__builtin__` | :mod:`py3:builtins` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``configparser`` | :mod:`py2:ConfigParser` | :mod:`py3:configparser` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``copyreg`` | :mod:`py2:copy_reg` | :mod:`py3:copyreg` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``cPickle`` | :mod:`py2:cPickle` | :mod:`py3:pickle` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``cStringIO`` | :func:`py2:cStringIO.StringIO` | :class:`py3:io.StringIO` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``dbm_gnu`` | :func:`py2:gdbm` | :class:`py3:dbm.gnu` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``_dummy_thread`` | :mod:`py2:dummy_thread` | :mod:`py3:_dummy_thread` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``email_mime_multipart`` | :mod:`py2:email.MIMEMultipart` | :mod:`py3:email.mime.multipart` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``email_mime_nonmultipart`` | :mod:`py2:email.MIMENonMultipart` | :mod:`py3:email.mime.nonmultipart` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``email_mime_text`` | :mod:`py2:email.MIMEText` | :mod:`py3:email.mime.text` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``email_mime_base`` | :mod:`py2:email.MIMEBase` | :mod:`py3:email.mime.base` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``filter`` | :func:`py2:itertools.ifilter` | :func:`py3:filter` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``filterfalse`` | :func:`py2:itertools.ifilterfalse` | :func:`py3:itertools.filterfalse` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``getcwd`` | :func:`py2:os.getcwdu` | :func:`py3:os.getcwd` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``getcwdb`` | :func:`py2:os.getcwd` | :func:`py3:os.getcwdb` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``http_cookiejar`` | :mod:`py2:cookielib` | :mod:`py3:http.cookiejar` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``http_cookies`` | :mod:`py2:Cookie` | :mod:`py3:http.cookies` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``html_entities`` | :mod:`py2:htmlentitydefs` | :mod:`py3:html.entities` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``html_parser`` | :mod:`py2:HTMLParser` | :mod:`py3:html.parser` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``http_client`` | :mod:`py2:httplib` | :mod:`py3:http.client` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``BaseHTTPServer`` | :mod:`py2:BaseHTTPServer` | :mod:`py3:http.server` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``CGIHTTPServer`` | :mod:`py2:CGIHTTPServer` | :mod:`py3:http.server` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``SimpleHTTPServer`` | :mod:`py2:SimpleHTTPServer` | :mod:`py3:http.server` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``input`` | :func:`py2:raw_input` | :func:`py3:input` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``intern`` | :func:`py2:intern` | :func:`py3:sys.intern` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``map`` | :func:`py2:itertools.imap` | :func:`py3:map` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``queue`` | :mod:`py2:Queue` | :mod:`py3:queue` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``range`` | :func:`py2:xrange` | :func:`py3:range` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``reduce`` | :func:`py2:reduce` | :func:`py3:functools.reduce` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``reload_module`` | :func:`py2:reload` | :func:`py3:imp.reload`, | -| | | :func:`py3:importlib.reload` | -| | | on Python 3.4+ | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``reprlib`` | :mod:`py2:repr` | :mod:`py3:reprlib` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``shlex_quote`` | :mod:`py2:pipes.quote` | :mod:`py3:shlex.quote` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``socketserver`` | :mod:`py2:SocketServer` | :mod:`py3:socketserver` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``_thread`` | :mod:`py2:thread` | :mod:`py3:_thread` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter`` | :mod:`py2:Tkinter` | :mod:`py3:tkinter` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_dialog`` | :mod:`py2:Dialog` | :mod:`py3:tkinter.dialog` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_filedialog`` | :mod:`py2:FileDialog` | :mod:`py3:tkinter.FileDialog` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_scrolledtext`` | :mod:`py2:ScrolledText` | :mod:`py3:tkinter.scrolledtext` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_simpledialog`` | :mod:`py2:SimpleDialog` | :mod:`py3:tkinter.simpledialog` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_ttk`` | :mod:`py2:ttk` | :mod:`py3:tkinter.ttk` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_tix`` | :mod:`py2:Tix` | :mod:`py3:tkinter.tix` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_constants`` | :mod:`py2:Tkconstants` | :mod:`py3:tkinter.constants` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_dnd`` | :mod:`py2:Tkdnd` | :mod:`py3:tkinter.dnd` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_colorchooser`` | :mod:`py2:tkColorChooser` | :mod:`py3:tkinter.colorchooser` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_commondialog`` | :mod:`py2:tkCommonDialog` | :mod:`py3:tkinter.commondialog` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_tkfiledialog`` | :mod:`py2:tkFileDialog` | :mod:`py3:tkinter.filedialog` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_font`` | :mod:`py2:tkFont` | :mod:`py3:tkinter.font` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_messagebox`` | :mod:`py2:tkMessageBox` | :mod:`py3:tkinter.messagebox` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_tksimpledialog`` | :mod:`py2:tkSimpleDialog` | :mod:`py3:tkinter.simpledialog` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``urllib.parse`` | See :mod:`six.moves.urllib.parse` | :mod:`py3:urllib.parse` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``urllib.error`` | See :mod:`six.moves.urllib.error` | :mod:`py3:urllib.error` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``urllib.request`` | See :mod:`six.moves.urllib.request` | :mod:`py3:urllib.request` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``urllib.response`` | See :mod:`six.moves.urllib.response`| :mod:`py3:urllib.response` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``urllib.robotparser`` | :mod:`py2:robotparser` | :mod:`py3:urllib.robotparser` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``urllib_robotparser`` | :mod:`py2:robotparser` | :mod:`py3:urllib.robotparser` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``UserDict`` | :class:`py2:UserDict.UserDict` | :class:`py3:collections.UserDict` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``UserList`` | :class:`py2:UserList.UserList` | :class:`py3:collections.UserList` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``UserString`` | :class:`py2:UserString.UserString` | :class:`py3:collections.UserString` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``winreg`` | :mod:`py2:_winreg` | :mod:`py3:winreg` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``xmlrpc_client`` | :mod:`py2:xmlrpclib` | :mod:`py3:xmlrpc.client` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``xmlrpc_server`` | :mod:`py2:SimpleXMLRPCServer` | :mod:`py3:xmlrpc.server` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``xrange`` | :func:`py2:xrange` | :func:`py3:range` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``zip`` | :func:`py2:itertools.izip` | :func:`py3:zip` | -+------------------------------+-------------------------------------+-------------------------------------+ -| ``zip_longest`` | :func:`py2:itertools.izip_longest` | :func:`py3:itertools.zip_longest` | -+------------------------------+-------------------------------------+-------------------------------------+ ++------------------------------+-------------------------------------+---------------------------------------+ +| Name | Python 2 name | Python 3 name | ++==============================+=====================================+=======================================+ +| ``builtins`` | :mod:`py2:__builtin__` | :mod:`py3:builtins` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``configparser`` | :mod:`py2:ConfigParser` | :mod:`py3:configparser` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``copyreg`` | :mod:`py2:copy_reg` | :mod:`py3:copyreg` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``cPickle`` | :mod:`py2:cPickle` | :mod:`py3:pickle` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``cStringIO`` | :func:`py2:cStringIO.StringIO` | :class:`py3:io.StringIO` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``dbm_gnu`` | :func:`py2:gdbm` | :class:`py3:dbm.gnu` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``_dummy_thread`` | :mod:`py2:dummy_thread` | :mod:`py3:_dummy_thread` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``email_mime_base`` | :mod:`py2:email.MIMEBase` | :mod:`py3:email.mime.base` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``email_mime_image`` | :mod:`py2:email.MIMEImage` | :mod:`py3:email.mime.image` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``email_mime_multipart`` | :mod:`py2:email.MIMEMultipart` | :mod:`py3:email.mime.multipart` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``email_mime_nonmultipart`` | :mod:`py2:email.MIMENonMultipart` | :mod:`py3:email.mime.nonmultipart` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``email_mime_text`` | :mod:`py2:email.MIMEText` | :mod:`py3:email.mime.text` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``filter`` | :func:`py2:itertools.ifilter` | :func:`py3:filter` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``filterfalse`` | :func:`py2:itertools.ifilterfalse` | :func:`py3:itertools.filterfalse` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``getcwd`` | :func:`py2:os.getcwdu` | :func:`py3:os.getcwd` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``getcwdb`` | :func:`py2:os.getcwd` | :func:`py3:os.getcwdb` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``getoutput`` | :func:`py2:commands.getoutput` | :func:`py3:subprocess.getoutput` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``http_cookiejar`` | :mod:`py2:cookielib` | :mod:`py3:http.cookiejar` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``http_cookies`` | :mod:`py2:Cookie` | :mod:`py3:http.cookies` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``html_entities`` | :mod:`py2:htmlentitydefs` | :mod:`py3:html.entities` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``html_parser`` | :mod:`py2:HTMLParser` | :mod:`py3:html.parser` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``http_client`` | :mod:`py2:httplib` | :mod:`py3:http.client` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``BaseHTTPServer`` | :mod:`py2:BaseHTTPServer` | :mod:`py3:http.server` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``CGIHTTPServer`` | :mod:`py2:CGIHTTPServer` | :mod:`py3:http.server` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``SimpleHTTPServer`` | :mod:`py2:SimpleHTTPServer` | :mod:`py3:http.server` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``input`` | :func:`py2:raw_input` | :func:`py3:input` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``intern`` | :func:`py2:intern` | :func:`py3:sys.intern` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``map`` | :func:`py2:itertools.imap` | :func:`py3:map` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``queue`` | :mod:`py2:Queue` | :mod:`py3:queue` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``range`` | :func:`py2:xrange` | :func:`py3:range` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``reduce`` | :func:`py2:reduce` | :func:`py3:functools.reduce` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``reload_module`` | :func:`py2:reload` | :func:`py3:imp.reload`, | +| | | :func:`py3:importlib.reload` | +| | | on Python 3.4+ | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``reprlib`` | :mod:`py2:repr` | :mod:`py3:reprlib` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``shlex_quote`` | :mod:`py2:pipes.quote` | :mod:`py3:shlex.quote` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``socketserver`` | :mod:`py2:SocketServer` | :mod:`py3:socketserver` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``_thread`` | :mod:`py2:thread` | :mod:`py3:_thread` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter`` | :mod:`py2:Tkinter` | :mod:`py3:tkinter` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_dialog`` | :mod:`py2:Dialog` | :mod:`py3:tkinter.dialog` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_filedialog`` | :mod:`py2:FileDialog` | :mod:`py3:tkinter.FileDialog` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_scrolledtext`` | :mod:`py2:ScrolledText` | :mod:`py3:tkinter.scrolledtext` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_simpledialog`` | :mod:`py2:SimpleDialog` | :mod:`py3:tkinter.simpledialog` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_ttk`` | :mod:`py2:ttk` | :mod:`py3:tkinter.ttk` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_tix`` | :mod:`py2:Tix` | :mod:`py3:tkinter.tix` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_constants`` | :mod:`py2:Tkconstants` | :mod:`py3:tkinter.constants` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_dnd`` | :mod:`py2:Tkdnd` | :mod:`py3:tkinter.dnd` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_colorchooser`` | :mod:`py2:tkColorChooser` | :mod:`py3:tkinter.colorchooser` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_commondialog`` | :mod:`py2:tkCommonDialog` | :mod:`py3:tkinter.commondialog` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_tkfiledialog`` | :mod:`py2:tkFileDialog` | :mod:`py3:tkinter.filedialog` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_font`` | :mod:`py2:tkFont` | :mod:`py3:tkinter.font` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_messagebox`` | :mod:`py2:tkMessageBox` | :mod:`py3:tkinter.messagebox` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``tkinter_tksimpledialog`` | :mod:`py2:tkSimpleDialog` | :mod:`py3:tkinter.simpledialog` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``urllib.parse`` | See :mod:`six.moves.urllib.parse` | :mod:`py3:urllib.parse` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``urllib.error`` | See :mod:`six.moves.urllib.error` | :mod:`py3:urllib.error` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``urllib.request`` | See :mod:`six.moves.urllib.request` | :mod:`py3:urllib.request` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``urllib.response`` | See :mod:`six.moves.urllib.response`| :mod:`py3:urllib.response` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``urllib.robotparser`` | :mod:`py2:robotparser` | :mod:`py3:urllib.robotparser` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``urllib_robotparser`` | :mod:`py2:robotparser` | :mod:`py3:urllib.robotparser` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``UserDict`` | :class:`py2:UserDict.UserDict` | :class:`py3:collections.UserDict` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``UserList`` | :class:`py2:UserList.UserList` | :class:`py3:collections.UserList` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``UserString`` | :class:`py2:UserString.UserString` | :class:`py3:collections.UserString` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``winreg`` | :mod:`py2:_winreg` | :mod:`py3:winreg` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``xmlrpc_client`` | :mod:`py2:xmlrpclib` | :mod:`py3:xmlrpc.client` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``xmlrpc_server`` | :mod:`py2:SimpleXMLRPCServer` | :mod:`py3:xmlrpc.server` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``xrange`` | :func:`py2:xrange` | :func:`py3:range` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``zip`` | :func:`py2:itertools.izip` | :func:`py3:zip` | ++------------------------------+-------------------------------------+---------------------------------------+ +| ``zip_longest`` | :func:`py2:itertools.izip_longest` | :func:`py3:itertools.zip_longest` | ++------------------------------+-------------------------------------+---------------------------------------+ urllib parse <<<<<<<<<<<< @@ -715,7 +721,8 @@ * :func:`py2:urllib.quote_plus` * :func:`py2:urllib.splittag` * :func:`py2:urllib.splituser` -* :func:`py2:urllib.unquote` +* :func:`py2:urllib.splitvalue` +* :func:`py2:urllib.unquote` (also exposed as :func:`py3:urllib.parse.unquote_to_bytes`) * :func:`py2:urllib.unquote_plus` * :func:`py2:urllib.urlencode` @@ -762,6 +769,8 @@ * :func:`py2:urllib2.urlopen` * :func:`py2:urllib2.install_opener` * :func:`py2:urllib2.build_opener` +* :func:`py2:urllib2.parse_http_list` +* :func:`py2:urllib2.parse_keqv_list` * :class:`py2:urllib2.Request` * :class:`py2:urllib2.OpenerDirector` * :class:`py2:urllib2.HTTPDefaultErrorHandler` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/setup.cfg new/six-1.11.0/setup.cfg --- old/six-1.10.0/setup.cfg 2015-10-07 05:17:36.000000000 +0200 +++ new/six-1.11.0/setup.cfg 2017-09-17 20:46:53.000000000 +0200 @@ -1,11 +1,11 @@ -[wheel] +[bdist_wheel] universal = 1 [flake8] max-line-length = 100 ignore = F821 -[pytest] +[tool:pytest] minversion = 2.2.0 pep8ignore = documentation/*.py ALL @@ -16,7 +16,6 @@ six.py UndefinedName [egg_info] -tag_date = 0 -tag_svn_revision = 0 tag_build = +tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/setup.py new/six-1.11.0/setup.py --- old/six-1.10.0/setup.py 2014-01-05 06:35:26.000000000 +0100 +++ new/six-1.11.0/setup.py 2017-09-17 20:46:32.000000000 +0200 @@ -1,5 +1,28 @@ +# Copyright (c) 2010-2017 Benjamin Peterson +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + from __future__ import with_statement +# Six is a dependency of setuptools, so using setuptools creates a +# circular dependency when building a Python stack from source. We +# therefore allow falling back to distutils to install six. try: from setuptools import setup except ImportError: @@ -16,7 +39,7 @@ "Topic :: Utilities", ] -with open("README", "r") as fp: +with open("README.rst", "r") as fp: six_long_description = fp.read() setup(name="six", @@ -24,6 +47,7 @@ author="Benjamin Peterson", author_email="benjamin(a)python.org", url="http://pypi.python.org/pypi/six/", + tests_require=["pytest"], py_modules=["six"], description="Python 2 and 3 compatibility utilities", long_description=six_long_description, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/six.egg-info/PKG-INFO new/six-1.11.0/six.egg-info/PKG-INFO --- old/six-1.10.0/six.egg-info/PKG-INFO 2015-10-07 05:17:36.000000000 +0200 +++ new/six-1.11.0/six.egg-info/PKG-INFO 2017-09-17 20:46:53.000000000 +0200 @@ -1,12 +1,21 @@ Metadata-Version: 1.1 Name: six -Version: 1.10.0 +Version: 1.11.0 Summary: Python 2 and 3 compatibility utilities Home-page: http://pypi.python.org/pypi/six/ Author: Benjamin Peterson Author-email: benjamin(a)python.org License: MIT -Description: Six is a Python 2 and 3 compatibility library. It provides utility functions +Description: .. image:: http://img.shields.io/pypi/v/six.svg + :target: https://pypi.python.org/pypi/six + + .. image:: https://travis-ci.org/benjaminp/six.svg?branch=master + :target: https://travis-ci.org/benjaminp/six + + .. image:: http://img.shields.io/badge/license-MIT-green.svg + :target: https://github.com/benjaminp/six/blob/master/LICENSE + + Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on both Python versions. See the documentation for more information on what is provided. @@ -15,9 +24,9 @@ file, so it can be easily copied into your project. (The copyright and license notice must be retained.) - Online documentation is at https://pythonhosted.org/six/. + Online documentation is at http://six.rtfd.org. - Bugs can be reported to https://bitbucket.org/gutworth/six. The code can also + Bugs can be reported to https://github.com/benjaminp/six. The code can also be found there. For questions about six or porting in general, email the python-porting mailing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/six.egg-info/SOURCES.txt new/six-1.11.0/six.egg-info/SOURCES.txt --- old/six-1.10.0/six.egg-info/SOURCES.txt 2015-10-07 05:17:36.000000000 +0200 +++ new/six-1.11.0/six.egg-info/SOURCES.txt 2017-09-17 20:46:53.000000000 +0200 @@ -1,7 +1,7 @@ CHANGES LICENSE MANIFEST.in -README +README.rst setup.cfg setup.py six.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/six.py new/six-1.11.0/six.py --- old/six-1.10.0/six.py 2015-10-07 05:12:22.000000000 +0200 +++ new/six-1.11.0/six.py 2017-09-17 20:46:32.000000000 +0200 @@ -1,6 +1,4 @@ -"""Utilities for writing code that runs on Python 2 and 3""" - -# Copyright (c) 2010-2015 Benjamin Peterson +# Copyright (c) 2010-2017 Benjamin Peterson # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,6 +18,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +"""Utilities for writing code that runs on Python 2 and 3""" + from __future__ import absolute_import import functools @@ -29,7 +29,7 @@ import types __author__ = "Benjamin Peterson <benjamin(a)python.org>" -__version__ = "1.10.0" +__version__ = "1.11.0" # Useful for very coarse version differentiation. @@ -241,6 +241,7 @@ MovedAttribute("map", "itertools", "builtins", "imap", "map"), MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), + MovedAttribute("getoutput", "commands", "subprocess"), MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), MovedAttribute("reduce", "__builtin__", "functools"), @@ -262,10 +263,11 @@ MovedModule("html_entities", "htmlentitydefs", "html.entities"), MovedModule("html_parser", "HTMLParser", "html.parser"), MovedModule("http_client", "httplib", "http.client"), + MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), + MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"), MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"), MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"), MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"), - MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), @@ -337,10 +339,12 @@ MovedAttribute("quote_plus", "urllib", "urllib.parse"), MovedAttribute("unquote", "urllib", "urllib.parse"), MovedAttribute("unquote_plus", "urllib", "urllib.parse"), + MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"), MovedAttribute("urlencode", "urllib", "urllib.parse"), MovedAttribute("splitquery", "urllib", "urllib.parse"), MovedAttribute("splittag", "urllib", "urllib.parse"), MovedAttribute("splituser", "urllib", "urllib.parse"), + MovedAttribute("splitvalue", "urllib", "urllib.parse"), MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), MovedAttribute("uses_params", "urlparse", "urllib.parse"), @@ -416,6 +420,8 @@ MovedAttribute("URLopener", "urllib", "urllib.request"), MovedAttribute("FancyURLopener", "urllib", "urllib.request"), MovedAttribute("proxy_bypass", "urllib", "urllib.request"), + MovedAttribute("parse_http_list", "urllib2", "urllib.request"), + MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), ] for attr in _urllib_request_moved_attributes: setattr(Module_six_moves_urllib_request, attr.name, attr) @@ -679,11 +685,15 @@ exec_ = getattr(moves.builtins, "exec") def reraise(tp, value, tb=None): - if value is None: - value = tp() - if value.__traceback__ is not tb: - raise value.with_traceback(tb) - raise value + try: + if value is None: + value = tp() + if value.__traceback__ is not tb: + raise value.with_traceback(tb) + raise value + finally: + value = None + tb = None else: def exec_(_code_, _globs_=None, _locs_=None): @@ -699,19 +709,28 @@ exec("""exec _code_ in _globs_, _locs_""") exec_("""def reraise(tp, value, tb=None): - raise tp, value, tb + try: + raise tp, value, tb + finally: + tb = None """) if sys.version_info[:2] == (3, 2): exec_("""def raise_from(value, from_value): - if from_value is None: - raise value - raise value from from_value + try: + if from_value is None: + raise value + raise value from from_value + finally: + value = None """) elif sys.version_info[:2] > (3, 2): exec_("""def raise_from(value, from_value): - raise value from from_value + try: + raise value from from_value + finally: + value = None """) else: def raise_from(value, from_value): @@ -802,10 +821,14 @@ # This requires a bit of explanation: the basic idea is to make a dummy # metaclass for one level of class instantiation that replaces itself with # the actual metaclass. - class metaclass(meta): + class metaclass(type): def __new__(cls, name, this_bases, d): return meta(name, bases, d) + + @classmethod + def __prepare__(cls, name, this_bases): + return meta.__prepare__(name, bases) return type.__new__(metaclass, 'temporary_class', (), {}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/six-1.10.0/test_six.py new/six-1.11.0/test_six.py --- old/six-1.10.0/test_six.py 2015-03-21 15:15:30.000000000 +0100 +++ new/six-1.11.0/test_six.py 2017-09-17 20:46:32.000000000 +0200 @@ -1,3 +1,23 @@ +# Copyright (c) 2010-2017 Benjamin Peterson +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + import operator import sys import types @@ -212,6 +232,12 @@ assert six.advance_iterator(map(lambda x: x + 1, range(2))) == 1 +def test_getoutput(): + from six.moves import getoutput + output = getoutput('echo "foo"') + assert output == 'foo' + + def test_zip(): from six.moves import zip assert six.advance_iterator(zip(range(2), range(2))) == (0, 0) @@ -708,6 +734,42 @@ assert issubclass(X, Base) assert issubclass(X, Base2) assert X.__mro__ == (X, Base, Base2, object) + class X(six.with_metaclass(Meta)): + pass + class MetaSub(Meta): + pass + class Y(six.with_metaclass(MetaSub, X)): + pass + assert type(Y) is MetaSub + assert Y.__mro__ == (Y, X, object) + + +(a)py.test.mark.skipif("sys.version_info[:2] < (3, 0)") +def test_with_metaclass_prepare(): + """Test that with_metaclass causes Meta.__prepare__ to be called with the correct arguments.""" + + class MyDict(dict): + pass + + class Meta(type): + + @classmethod + def __prepare__(cls, name, bases): + namespace = MyDict(super().__prepare__(name, bases), cls=cls, bases=bases) + namespace['namespace'] = namespace + return namespace + + class Base(object): + pass + + bases = (Base,) + + class X(six.with_metaclass(Meta, *bases)): + pass + + assert getattr(X, 'cls', type) is Meta + assert getattr(X, 'bases', ()) == bases + assert isinstance(getattr(X, 'namespace', {}), MyDict) def test_wraps():

1 0

commit libpt2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Sep '17

29 Sep '17

Hello community, here is the log from the commit of package libpt2 for openSUSE:Factory checked in at 2017-09-29 11:52:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpt2 (Old) and /work/SRC/openSUSE:Factory/.libpt2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpt2" Fri Sep 29 11:52:43 2017 rev:40 rq:529088 version:2.10.11 Changes: -------- --- /work/SRC/openSUSE:Factory/libpt2/libpt2.changes 2017-09-12 19:37:39.380707873 +0200 +++ /work/SRC/openSUSE:Factory/.libpt2.new/libpt2.changes 2017-09-29 11:52:46.168943126 +0200 @@ -1,0 +2,11 @@ +Wed Sep 27 16:11:35 UTC 2017 - dimstar(a)opensuse.org + +- Disable esd plugin (openSUSE has moved through various other + sound daemons since esd was useful): + + Drop esound-devel BuildRequires + + No longer pass --enable-esd to configure + + Drop libpt2_10_11-plugins-esd subpackage. +- Add an explicit alsa-devel BuildRequires: this uses to be pulled + in by esound devel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpt2.spec ++++++ --- /var/tmp/diff_new_pack.ewCDmX/_old 2017-09-29 11:52:49.284503792 +0200 +++ /var/tmp/diff_new_pack.ewCDmX/_new 2017-09-29 11:52:49.288503228 +0200 @@ -49,9 +49,9 @@ # PATCH-FIX-UPSTREAM libpt2-openssl11.patch boo#1055477 mgorse(a)suse.com -- port to OpenSSL 1.1. Patch8: libpt2-openssl11.patch BuildRequires: SDL-devel +BuildRequires: alsa-devel BuildRequires: bison BuildRequires: cyrus-sasl-devel -BuildRequires: esound-devel BuildRequires: flex BuildRequires: gcc-c++ %if %{build_avc} @@ -113,18 +113,6 @@ This package includes header files and scripts needed for developers using the %{name} library. -%package -n libpt%{_version}-plugins-esd - -Summary: ESD plugin for %{name} -Group: System/Libraries -Requires: libpt%{_version} = %{version} -# No idea about why this provides is here. Feel free to remove it if you think -# is the best thing to do... or to add an explanation about why it is useful. -Provides: libpt2-audio-plugin - -%description -n libpt%{_version}-plugins-esd -This plugin enables ESD (Enlightened Sound Daemon) support in %{name}. - %if %{build_avc} %package -n libpt%{_version}-plugins-avc @@ -203,7 +191,6 @@ #CXXFLAGS and CFLAGS are mixed up in the Makefiles.. export CFLAGS="%optflags -fvisibility-inlines-hidden" %configure \ - --enable-esd \ --enable-oss \ --enable-pulse \ %if %{build_v4l} @@ -250,10 +237,6 @@ %{_libdir}/libpt.so %{_libdir}/pkgconfig/ptlib.pc -%files -n libpt%{_version}-plugins-esd -%defattr(-,root,root) -%{_libdir}/%{_name}-%{version}/devices/sound/esd_pwplugin.so - %if %{build_avc} %files -n libpt%{_version}-plugins-avc

1 0