5 files changed, 19 insertions, 64 deletions

diff --git a/math/py-gato/files/patch-Gato.py b/math/py-gato/files/patch-Gato.py
index c9ff38cbbaab..be050b9feeab 100644
--- a/math/py-gato/files/patch-Gato.py
+++ b/math/py-gato/files/patch-Gato.py
@@ -1,17 +1,10 @@
---- Gato.py.orig	Wed May 16 13:16:55 2001
-+++ Gato.py	Mon Sep  3 12:26:21 2001
-@@ -38,7 +38,6 @@
- import bdb
- import whrandom
- import re 
--import regsub
- import string
- import StringIO
- import tokenize
-@@ -49,13 +48,13 @@
+--- Gato.py.dist	Thu Dec 18 00:34:01 2003
++++ Gato.py	Thu Dec 18 00:35:50 2003
+@@ -54,15 +54,15 @@
+ from tkFileDialog import askopenfilename, asksaveasfilename
+ from tkMessageBox import askokcancel, showerror, askyesno
  from ScrolledText import ScrolledText
- 
- 
+-from GatoConfiguration import GatoConfiguration
 -from Graph import Graph
 -from GraphUtil import *
 -from GraphDisplay import GraphDisplayToplevel
@@ -19,6 +12,8 @@
 -from GatoGlobals import *
 -from GatoDialogs import AboutBox, SplashScreen, HTMLViewer
 -import GatoIcons
+-import GatoSystemConfiguration
++from Gato.GatoConfiguration import GatoConfiguration
 +from Gato.Graph import Graph
 +from Gato.GraphUtil import *
 +from Gato.GraphDisplay import GraphDisplayToplevel
@@ -26,19 +21,11 @@
 +from Gato.GatoGlobals import *
 +from Gato.GatoDialogs import AboutBox, SplashScreen, HTMLViewer
 +from Gato import GatoIcons
++import Gato.GatoSystemConfiguration
  
  # put someplace else
  def WMExtrasGeometry(window):
-@@ -67,7 +66,7 @@
- 
-         NOTE: Does not work with tk8.0 style menus, since those are
-               handled by WM (according to Tk8.1 docs) """
--    g = regsub.split(window.geometry(),"+") 
-+    g = re.split("\+", window.geometry()) 
-     trueRootx = string.atoi(g[1]) 
-     trueRooty = string.atoi(g[2])
-     
-@@ -1159,11 +1158,11 @@
+@@ -1397,11 +1397,11 @@
  	    self.algoGlobals['A'] = self.GUI.graphDisplay
  	# XXX
  	# explictely loading packages we want to make available to the algorithm
diff --git a/math/py-gato/files/patch-GatoUtil.py b/math/py-gato/files/patch-GatoUtil.py
deleted file mode 100644
index 7cdcf9b766a1..000000000000
--- a/math/py-gato/files/patch-GatoUtil.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- GatoUtil.py.orig	Wed May 16 13:16:56 2001
-+++ GatoUtil.py	Mon Sep  3 12:14:42 2001
-@@ -40,8 +40,8 @@
- 
- def extension(pathAndFile):
-     """ Return ext if path/filename.ext is given """
--    import regsub
--    return regsub.split(stripPath(pathAndFile),"\.")[1]
-+    import re
-+    return re.split("\.", stripPath(pathAndFile))[1]
- 
- def stripPath(pathAndFile):
-     """ Return filename.ext if path/filename.ext is given """
diff --git a/math/py-gato/files/patch-Graph.py b/math/py-gato/files/patch-Graph.py
deleted file mode 100644
index 6d0e4937efbf..000000000000
--- a/math/py-gato/files/patch-Graph.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- Graph.py.orig	Wed May 16 13:16:57 2001
-+++ Graph.py	Fri Aug 31 17:12:01 2001
-@@ -31,7 +31,7 @@
- #
- ################################################################################
- 
--from regsub import split
-+from re import split
- from GatoGlobals import *
- from DataStructures import Point2D, VertexLabeling, EdgeLabeling, EdgeWeight
- from math import log
diff --git a/math/py-gato/files/patch-GraphUtil.py b/math/py-gato/files/patch-GraphUtil.py
index 8c652aaaee22..fe744b91e881 100644
--- a/math/py-gato/files/patch-GraphUtil.py
+++ b/math/py-gato/files/patch-GraphUtil.py
@@ -1,14 +1,5 @@
 --- GraphUtil.py.orig	Wed May 16 13:16:58 2001
 +++ GraphUtil.py	Mon Sep  3 12:21:49 2001
-@@ -31,7 +31,7 @@
- #
- ################################################################################
- 
--from regsub import split
-+from re import split
- from GatoGlobals import *
- from Graph import Graph
- from DataStructures import Point2D, VertexLabeling, EdgeLabeling, EdgeWeight, VertexWeight, Queue
 @@ -223,13 +223,13 @@
  	    break
  
diff --git a/math/py-gato/files/patch-Gred.py b/math/py-gato/files/patch-Gred.py
index cc10c754f8cd..0eb1005f69ca 100644
--- a/math/py-gato/files/patch-Gred.py
+++ b/math/py-gato/files/patch-Gred.py
@@ -1,32 +1,33 @@
---- Gred.py.orig	Wed May 16 13:16:58 2001
-+++ Gred.py	Mon Sep  3 12:01:13 2001
-@@ -31,16 +31,16 @@
+--- Gred.py.orig	Fri Dec  5 13:08:46 2003
++++ Gred.py	Thu Dec 18 00:43:24 2003
+@@ -34,17 +34,17 @@
  #             last change by $Author: schliep $.
  #
  ################################################################################
+-from GatoGlobals import *
+-import GatoGlobals # Needed for help viewer.XXX
 -from Graph import Graph
 -from DataStructures import EdgeWeight, VertexWeight
 -from GraphUtil import OpenCATBoxGraph, OpenGMLGraph, SaveCATBoxGraph, WeightedGraphInformer
 -from GraphEditor import GraphEditor
++from Gato.GatoGlobals import *
++import Gato.GatoGlobals # Needed for help viewer.XXX
 +from Gato.Graph import Graph
 +from Gato.DataStructures import EdgeWeight, VertexWeight
 +from Gato.GraphUtil import OpenCATBoxGraph, OpenGMLGraph, SaveCATBoxGraph, WeightedGraphInformer
 +from Gato.GraphEditor import GraphEditor
  from Tkinter import *
+ import tkFont
 -from GatoUtil import stripPath, extension, gatoPath
--from GatoGlobals import *
 -import GatoDialogs
--import GatoGlobals
 -import GatoIcons
 +from Gato.GatoUtil import stripPath, extension, gatoPath
-+from Gato.GatoGlobals import *
 +from Gato import GatoDialogs
-+from Gato import GatoGlobals
 +from Gato import GatoIcons
  from ScrolledText import *
  
  from tkFileDialog import askopenfilename, asksaveasfilename
-@@ -51,7 +51,8 @@
+@@ -55,7 +55,8 @@
  import sys
  import os