From abfe66caabbfdaee593433f0d770b458faaf5c18 Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Thu, 16 Apr 2015 13:32:45 +0100
Subject: [PATCH] Merge branch 'master' of
gitmaster.atlas.aei.uni-hannover.de:pykat/pykat
---
pykat/components.py | 2 +-
pykat/detectors.py | 4 ++--
pykat/finesse.py | 6 +++---
pykat/node_network.py | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pykat/components.py b/pykat/components.py
index 8caba1b..8110fe8 100644
--- a/pykat/components.py
+++ b/pykat/components.py
@@ -99,7 +99,7 @@ class Component(object):
cnew = type(cnew_name, (cls,), {})
- return object.__new__(cnew, *args, **kwargs)
+ return object.__new__(cnew)
def __init__(self, name=None):
diff --git a/pykat/detectors.py b/pykat/detectors.py
index b13521f..648c80b 100644
--- a/pykat/detectors.py
+++ b/pykat/detectors.py
@@ -51,7 +51,7 @@ class BaseDetector(object) :
cnew = type(cnew_name, (cls,), {})
- return object.__new__(cnew, *args, **kwargs)
+ return object.__new__(cnew)
def __init__(self, name, nodes=None, max_nodes=1):
@@ -394,7 +394,7 @@ class pd(Detector1):
cnew = type(cnew_name, (cls,), {})
- return object.__new__(cnew, *args, **kwargs)
+ return object.__new__(cnew)
def __deepcopy__(self, memo):
"""
diff --git a/pykat/finesse.py b/pykat/finesse.py
index d3ae8f9..e5013fe 100644
--- a/pykat/finesse.py
+++ b/pykat/finesse.py
@@ -433,8 +433,8 @@ class kat(object):
global id___
id___ += 1
cnew = type(pykat.finesse.kat.__name__ + str("_") + str(id___), (pykat.finesse.kat,), {})
- return object.__new__(cnew, *args, **kwargs)
-
+ return object.__new__(cnew)
+
def __init__(self, kat_file=None, kat_code=None, katdir="", katname="", tempdir=None, tempname=None):
self.scene = None # scene object for GUI
self.verbose = True
@@ -1119,7 +1119,7 @@ class kat(object):
[out,errpipe] = p.communicate()
- _out = out.split("\n")
+ _out = str(out).split("\n")
for line in _out[::-1]:
if line.lstrip().startswith('computation time:'):
diff --git a/pykat/node_network.py b/pykat/node_network.py
index 2500812..8d0c940 100644
--- a/pykat/node_network.py
+++ b/pykat/node_network.py
@@ -36,7 +36,8 @@ class NodeNetwork(object):
cnew = type(cnew_name, (cls,), {})
- return object.__new__(cnew, *args, **kwargs)
+ #return object.__new__(cnew, *args, **kwargs)
+ return object.__new__(cnew)
def __init__(self, kat):
self.__nodes = {}
--
GitLab