From eecf1ac9c175346e1ba027f9f444ca16798021b7 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Mon, 27 May 2013 14:49:40 -0400 Subject: [PATCH] Modernize: Unicode literals --- pynum2word/num2word.py | 1 + pynum2word/num2word_DE.py | 1 + pynum2word/num2word_EN.py | 2 +- pynum2word/num2word_EN_EUR.py | 2 +- pynum2word/num2word_EN_GB.py | 2 +- pynum2word/num2word_EN_GB_old.py | 1 + pynum2word/num2word_ES.py | 1 + pynum2word/num2word_EU.py | 1 + pynum2word/num2word_FR.py | 1 + pynum2word/num2word_LT.py | 1 + pynum2word/num2word_base.py | 3 +-- 11 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pynum2word/num2word.py b/pynum2word/num2word.py index 3d92c24..6440eac 100644 --- a/pynum2word/num2word.py +++ b/pynum2word/num2word.py @@ -27,6 +27,7 @@ Notes: History: 0.2: n2w, to_card, to_ord, to_ordnum now imported correctly ''' +from __future__ import unicode_literals import locale as _locale # Correct omissions in locale: diff --git a/pynum2word/num2word_DE.py b/pynum2word/num2word_DE.py index 59abd9f..3d536be 100644 --- a/pynum2word/num2word_DE.py +++ b/pynum2word/num2word_DE.py @@ -28,6 +28,7 @@ History add to_currency() and to_year() ''' +from __future__ import unicode_literals from num2word_EU import Num2Word_EU #//TODO: Use German error messages diff --git a/pynum2word/num2word_EN.py b/pynum2word/num2word_EN.py index 5cc4e84..7204771 100644 --- a/pynum2word/num2word_EN.py +++ b/pynum2word/num2word_EN.py @@ -35,7 +35,7 @@ History: 1.1: to_ordinal_num() fixed for 11,12,13 ''' -from __future__ import division +from __future__ import division, unicode_literals import num2word_EU diff --git a/pynum2word/num2word_EN_EUR.py b/pynum2word/num2word_EN_EUR.py index 15355e8..bc504c0 100644 --- a/pynum2word/num2word_EN_EUR.py +++ b/pynum2word/num2word_EN_EUR.py @@ -29,7 +29,7 @@ Usage: ''' - +from __future__ import unicode_literals from num2word_EN import Num2Word_EN diff --git a/pynum2word/num2word_EN_GB.py b/pynum2word/num2word_EN_GB.py index 4a9b060..9fbdd41 100644 --- a/pynum2word/num2word_EN_GB.py +++ b/pynum2word/num2word_EN_GB.py @@ -31,7 +31,7 @@ Usage: History: 1.0: Split from num2word_EN with the addition of to_currency() ''' - +from __future__ import unicode_literals from num2word_EN import Num2Word_EN diff --git a/pynum2word/num2word_EN_GB_old.py b/pynum2word/num2word_EN_GB_old.py index 012c1ee..723b8d9 100644 --- a/pynum2word/num2word_EN_GB_old.py +++ b/pynum2word/num2word_EN_GB_old.py @@ -25,6 +25,7 @@ History: Todo: Currency (pounds/shillings/pence) ''' +from __future__ import unicode_literals from num2word_EN_GB import Num2Word_EN_GB class Num2Word_EN_GB_old(Num2Word_EN_GB): diff --git a/pynum2word/num2word_ES.py b/pynum2word/num2word_ES.py index ff9c05c..c4d70d0 100644 --- a/pynum2word/num2word_ES.py +++ b/pynum2word/num2word_ES.py @@ -27,6 +27,7 @@ History: String interpolation where it makes things clearer add to_currency() ''' +from __future__ import unicode_literals from num2word_EU import Num2Word_EU #//TODO: correct orthographics diff --git a/pynum2word/num2word_EU.py b/pynum2word/num2word_EU.py index 5c0e4dd..e954b48 100644 --- a/pynum2word/num2word_EU.py +++ b/pynum2word/num2word_EU.py @@ -19,6 +19,7 @@ Data from: History: 1.1: add to_currency() ''' +from __future__ import unicode_literals from num2word_base import Num2Word_Base class Num2Word_EU(Num2Word_Base): diff --git a/pynum2word/num2word_FR.py b/pynum2word/num2word_FR.py index 5034543..de82581 100644 --- a/pynum2word/num2word_FR.py +++ b/pynum2word/num2word_FR.py @@ -30,6 +30,7 @@ History: String interpolation where it makes things clearer to_currency() added [to_year works by default] ''' +from __future__ import unicode_literals from num2word_EU import Num2Word_EU #//TODO: error messages in French diff --git a/pynum2word/num2word_LT.py b/pynum2word/num2word_LT.py index c7d8e74..8c5811f 100644 --- a/pynum2word/num2word_LT.py +++ b/pynum2word/num2word_LT.py @@ -72,6 +72,7 @@ tūkstantis du šimtai trisdešimt keturi litai, penkiasdešimt šeši centai >>> print(to_currency(-1251985, cents = False)) minus dvylika tūkstančių penki šimtai devyniolika litų, 85 centai """ +from __future__ import unicode_literals ZERO = (u'nulis',) diff --git a/pynum2word/num2word_base.py b/pynum2word/num2word_base.py index 3f55de5..6cb0b19 100644 --- a/pynum2word/num2word_base.py +++ b/pynum2word/num2word_base.py @@ -17,8 +17,7 @@ History: add to_year() and to_currency() stubs ''' - -from __future__ import generators +from __future__ import unicode_literals from orderedmapping import OrderedMapping