Skip to content

Commit 6fb9693

Browse files
thoradeadeas31
authored andcommitted
from builtins import int, range,
move "from" imports to the top use list(x.items()) instead of x.iteritmes() use range instead of xrange
1 parent 0534086 commit 6fb9693

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

OMPython/__init__.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ class which means it will use OMCSessionZMQ by default. If you want to use
5858
Version: 1.1
5959
"""
6060

61+
from builtins import int, range
62+
from copy import deepcopy
63+
from distutils import spawn
64+
6165
import abc
6266
import csv
6367
import getpass
@@ -71,9 +75,6 @@ class which means it will use OMCSessionZMQ by default. If you want to use
7175
import uuid
7276
import xml.etree.ElementTree as ET
7377

74-
from copy import deepcopy
75-
from distutils import spawn
76-
7778
import numpy as np
7879
import pyparsing
7980

@@ -1660,7 +1661,7 @@ def linearize(self): # 22
16601661
self.getconn.sendExpression("setCommandLineOptions(\"+generateSymbolicLinearization\")")
16611662
properties = "{}={}, {}={}, {}={}, {}={}, {}={}".format(self.linearizeOptionsNamesList[0], self.linearizeOptionsValuesList[0], self.linearizeOptionsNamesList[1], self.linearizeOptionsValuesList[1], self.linearizeOptionsNamesList[2], self.linearizeOptionsValuesList[2], self.linearizeOptionsNamesList[3], self.linearizeOptionsValuesList[3], self.linearizeOptionsNamesList[4], self.linearizeOptionsValuesList[4])
16621663
x = self.getParameters()
1663-
getparamvalues = ','.join("%s=%r" % (key, val) for (key, val) in x.iteritems())
1664+
getparamvalues = ','.join("%s=%r" % (key, val) for (key, val) in list(x.items()))
16641665
override = "-override=" + getparamvalues
16651666
if self.inputFlag:
16661667
nameVal = self.getInputs()
@@ -1722,7 +1723,7 @@ def linearize(self): # 22
17221723

17231724
def getLinearQuantityInformation(self):
17241725
# function which extracts linearised states, inputs and outputs
1725-
for i in xrange(len(self.linearquantitiesList)):
1726+
for i in range(len(self.linearquantitiesList)):
17261727
if (self.linearquantitiesList[i]['alias'] == 'alias'):
17271728
name = self.linearquantitiesList[i]['Name']
17281729
if (name[1] == 'x'):

0 commit comments

Comments
 (0)