From aff27446c08522c378b4c442f8a4b6530c9456f7 Mon Sep 17 00:00:00 2001
From: "Michael D. M. Dryden" <mdryden@chem.utoronto.ca>
Date: Tue, 26 Aug 2014 17:45:09 -0400
Subject: [PATCH] Converted all classes to new-style. (inherit from object)
---
dstat-interface/dstat-interface/dstat_comm.py | 4 ++--
dstat-interface/dstat-interface/main.py | 2 +-
dstat-interface/dstat-interface/microdrop.py | 2 +-
dstat-interface/dstat-interface/mpltest.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dstat-interface/dstat-interface/dstat_comm.py b/dstat-interface/dstat-interface/dstat_comm.py
index d701287..ff4dab0 100644
--- a/dstat-interface/dstat-interface/dstat_comm.py
+++ b/dstat-interface/dstat-interface/dstat_comm.py
@@ -29,7 +29,7 @@ class delayedSerial(serial.Serial):
serial.Serial.write(self, i)
time.sleep(.001)
-class SerialDevices:
+class SerialDevices(object):
"""Retrieves and stores list of serial devices in self.ports"""
def __init__(self):
try:
@@ -42,7 +42,7 @@ class SerialDevices:
"""Refreshes list of ports."""
self.ports, _, _ = zip(*list_ports.comports())
-class Experiment:
+class Experiment(object):
"""Store and acquire a potentiostat experiment. Meant to be subclassed
to by different experiment types and not used instanced directly.
"""
diff --git a/dstat-interface/dstat-interface/main.py b/dstat-interface/dstat-interface/main.py
index 0411d19..c8c9842 100644
--- a/dstat-interface/dstat-interface/main.py
+++ b/dstat-interface/dstat-interface/main.py
@@ -47,7 +47,7 @@ class InputError(Error):
self.expr = expr
self.msg = msg
-class Main:
+class Main(object):
"""Main program """
def __init__(self):
self.builder = gtk.Builder()
diff --git a/dstat-interface/dstat-interface/microdrop.py b/dstat-interface/dstat-interface/microdrop.py
index 917ef2c..8546ad3 100644
--- a/dstat-interface/dstat-interface/microdrop.py
+++ b/dstat-interface/dstat-interface/microdrop.py
@@ -14,7 +14,7 @@ INVAL_CMD = "99"
RECV = 0
SEND = 1
-class microdropConnection:
+class microdropConnection(object):
"""Manages microdrop connection over TCP with zmq"""
def __init__(self, port=6789):
"""Create zmq context and bind to port. Should be called manually
diff --git a/dstat-interface/dstat-interface/mpltest.py b/dstat-interface/dstat-interface/mpltest.py
index 7624499..59e5392 100644
--- a/dstat-interface/dstat-interface/mpltest.py
+++ b/dstat-interface/dstat-interface/mpltest.py
@@ -14,7 +14,7 @@ from matplotlib.backends.backend_gtkagg \
from matplotlib.backends.backend_gtkagg \
import NavigationToolbar2GTKAgg as NavigationToolbar
-class plotbox:
+class plotbox(object):
"""Contains main data plot and associated methods."""
def __init__(self, plotwindow_instance):
"""Creates plot and moves it to a gtk container.
--
GitLab