diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
| commit | fd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch) | |
| tree | d2b16d75c64d947545149f37bda7cdb8873a4770 /extra/pygobject2/python3-fix-maketrans.patch | |
| parent | 7823c9009a845174746fd0da09af46a138481851 (diff) | |
| parent | 10aa61ef39e662453e1d817046e359372fe3b326 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-pl/PKGBUILD
community/gloox/PKGBUILD
community/libircclient/PKGBUILD
community/mashup/PKGBUILD
community/omniorb/PKGBUILD
community/openbox/PKGBUILD
community/patchutils/PKGBUILD
community/rxvt-unicode/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt5/PKGBUILD
extra/samba/PKGBUILD
extra/tdb/PKGBUILD
extra/transmission/PKGBUILD
extra/vim/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'extra/pygobject2/python3-fix-maketrans.patch')
| -rw-r--r-- | extra/pygobject2/python3-fix-maketrans.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/extra/pygobject2/python3-fix-maketrans.patch b/extra/pygobject2/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e77c..000000000 --- a/extra/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 |