From 160bc22c3d45513d9b23012fd5b14f802407c764 Mon Sep 17 00:00:00 2001
From: Guillaume Raffy <guillaume.raffy@univ-rennes1.fr>
Date: Fri, 30 Oct 2020 18:15:20 +0000
Subject: [PATCH] installed physix92 (bug 2997) and physix93-94 (bug 3000)

---
 PowerDiagram.py | 6 +++---
 inventory.py    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/PowerDiagram.py b/PowerDiagram.py
index 3ab402e..def3298 100644
--- a/PowerDiagram.py
+++ b/PowerDiagram.py
@@ -9,8 +9,8 @@
 import re
 import pygraphviz  # port install py-pygraphviz
 from inventory import Inventory, MachineSpecIdNotFound
-from SimpaDbUtil import SqlFile, SqlDatabaseReader
-from Lib import SimpaDbUtil
+from SimpaDbUtil import SqlFile, SqlDatabaseReader, TableAttrNotFound
+# from Lib import SimpaDbUtil
 
 
 def add_capacity_constraints(capacity1, capacity2):
@@ -265,7 +265,7 @@ class PowerConfig(object):
                 rack_id, rack_slot_index = inventory.get_machine_rack_location(machine_name)
                 machine.rack_id = rack_id
                 machine.rack_slot_index = rack_slot_index
-            except SimpaDbUtil.TableAttrNotFound:
+            except TableAttrNotFound:
                 pass
 
             if re.match('[a-z]+.._..', machine_name):
diff --git a/inventory.py b/inventory.py
index 2760ead..1fc0046 100644
--- a/inventory.py
+++ b/inventory.py
@@ -1,6 +1,7 @@
 # encoding: utf-8
 import datetime
-from Lib import SimpaDbUtil
+#from Lib import SimpaDbUtil
+import SimpaDbUtil
 
 
 class MachineSpecIdNotFound(Exception):