diff options
author | Britney Fransen <brfransen@gmail.com> | 2013-10-16 20:41:16 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2013-10-16 20:41:16 (GMT) |
commit | 4fb36a904c3818185105d2fe09adc512c46285c7 (patch) | |
tree | 56c1deb162824e4695133a955a6022e90282dd79 /abs/core/python_modules/pygobject2/python3-fix-maketrans.patch | |
parent | 2648e999d277eac5c3d331a3609bcc73fafbea71 (diff) | |
parent | 36f4b0be52fddbd5f491da90475e69c25bf6903f (diff) | |
download | linhes_pkgbuild-4fb36a904c3818185105d2fe09adc512c46285c7.zip linhes_pkgbuild-4fb36a904c3818185105d2fe09adc512c46285c7.tar.gz linhes_pkgbuild-4fb36a904c3818185105d2fe09adc512c46285c7.tar.bz2 |
Merge branch 'testing'
Diffstat (limited to 'abs/core/python_modules/pygobject2/python3-fix-maketrans.patch')
-rw-r--r-- | abs/core/python_modules/pygobject2/python3-fix-maketrans.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch b/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e7..0000000 --- a/abs/core/python_modules/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 |