diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /testing/pygobject2/python3-fix-maketrans.patch | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'testing/pygobject2/python3-fix-maketrans.patch')
-rw-r--r-- | testing/pygobject2/python3-fix-maketrans.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/testing/pygobject2/python3-fix-maketrans.patch b/testing/pygobject2/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e77c..000000000 --- a/testing/pygobject2/python3-fix-maketrans.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 |