Correction #336

diff --git a/.gitignore b/.gitignore
index f3a6bf6..be7fe89 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# All compiled binaries..
+# binaires
 *.pyc
 *.pyo
 
@@ -6,9 +6,11 @@
 .*.swp
 *~
 \#*#
+
+# DB de dev
 *.db
 
-# Ignore merged stuff
+# restants de merge
 *.orig
 *.rej
 
@@ -16,9 +18,6 @@
 conf.py
 django.wsgi
 
-# les évaluations passées en PDF
-evaluation/docs/*
-
 # buildout
 .installed.cfg
 bin
@@ -27,5 +26,7 @@ downloads
 eggs
 log
 parts
-project/media/uploads
 tmp
+build
+dist
+*.egg-info

diff --git a/django_exportateur/exportateur.py b/django_exportateur/exportateur.py
index a905c15..c1c544a 100644 (file)
--- a/django_exportateur/exportateur.py
+++ b/django_exportateur/exportateur.py
@@ -19,6 +19,12 @@ def export_csv (headers, data):
 
     return buffer.getvalue ()
 
+def txt(msg):
+    text = msg
+    if not isinstance(msg, unicode):
+        text = unicode (msg, "utf-8")
+    return text
+
 def export_ods (headers, data):
     doc = OpenDocumentSpreadsheet()
     style = Style(name="Large number", family="table-cell")
@@ -35,7 +41,7 @@ def export_ods (headers, data):
         for item in headers:
             tc = TableCell ()
             tr.addElement (tc)
-            p = P(stylename = style, text = unicode (item, "utf-8"))
+            p = P(stylename = style, text = txt(item))
             tc.addElement (p)
 
     for line in data:
@@ -44,7 +50,7 @@ def export_ods (headers, data):
         for item in line:
             tc = TableCell ()
             tr.addElement (tc)
-            p = P (stylename = style, text = unicode (item, "utf-8"))
+            p = P (stylename = style, text = txt(item))
             tc.addElement (p)
 
     doc.spreadsheet.addElement(table)

diff --git a/setup.py b/setup.py
index 36199f8..a5f5da0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,19 @@
 from setuptools import setup
 
-version = '1.0'
+version = '1.0.1'
 
 setup(
-    name='django_exportateur',
+    name='django-exportateur',
     version=version,
-    description="Outils d'exportation en csv/ods",
+    description="Outils d'exportation en csv/ods (test nom package)",
     long_description="""
 """,
     keywords='django, export, csv, ods',
     author='Cyril Robert',
     author_email='cyril.robert@auf.org',
     license='GPL',
-    packages=['django_exportateur'],
-    package_dir={'django_exportateur': 'django_exportateur'},
+    packages=['django-exportateur'],
+    package_dir={'django-exportateur': 'django_exportateur'},
     include_package_data=True,
     zip_safe=True,
     install_requires=['django', 'odfpy'],