From f0fd0e53a20a237df81c8fc6615d81e66cf270ee Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Mon, 23 Jan 2017 12:01:50 +0530
Subject: [PATCH] Squashed 'moose-gui/' changes from e49ca7d..2ba6bd5

2ba6bd5 cleanup
d0f5918 replace writeKkit to moosewriteKkit
cb067ac correct from writeKkit to mooseWriteKkit
6b1bff4 Ubuntu16.04 with networkx and pygraphviz has some bug, for now small fix, automatic layout will be done spring_layout format
dbe6875 Update .travis.yml
8a71426 Update README.md
fcbacd5 Added travis file to moose-gui.
ddcfbdc Removed shebangs from python scripts.
d5cf170 Fixed the address of Free Software Foundation Inc.
b88d5cc Merge commit 'aca403470ae87f49782542a63c8dcc4649553369'
e0cea9f Squashed 'moose-gui/' changes from 1ef13c9-1ef13c9

git-subtree-dir: moose-gui
git-subtree-split: 2ba6bd5d8e6b022edf3f3aa1a567462ab7ddf6ed
---
 .travis.yml                 | 22 ++++++++++++++++++++++
 PlotWidgetContainer.py      |  2 +-
 README.md                   |  2 ++
 RunWidget.py                |  2 +-
 SettingsDialog.py           |  2 +-
 mload.py                    | 10 +++++-----
 plugins/NeuroKit.py         |  2 +-
 plugins/NeuroKitEditor.py   |  2 +-
 plugins/kkit.py             |  5 +++--
 plugins/kkitOrdinateUtil.py |  6 +++---
 plugins/kkitUtil.py         |  4 +++-
 plugins/modelBuild.py       |  2 +-
 sidebar.py                  |  2 +-
 suds/__init__.py            |  2 +-
 suds/argparser.py           |  2 +-
 suds/bindings/__init__.py   |  2 +-
 suds/bindings/binding.py    |  2 +-
 suds/bindings/document.py   |  2 +-
 suds/bindings/multiref.py   |  2 +-
 suds/bindings/rpc.py        |  2 +-
 suds/builder.py             |  2 +-
 suds/cache.py               |  2 +-
 suds/client.py              |  2 +-
 suds/metrics.py             |  2 +-
 suds/mx/__init__.py         |  2 +-
 suds/mx/appender.py         |  2 +-
 suds/mx/basic.py            |  2 +-
 suds/mx/core.py             |  2 +-
 suds/mx/encoded.py          |  2 +-
 suds/mx/literal.py          |  2 +-
 suds/mx/typer.py            |  2 +-
 suds/options.py             |  2 +-
 suds/plugin.py              |  2 +-
 suds/properties.py          |  2 +-
 suds/reader.py              |  2 +-
 suds/resolver.py            |  2 +-
 suds/sax/__init__.py        |  2 +-
 suds/sax/attribute.py       |  2 +-
 suds/sax/date.py            |  2 +-
 suds/sax/document.py        |  2 +-
 suds/sax/element.py         |  2 +-
 suds/sax/enc.py             |  2 +-
 suds/sax/parser.py          |  2 +-
 suds/sax/text.py            |  2 +-
 suds/servicedefinition.py   |  2 +-
 suds/serviceproxy.py        |  2 +-
 suds/soaparray.py           |  2 +-
 suds/store.py               |  2 +-
 suds/sudsobject.py          |  2 +-
 suds/transport/__init__.py  |  2 +-
 suds/transport/http.py      |  2 +-
 suds/transport/https.py     |  2 +-
 suds/transport/options.py   |  2 +-
 suds/umx/__init__.py        |  2 +-
 suds/umx/attrlist.py        |  2 +-
 suds/umx/basic.py           |  2 +-
 suds/umx/core.py            |  2 +-
 suds/umx/encoded.py         |  2 +-
 suds/umx/typed.py           |  2 +-
 suds/version.py             |  2 +-
 suds/wsdl.py                |  2 +-
 suds/wsse.py                |  2 +-
 suds/xsd/__init__.py        |  2 +-
 suds/xsd/deplist.py         |  2 +-
 suds/xsd/doctor.py          |  2 +-
 suds/xsd/query.py           |  2 +-
 suds/xsd/schema.py          |  2 +-
 suds/xsd/sxbase.py          |  2 +-
 suds/xsd/sxbasic.py         |  2 +-
 suds/xsd/sxbuiltin.py       |  2 +-
 70 files changed, 102 insertions(+), 75 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..5e29a484
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,22 @@
+notifications:
+    email:
+        recipients:
+            - dilawar.s.rajput@gmail.com
+            - upi.bhalla@gmail.com
+            - hrani@ncbs.res.in
+
+
+install:
+    - wget http://download.opensuse.org/repositories/home:moose/xUbuntu_12.04/Release.key
+    - sudo apt-key add - < Release.key  
+    - sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/moose/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/moose.list"
+    - sudo apt-get -y update
+    - sudo apt-get install python3
+    - sudo apt-get -y install moose
+
+script:
+    - # Making sure no python incompatible file is added.
+    - python -m compileall -q .
+    - python -c 'import moose'
+    - python -c 'import moogli'
+    - # More tests here for gui.
diff --git a/PlotWidgetContainer.py b/PlotWidgetContainer.py
index ce9b6b83..f42e0a87 100644
--- a/PlotWidgetContainer.py
+++ b/PlotWidgetContainer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
diff --git a/README.md b/README.md
index 1ec6a410..14d58668 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
+[![Build Status](https://travis-ci.org/BhallaLab/moose-gui.svg?branch=master)](https://travis-ci.org/BhallaLab/moose-gui)
+
 # moose-gui
diff --git a/RunWidget.py b/RunWidget.py
index 0be526f6..dd78a2f9 100644
--- a/RunWidget.py
+++ b/RunWidget.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
diff --git a/SettingsDialog.py b/SettingsDialog.py
index f1a6cad6..bd6ce56b 100644
--- a/SettingsDialog.py
+++ b/SettingsDialog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
diff --git a/mload.py b/mload.py
index 916a33c4..b91e2888 100644
--- a/mload.py
+++ b/mload.py
@@ -129,11 +129,11 @@ def loadFile(filename, target, solver="gsl", merge=True):
     if not istext:
         print 'Cannot handle any binary formats yet'
         return None
-    parent, child = posixpath.split(target)
-    p = moose.Neutral(parent)
-    if not merge and p.path != '/':
-        for ch in p.children:
-            moose.delete(ch)
+    # parent, child = posixpath.split(target)
+    # p = moose.Neutral(parent)
+    # if not merge and p.path != '/':
+    #     for ch in p.children:
+    #         moose.delete(ch)
     try:
         modeltype = mtypes.getType(filename)
         subtype = mtypes.getSubtype(filename, modeltype)
diff --git a/plugins/NeuroKit.py b/plugins/NeuroKit.py
index a1fe476c..00785c77 100644
--- a/plugins/NeuroKit.py
+++ b/plugins/NeuroKit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 
 """
diff --git a/plugins/NeuroKitEditor.py b/plugins/NeuroKitEditor.py
index a29b3edb..e0f9c810 100644
--- a/plugins/NeuroKitEditor.py
+++ b/plugins/NeuroKitEditor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 
 """
diff --git a/plugins/kkit.py b/plugins/kkit.py
index a43aea67..5b79ea6f 100644
--- a/plugins/kkit.py
+++ b/plugins/kkit.py
@@ -2,8 +2,9 @@ import sys
 from PyQt4 import QtGui, QtCore, Qt
 from default import *
 from moose import *
-from moose.genesis import write
+#from moose.genesis import write
 from moose import SBML
+from moose.genesis.writeKkit import mooseWriteKkit
 #sys.path.append('plugins')
 from mplugin import *
 from kkitUtil import *
@@ -113,7 +114,7 @@ class KkitPlugin(MoosePlugin):
                         v['y'] = -yprime
 
                 filename = filename
-                writeerror = write(self.modelRoot,str(filename),self.coOrdinates)
+                writeerror = mooseWriteKkit(self.modelRoot,str(filename),self.coOrdinates)
                 if writeerror == False:
                     QtGui.QMessageBox.information(None,'Could not save the Model','\nCheck the file')
                 else:
diff --git a/plugins/kkitOrdinateUtil.py b/plugins/kkitOrdinateUtil.py
index 01bcafd4..a4ac1bc2 100644
--- a/plugins/kkitOrdinateUtil.py
+++ b/plugins/kkitOrdinateUtil.py
@@ -218,12 +218,12 @@ def autoCoordinates(meshEntry,srcdesConnection):
             else:
                 for items in (items for items in out ):
                     G.add_edge(element(items[0]).path,inn.path)
-    
+    position = nx.spring_layout(G)
     #nx.draw(G,pos=nx.spring_layout(G))
     #position = nx.spring_layout(G)
     #import matplotlib.pyplot as plt
-    #plt.savefig('/home/harsha/Trash/Trash_SBML/test.png')
-    position = nx.graphviz_layout(G, prog = 'dot')
+    #plt.savefig('test.png')
+    #position = nx.graphviz_layout(G, prog = 'dot')
     #agraph = nx.to_agraph(G)
     #agraph.draw("test.png", format = 'png', prog = 'dot')
     xcord = []
diff --git a/plugins/kkitUtil.py b/plugins/kkitUtil.py
index 137daf80..a83a496c 100644
--- a/plugins/kkitUtil.py
+++ b/plugins/kkitUtil.py
@@ -137,6 +137,7 @@ def calculateChildBoundingRect(compt):
     ypos = []
     xpos = []
     for l in compt.childItems():
+
         ''' All the children including pool,reac,enz,polygon(arrow),table '''
         if not isinstance(l,QtSvg.QGraphicsSvgItem):
             if (not isinstance(l,QtGui.QGraphicsPolygonItem)):
@@ -159,4 +160,5 @@ def calculateChildBoundingRect(compt):
         calculateRectcompt = QtCore.QRectF(min(xpos),min(ypos),(max(xpos)-min(xpos)),(max(ypos)-min(ypos)))
     else:
         calculateRectcompt = compt.rect()
-    return calculateRectcompt
\ No newline at end of file
+        
+    return calculateRectcompt
diff --git a/plugins/modelBuild.py b/plugins/modelBuild.py
index 4351ab28..471d8e9e 100644
--- a/plugins/modelBuild.py
+++ b/plugins/modelBuild.py
@@ -47,7 +47,7 @@ def checkCreate(scene,view,modelpath,mobj,string,ret_string,num,event_pos,layout
         
         mobj.volume = 1e-15
         mesh = moose.element(mobj.path+'/mesh')
-        qGItem = ComptItem(scene,pos.toPoint().x(),pos.toPoint().y(),500,500,mobj)
+        qGItem = ComptItem(scene,pos.toPoint().x(),pos.toPoint().y(),100,100,mobj)
         qGItem.setPen(QtGui.QPen(Qt.QColor(66,66,66,100), 1, Qt.Qt.SolidLine, Qt.Qt.RoundCap, Qt.Qt.RoundJoin))
         view.sceneContainerPt.addItem(qGItem)
         qGItem.cmptEmitter.connect(qGItem.cmptEmitter,QtCore.SIGNAL("qgtextPositionChange(PyQt_PyObject)"),layoutPt.positionChange1)
diff --git a/sidebar.py b/sidebar.py
index c989528a..d14b1afc 100644
--- a/sidebar.py
+++ b/sidebar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
diff --git a/suds/__init__.py b/suds/__init__.py
index 1f8a6d90..a9071028 100644
--- a/suds/__init__.py
+++ b/suds/__init__.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/argparser.py b/suds/argparser.py
index 84ac0262..67bdb02b 100644
--- a/suds/argparser.py
+++ b/suds/argparser.py
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jurko Gospodnetić jurko.gospodnetic@pke.hr )
 
 """
diff --git a/suds/bindings/__init__.py b/suds/bindings/__init__.py
index 1704fa9d..27e969ae 100644
--- a/suds/bindings/__init__.py
+++ b/suds/bindings/__init__.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/bindings/binding.py b/suds/bindings/binding.py
index 62f641c2..45966eb4 100644
--- a/suds/bindings/binding.py
+++ b/suds/bindings/binding.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/bindings/document.py b/suds/bindings/document.py
index 84ef566e..898ca5d5 100644
--- a/suds/bindings/document.py
+++ b/suds/bindings/document.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/bindings/multiref.py b/suds/bindings/multiref.py
index 52fa47ad..99005cd2 100644
--- a/suds/bindings/multiref.py
+++ b/suds/bindings/multiref.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/bindings/rpc.py b/suds/bindings/rpc.py
index d164960d..c3fb6aba 100644
--- a/suds/bindings/rpc.py
+++ b/suds/bindings/rpc.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/builder.py b/suds/builder.py
index 8ebfb385..92647496 100644
--- a/suds/builder.py
+++ b/suds/builder.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/cache.py b/suds/cache.py
index e156d191..91f0c0ca 100644
--- a/suds/cache.py
+++ b/suds/cache.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/client.py b/suds/client.py
index d7fda602..2a664fe0 100644
--- a/suds/client.py
+++ b/suds/client.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/metrics.py b/suds/metrics.py
index 9b15f18a..3ac320e4 100644
--- a/suds/metrics.py
+++ b/suds/metrics.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/__init__.py b/suds/mx/__init__.py
index 719e52df..dc8154b8 100644
--- a/suds/mx/__init__.py
+++ b/suds/mx/__init__.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/appender.py b/suds/mx/appender.py
index f900338f..e60dc792 100644
--- a/suds/mx/appender.py
+++ b/suds/mx/appender.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/basic.py b/suds/mx/basic.py
index b2de1611..2bbebfea 100644
--- a/suds/mx/basic.py
+++ b/suds/mx/basic.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/core.py b/suds/mx/core.py
index b7fe24c1..93ae3e05 100644
--- a/suds/mx/core.py
+++ b/suds/mx/core.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/encoded.py b/suds/mx/encoded.py
index ec095368..3c91dc95 100644
--- a/suds/mx/encoded.py
+++ b/suds/mx/encoded.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/literal.py b/suds/mx/literal.py
index 4b3480f7..44f38a30 100644
--- a/suds/mx/literal.py
+++ b/suds/mx/literal.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/mx/typer.py b/suds/mx/typer.py
index dc16fa53..aa52ad32 100644
--- a/suds/mx/typer.py
+++ b/suds/mx/typer.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/options.py b/suds/options.py
index 2b2d4896..de493269 100644
--- a/suds/options.py
+++ b/suds/options.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/plugin.py b/suds/plugin.py
index 3579f5c4..06165682 100644
--- a/suds/plugin.py
+++ b/suds/plugin.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/properties.py b/suds/properties.py
index 5907d943..71032323 100644
--- a/suds/properties.py
+++ b/suds/properties.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/reader.py b/suds/reader.py
index ad71642a..3c8d5833 100644
--- a/suds/reader.py
+++ b/suds/reader.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/resolver.py b/suds/resolver.py
index 2a301696..725e723b 100644
--- a/suds/resolver.py
+++ b/suds/resolver.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/__init__.py b/suds/sax/__init__.py
index be138239..bef78253 100644
--- a/suds/sax/__init__.py
+++ b/suds/sax/__init__.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/attribute.py b/suds/sax/attribute.py
index 61c5ad7a..c775e20f 100644
--- a/suds/sax/attribute.py
+++ b/suds/sax/attribute.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/date.py b/suds/sax/date.py
index c5e5e93d..ac534c48 100644
--- a/suds/sax/date.py
+++ b/suds/sax/date.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jurko Gospodnetić ( jurko.gospodnetic@pke.hr )
 # based on code by: Glen Walker
 # based on code by: Nathan Van Gheem ( vangheem@gmail.com )
diff --git a/suds/sax/document.py b/suds/sax/document.py
index 7a4a615d..8697e088 100644
--- a/suds/sax/document.py
+++ b/suds/sax/document.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/element.py b/suds/sax/element.py
index 084ea2b0..502d90dd 100644
--- a/suds/sax/element.py
+++ b/suds/sax/element.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/enc.py b/suds/sax/enc.py
index 8d3219c8..d15988d7 100644
--- a/suds/sax/enc.py
+++ b/suds/sax/enc.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/parser.py b/suds/sax/parser.py
index a82583a0..2f48b3bf 100644
--- a/suds/sax/parser.py
+++ b/suds/sax/parser.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sax/text.py b/suds/sax/text.py
index 985386e4..ebdbc624 100644
--- a/suds/sax/text.py
+++ b/suds/sax/text.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/servicedefinition.py b/suds/servicedefinition.py
index 6b0e72f8..19ed2435 100644
--- a/suds/servicedefinition.py
+++ b/suds/servicedefinition.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/serviceproxy.py b/suds/serviceproxy.py
index 278c1896..1b6a62f0 100644
--- a/suds/serviceproxy.py
+++ b/suds/serviceproxy.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/soaparray.py b/suds/soaparray.py
index ea04fa7a..474efeae 100644
--- a/suds/soaparray.py
+++ b/suds/soaparray.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/store.py b/suds/store.py
index e5931aa5..58ebf4ac 100644
--- a/suds/store.py
+++ b/suds/store.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/sudsobject.py b/suds/sudsobject.py
index 0c18d5a7..98940099 100644
--- a/suds/sudsobject.py
+++ b/suds/sudsobject.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/transport/__init__.py b/suds/transport/__init__.py
index b193aead..6ffea2dc 100644
--- a/suds/transport/__init__.py
+++ b/suds/transport/__init__.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/transport/http.py b/suds/transport/http.py
index e3d042be..c3f25128 100644
--- a/suds/transport/http.py
+++ b/suds/transport/http.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/transport/https.py b/suds/transport/https.py
index cdff55ab..080315ad 100644
--- a/suds/transport/https.py
+++ b/suds/transport/https.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/transport/options.py b/suds/transport/options.py
index f6a071e0..c4c15529 100644
--- a/suds/transport/options.py
+++ b/suds/transport/options.py
@@ -10,7 +10,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/umx/__init__.py b/suds/umx/__init__.py
index ca65cad1..f6723203 100644
--- a/suds/umx/__init__.py
+++ b/suds/umx/__init__.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/umx/attrlist.py b/suds/umx/attrlist.py
index df8da0bf..128010a2 100644
--- a/suds/umx/attrlist.py
+++ b/suds/umx/attrlist.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/umx/basic.py b/suds/umx/basic.py
index 888a2122..e0b79ccd 100644
--- a/suds/umx/basic.py
+++ b/suds/umx/basic.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/umx/core.py b/suds/umx/core.py
index 4db8eaa7..9ffa3bd4 100644
--- a/suds/umx/core.py
+++ b/suds/umx/core.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/umx/encoded.py b/suds/umx/encoded.py
index bb454e1c..cce56b57 100644
--- a/suds/umx/encoded.py
+++ b/suds/umx/encoded.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/umx/typed.py b/suds/umx/typed.py
index 7ab83298..caca8d36 100644
--- a/suds/umx/typed.py
+++ b/suds/umx/typed.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/version.py b/suds/version.py
index 28f5a90a..d2c92872 100644
--- a/suds/version.py
+++ b/suds/version.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 """
 Module containing the library's version information.
diff --git a/suds/wsdl.py b/suds/wsdl.py
index 987dbc3f..8a5e5584 100644
--- a/suds/wsdl.py
+++ b/suds/wsdl.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/wsse.py b/suds/wsse.py
index c2f7f524..06fe963d 100644
--- a/suds/wsse.py
+++ b/suds/wsse.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/__init__.py b/suds/xsd/__init__.py
index c5d80154..5c5dd8c7 100644
--- a/suds/xsd/__init__.py
+++ b/suds/xsd/__init__.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 
diff --git a/suds/xsd/deplist.py b/suds/xsd/deplist.py
index b813f80f..b686675f 100644
--- a/suds/xsd/deplist.py
+++ b/suds/xsd/deplist.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/doctor.py b/suds/xsd/doctor.py
index 5a52e76c..afef6ae6 100644
--- a/suds/xsd/doctor.py
+++ b/suds/xsd/doctor.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/query.py b/suds/xsd/query.py
index 8f2266b1..62929c9f 100644
--- a/suds/xsd/query.py
+++ b/suds/xsd/query.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/schema.py b/suds/xsd/schema.py
index 00e217ff..33a09486 100644
--- a/suds/xsd/schema.py
+++ b/suds/xsd/schema.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/sxbase.py b/suds/xsd/sxbase.py
index 1ceb8236..28ab8144 100644
--- a/suds/xsd/sxbase.py
+++ b/suds/xsd/sxbase.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/sxbasic.py b/suds/xsd/sxbasic.py
index f6050885..1f55fd98 100644
--- a/suds/xsd/sxbasic.py
+++ b/suds/xsd/sxbasic.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
diff --git a/suds/xsd/sxbuiltin.py b/suds/xsd/sxbuiltin.py
index 3d2c3dde..3fc82aaf 100644
--- a/suds/xsd/sxbuiltin.py
+++ b/suds/xsd/sxbuiltin.py
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
-- 
GitLab