[Python-modules-commits] r28328 - in packages/babelfish/trunk/debian (4 files)

[emillon-guest at users.alioth.debian.org]

    Date: Thursday, March 27, 2014 @ 09:10:55
  Author: emillon-guest
Revision: 28328

babelfish: fix for #742686

Added:
  packages/babelfish/trunk/debian/patches/
  packages/babelfish/trunk/debian/patches/getattr-recursion.patch
  packages/babelfish/trunk/debian/patches/series
Modified:
  packages/babelfish/trunk/debian/changelog

Modified: packages/babelfish/trunk/debian/changelog
===================================================================
--- packages/babelfish/trunk/debian/changelog	2014-03-25 20:44:59 UTC (rev 28327)
+++ packages/babelfish/trunk/debian/changelog	2014-03-27 09:10:55 UTC (rev 28328)
@@ -1,3 +1,9 @@
+babelfish (0.5.1-2) UNRELEASED; urgency=medium
+
+  * Fix infinite loop with getattr on python 3.4 (Closes: #742686)
+
+ -- Etienne Millon <me at emillon.org>  Wed, 26 Mar 2014 13:23:33 +0100
+
 babelfish (0.5.1-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/babelfish/trunk/debian/patches/getattr-recursion.patch
===================================================================
--- packages/babelfish/trunk/debian/patches/getattr-recursion.patch	                        (rev 0)
+++ packages/babelfish/trunk/debian/patches/getattr-recursion.patch	2014-03-27 09:10:55 UTC (rev 28328)
@@ -0,0 +1,41 @@
+From: Toilal <toilal.dev at gmail.com>
+Date: Wed, 26 Mar 2014 11:36:16 +0100
+Subject: [PATCH] Fix bug #16.
+
+Origin: commit:280b9cfe55f24ca5a26b5786a21fd4c0589f4139
+Bug-Debian: http://bug.debian.org/742686
+Reviewed-by: Etienne Millon <me at emillon.org>
+---
+ babelfish/country.py  | 2 +-
+ babelfish/language.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/babelfish/country.py b/babelfish/country.py
+index 83641fc..6cdd0fa 100644
+--- a/babelfish/country.py
++++ b/babelfish/country.py
+@@ -43,7 +43,7 @@ class CountryMeta(type):
+     def __getattr__(cls, name):
+         if name.startswith('from'):
+             return partial(cls.fromcode, converter=name[4:])
+-        return getattr(cls, name)
++        return type.__getattribute__(cls, name)
+ 
+ 
+ class Country(CountryMeta(str('CountryBase'), (object,), {})):
+diff --git a/babelfish/language.py b/babelfish/language.py
+index ffa48ef..e2e6235 100644
+--- a/babelfish/language.py
++++ b/babelfish/language.py
+@@ -52,7 +52,7 @@ class LanguageMeta(type):
+     def __getattr__(cls, name):
+         if name.startswith('from'):
+             return partial(cls.fromcode, converter=name[4:])
+-        return getattr(cls, name)
++        return type.__getattribute__(cls, name)
+ 
+ 
+ class Language(LanguageMeta(str('LanguageBase'), (object,), {})):
+-- 
+1.8.5.5
+

Added: packages/babelfish/trunk/debian/patches/series
===================================================================
--- packages/babelfish/trunk/debian/patches/series	                        (rev 0)
+++ packages/babelfish/trunk/debian/patches/series	2014-03-27 09:10:55 UTC (rev 28328)
@@ -0,0 +1 @@
+getattr-recursion.patch