We have two of the exact same backported file. Get rid of one. Also, handle the except if we can't import so we don't get stacktraces. (Currently the three functions affected are not used.)

2017-02-08 22:42:19 -08:00
parent e535f050c1
commit 23c6f2add5
4 changed files with 15 additions and 268 deletions
--- a/gui/builtinContextMenus/damagePattern.py
+++ b/gui/builtinContextMenus/damagePattern.py
@@ -10,7 +10,7 @@ from service.damagePattern import DamagePattern as import_DamagePattern
 try:
    from collections import OrderedDict
 except ImportError:
-    from gui.utils.compat import OrderedDict
+    from utils.compat import OrderedDict


 class DamagePattern(ContextMenu):