From 2c93c35aa7972b502ddbda69b35cb40773317647 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 13 Jul 2023 12:55:19 +0200
Subject: [PATCH] Fix: robustifie export xml de groupes sans noms

---
 app/scodoc/sco_formation_recap.py | 3 ++-
 app/scodoc/sco_groups.py          | 8 ++++----
 sco_version.py                    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/scodoc/sco_formation_recap.py b/app/scodoc/sco_formation_recap.py
index c940b76e..7717e4f9 100644
--- a/app/scodoc/sco_formation_recap.py
+++ b/app/scodoc/sco_formation_recap.py
@@ -28,13 +28,14 @@
 """Table recap formation (avec champs éditables)
 """
 import io
-from zipfile import ZipFile, BadZipfile
+from zipfile import ZipFile
 
 from flask import Response
 from flask import send_file, url_for
 from flask import g, request
 from flask_login import current_user
 
+from app import db
 from app.models import Formation, FormSemestre, Matiere, Module, UniteEns
 
 from app.scodoc.gen_tables import GenTable
diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py
index 8486fa95..17b76f2c 100644
--- a/app/scodoc/sco_groups.py
+++ b/app/scodoc/sco_groups.py
@@ -587,7 +587,7 @@ def XMLgetGroupsInPartition(partition_id):  # was XMLgetGroupesTD
         x_group = Element(
             "group",
             partition_id=str(partition_id),
-            partition_name=partition["partition_name"],
+            partition_name=partition["partition_name"] or "",
             groups_editable=str(int(partition["groups_editable"])),
             group_id="_none_",
             group_name="",
@@ -599,9 +599,9 @@ def XMLgetGroupsInPartition(partition_id):  # was XMLgetGroupesTD
                 Element(
                     "etud",
                     etudid=str(etud["etudid"]),
-                    sexe=etud["civilite_str"],
-                    nom=sco_etud.format_nom(etud["nom"]),
-                    prenom=sco_etud.format_prenom(etud["prenom"]),
+                    sexe=etud["civilite_str"] or "",
+                    nom=sco_etud.format_nom(etud["nom"] or ""),
+                    prenom=sco_etud.format_prenom(etud["prenom"] or ""),
                     origin=_comp_etud_origin(etud, formsemestre),
                 )
             )
diff --git a/sco_version.py b/sco_version.py
index 10a961f9..99628f42 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.5.2"
+SCOVERSION = "9.5.3"
 
 SCONAME = "ScoDoc"