Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/persistencia.py
diff options
context:
space:
mode:
authorGonzalo Odiard <gonzalo@nautilus.localdomain>2010-01-24 16:57:10 (GMT)
committer Gonzalo Odiard <gonzalo@nautilus.localdomain>2010-01-24 16:57:10 (GMT)
commita8205ece600eebaa97637b8d42255d2adc955e30 (patch)
tree188b7089a37b8c6c4c736f2ee5326b82e507a424 /persistencia.py
parent9b44554b5427e298976e9746e7683907c81674d5 (diff)
correcciones a la persistencia en las XO-1
Diffstat (limited to 'persistencia.py')
-rw-r--r--persistencia.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/persistencia.py b/persistencia.py
index bb50439..742c747 100644
--- a/persistencia.py
+++ b/persistencia.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF_8 -*-
-
import os, sys
import simplejson
import globos
@@ -94,10 +92,10 @@ class Persistence:
print "file_name", file_name
z = zipfile.ZipFile(file_name, "w")
- z.write(os.path.join(instance_path,data_file_name),data_file_name)
+ z.write(os.path.join(instance_path,data_file_name).encode('ascii','ignore'),data_file_name.encode('ascii','ignore'))
for box in page.boxs:
if (box.image_name != ''):
- z.write(os.path.join(instance_path,box.image_name),box.image_name)
+ z.write(os.path.join(instance_path,box.image_name).encode('ascii','ignore'),box.image_name.encode('ascii','ignore'))
z.close()
@@ -134,10 +132,7 @@ class Persistence:
page.add_box_from_journal_image(None)
primero = False
box = page.get_active_box()
- if (boxData["image_name"] != ''):
- box.image_name = os.path.join(instance_path,boxData["image_name"])
- else:
- box.image_name = ''
+ box.image_name = boxData["image_name"]
for globoData in boxData["globes"]:
globo_x,globo_y = globoData['x'],globoData['y']
globo_modo = None