diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 01:20:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 01:20:56 +0200 |
| commit | 2c2303685cdab351114c511e3f937e04d342367a (patch) | |
| tree | 18c73e99e1395738657ef23541f6d78583e16b7a /ishtar_common/data_importer.py | |
| parent | b39dbce58b8be027d9a9303faa506c9f426c9e1b (diff) | |
| parent | a36a82f28ee691b420978e1a5b1dfd9b21580c6c (diff) | |
| download | Ishtar-2c2303685cdab351114c511e3f937e04d342367a.tar.bz2 Ishtar-2c2303685cdab351114c511e3f937e04d342367a.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/data_importer.py
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 4f15e8695..d0f4805db 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -119,7 +119,9 @@ class UnicodeFormater(Formater): def format(self, value): try: - value = unicode(value.strip()) + value = value.strip() + if type(value) != unicode: + value = unicode(value.strip()) if self.re_filter: m = self.re_filter.match(value) if m: |