From 1c7e3fe48cd3c71887aea76f04337fdbc4152328 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 3 Jun 2018 19:48:58 +0200 Subject: [PATCH] python 2to3 tool lib2to3.fixes.fix_basestring --- Alignment/MuonAlignment/python/svgfig.py | 64 +++++++++---------- .../Workflow/Crabtools/crabConfigParser.py | 2 +- Configuration/AlCa/python/GlobalTag.py | 2 +- .../python/relval_machine.py | 2 +- .../python/BeautifulSoup.py | 14 ++-- FWCore/ParameterSet/python/Types.py | 22 +++---- FWCore/PythonUtilities/python/XML2Python.py | 2 +- FWCore/PythonUtilities/scripts/fjr2json.py | 2 +- FWCore/Skeletons/python/pkg.py | 2 +- FWCore/Skeletons/python/utils.py | 4 +- .../test/unittests/FWLiteAnalyzer.py | 2 +- .../HeppyCore/python/analyzers/Matcher.py | 2 +- .../HeppyCore/python/framework/chain.py | 2 +- .../HeppyCore/python/framework/config.py | 2 +- .../PythonAnalysis/python/XML2Python.py | 2 +- RecoHI/HiEgammaAlgos/python/HiHelperTools.py | 2 +- RecoLuminosity/LumiDB/python/CommonUtil.py | 2 +- RecoLuminosity/LumiDB/python/lumiQueryAPI.py | 2 +- .../test/tools/material.py | 2 +- .../ReleaseScripts/scripts/XML2Python.py | 2 +- .../RecoTrack/python/plotting/plotting.py | 2 +- 21 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Alignment/MuonAlignment/python/svgfig.py b/Alignment/MuonAlignment/python/svgfig.py index 23d51bc510157..172d72bc938d2 100644 --- a/Alignment/MuonAlignment/python/svgfig.py +++ b/Alignment/MuonAlignment/python/svgfig.py @@ -256,7 +256,7 @@ def items(self, sub=True, attr=True, text=True): for ti, s in self: show = False if isinstance(ti[-1], (int, long)): - if isinstance(s, basestring): show = text + if isinstance(s, str): show = text else: show = sub else: show = attr @@ -306,7 +306,7 @@ def tree(self, depth_limit=None, sub=True, attr=True, text=True, tree_width=20, for ti, s in self.depth_first(depth_limit): show = False if isinstance(ti[-1], (int, long)): - if isinstance(s, basestring): show = text + if isinstance(s, str): show = text else: show = sub else: show = attr @@ -568,10 +568,10 @@ def startElement(self, name, attr): self.stack.append(s) def characters(self, ch): - if not isinstance(ch, basestring) or self.all_whitespace.match(ch) == None: + if not isinstance(ch, str) or self.all_whitespace.match(ch) == None: if len(self.stack) > 0: last = self.stack[-1] - if len(last.sub) > 0 and isinstance(last.sub[-1], basestring): + if len(last.sub) > 0 and isinstance(last.sub[-1], str): last.sub[-1] = last.sub[-1] + "\n" + ch else: last.sub.append(ch) @@ -579,7 +579,7 @@ def characters(self, ch): def endElement(self, name): if len(self.stack) > 0: last = self.stack[-1] - if isinstance(last, SVG) and last.t == "style" and "type" in last.attr and last.attr["type"] == "text/css" and len(last.sub) == 1 and isinstance(last.sub[0], basestring): + if isinstance(last, SVG) and last.t == "style" and "type" in last.attr and last.attr["type"] == "text/css" and len(last.sub) == 1 and isinstance(last.sub[0], str): last.sub[0] = "" self.output = self.stack.pop() @@ -733,7 +733,7 @@ class Fig: def __repr__(self): if self.trans == None: return "" % len(self.d) - elif isinstance(self.trans, basestring): + elif isinstance(self.trans, str): return " %s>" % (len(self.d), self.trans) else: return "" % (len(self.d), self.trans.__name__) @@ -755,7 +755,7 @@ def SVG(self, trans=None): """ if trans == None: trans = self.trans - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) output = SVG("g") for s in self.d: @@ -764,7 +764,7 @@ def SVG(self, trans=None): elif isinstance(s, Fig): strans = s.trans - if isinstance(strans, basestring): strans = totrans(strans) + if isinstance(strans, str): strans = totrans(strans) if trans == None: subtrans = strans elif strans == None: subtrans = trans @@ -856,7 +856,7 @@ def __init__(self, xmin, xmax, ymin, ymax, *d, **kwds): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" if trans == None: trans = self.trans - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) self.last_window = window(self.xmin, self.xmax, self.ymin, self.ymax, x=self.x, y=self.y, width=self.width, height=self.height, \ xlogbase=self.xlogbase, ylogbase=self.ylogbase, minusInfinity=self.minusInfinity, flipx=self.flipx, flipy=self.flipy) @@ -1060,7 +1060,7 @@ def __repr__(self): return "" % (len(self.d), self.attr) def __init__(self, d=[], **attr): - if isinstance(d, basestring): self.d = self.parse(d) + if isinstance(d, str): self.d = self.parse(d) else: self.d = list(d) self.attr = dict(self.defaults) @@ -1225,7 +1225,7 @@ def parse(self, pathdata): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) x, y, X, Y = None, None, None, None output = [] @@ -1655,8 +1655,8 @@ def Path(self, trans=None, local=False): global coordinates. If local=True, return a Path in local coordinates (which must be transformed again).""" - if isinstance(trans, basestring): trans = totrans(trans) - if isinstance(self.f, basestring): self.f = funcRtoR2(self.f) + if isinstance(trans, str): trans = totrans(trans) + if isinstance(self.f, str): self.f = funcRtoR2(self.f) self.sample(trans) @@ -1734,7 +1734,7 @@ def Path(self, trans=None, local=False): """Apply the transformation "trans" and return a Path object in global coordinates. If local=True, return a Path in local coordinates (which must be transformed again).""" - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) if self.mode[0] == "L" or self.mode[0] == "l": mode = "L" elif self.mode[0] == "B" or self.mode[0] == "b": mode = "B" @@ -1853,7 +1853,7 @@ def __init__(self, x, y, d, **attr): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) X, Y = self.x, self.y if trans != None: X, Y = trans(X, Y) @@ -1937,7 +1937,7 @@ def __init__(self, d=[], symbol=None, width=1., height=1., **attr): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) output = SVG("g", SVG("defs", self.symbol)) id = "#%s" % self.symbol["id"] @@ -2011,7 +2011,7 @@ def SVG(self, trans=None): if isinstance(self.arrow_start, SVG): defs.append(self.arrow_start) line.attr["marker-start"] = "url(#%s)" % self.arrow_start["id"] - elif isinstance(self.arrow_start, basestring): + elif isinstance(self.arrow_start, str): defs.append(make_marker(self.arrow_start, "arrow_start")) line.attr["marker-start"] = "url(#%s)" % self.arrow_start else: @@ -2021,7 +2021,7 @@ def SVG(self, trans=None): if isinstance(self.arrow_end, SVG): defs.append(self.arrow_end) line.attr["marker-end"] = "url(#%s)" % self.arrow_end["id"] - elif isinstance(self.arrow_end, basestring): + elif isinstance(self.arrow_end, str): defs.append(make_marker(self.arrow_end, "arrow_end")) line.attr["marker-end"] = "url(#%s)" % self.arrow_end else: @@ -2083,7 +2083,7 @@ def __init__(self, x1, y1, x2, y2, local1=False, local2=False, arrow_start=None, def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) X1, Y1, X2, Y2 = self.x1, self.y1, self.x2, self.y2 @@ -2099,7 +2099,7 @@ def SVG(self, trans=None): if isinstance(self.arrow_start, SVG): defs.append(self.arrow_start) line.attr["marker-start"] = "url(#%s)" % self.arrow_start["id"] - elif isinstance(self.arrow_start, basestring): + elif isinstance(self.arrow_start, str): defs.append(make_marker(self.arrow_start, "arrow_start")) line.attr["marker-start"] = "url(#%s)" % self.arrow_start else: @@ -2109,7 +2109,7 @@ def SVG(self, trans=None): if isinstance(self.arrow_end, SVG): defs.append(self.arrow_end) line.attr["marker-end"] = "url(#%s)" % self.arrow_end["id"] - elif isinstance(self.arrow_end, basestring): + elif isinstance(self.arrow_end, str): defs.append(make_marker(self.arrow_end, "arrow_end")) line.attr["marker-end"] = "url(#%s)" % self.arrow_end else: @@ -2411,7 +2411,7 @@ def orient_tickmark(self, t, trans=None): Normally only used internally. """ - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) if trans == None: f = self.f else: @@ -2434,7 +2434,7 @@ def orient_tickmark(self, t, trans=None): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) + if isinstance(trans, str): trans = totrans(trans) self.last_ticks, self.last_miniticks = self.interpret() tickmarks = Path([], **self.attr) @@ -2447,7 +2447,7 @@ def SVG(self, trans=None): if self.arrow_start != False and self.arrow_start != None: if isinstance(self.arrow_start, SVG): defs.append(self.arrow_start) - elif isinstance(self.arrow_start, basestring): + elif isinstance(self.arrow_start, str): defs.append(make_marker(self.arrow_start, "arrow_start")) else: raise TypeError("arrow_start must be False/None or an id string for the new marker") @@ -2455,7 +2455,7 @@ def SVG(self, trans=None): if self.arrow_end != False and self.arrow_end != None: if isinstance(self.arrow_end, SVG): defs.append(self.arrow_end) - elif isinstance(self.arrow_end, basestring): + elif isinstance(self.arrow_end, str): defs.append(make_marker(self.arrow_end, "arrow_end")) else: raise TypeError("arrow_end must be False/None or an id string for the new marker") @@ -2517,7 +2517,7 @@ def interpret(self): elif self.labels == True: format = unumber - elif isinstance(self.labels, basestring): + elif isinstance(self.labels, str): format = lambda x: (self.labels % x) elif callable(self.labels): @@ -2834,13 +2834,13 @@ def SVG(self, trans=None): ticks = Ticks.SVG(self, trans) # returns a if self.arrow_start != False and self.arrow_start != None: - if isinstance(self.arrow_start, basestring): + if isinstance(self.arrow_start, str): func.attr["marker-start"] = "url(#%s)" % self.arrow_start else: func.attr["marker-start"] = "url(#%s)" % self.arrow_start.id if self.arrow_end != False and self.arrow_end != None: - if isinstance(self.arrow_end, basestring): + if isinstance(self.arrow_end, str): func.attr["marker-end"] = "url(#%s)" % self.arrow_end else: func.attr["marker-end"] = "url(#%s)" % self.arrow_end.id @@ -2918,13 +2918,13 @@ def SVG(self, trans=None): self.high = self.end if self.arrow_start != False and self.arrow_start != None: - if isinstance(self.arrow_start, basestring): + if isinstance(self.arrow_start, str): line.attr["marker-start"] = "url(#%s)" % self.arrow_start else: line.attr["marker-start"] = "url(#%s)" % self.arrow_start.id if self.arrow_end != False and self.arrow_end != None: - if isinstance(self.arrow_end, basestring): + if isinstance(self.arrow_end, str): line.attr["marker-end"] = "url(#%s)" % self.arrow_end else: line.attr["marker-end"] = "url(#%s)" % self.arrow_end.id @@ -3308,7 +3308,7 @@ def __init__(self, d=[], **attr): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) # only once + if isinstance(trans, str): trans = totrans(trans) # only once output = SVG("g") for p in self.d: @@ -3354,7 +3354,7 @@ def __init__(self, d=[], **attr): def SVG(self, trans=None): """Apply the transformation "trans" and return an SVG object.""" - if isinstance(trans, basestring): trans = totrans(trans) # only once + if isinstance(trans, str): trans = totrans(trans) # only once output = SVG("g") for p in self.d: diff --git a/CalibMuon/DTCalibration/python/Workflow/Crabtools/crabConfigParser.py b/CalibMuon/DTCalibration/python/Workflow/Crabtools/crabConfigParser.py index 6cb8a48394b61..f811fb007e50c 100755 --- a/CalibMuon/DTCalibration/python/Workflow/Crabtools/crabConfigParser.py +++ b/CalibMuon/DTCalibration/python/Workflow/Crabtools/crabConfigParser.py @@ -51,7 +51,7 @@ def getSectionLines(self,section): sectionLines.append('\nconfig.section_("%s")'%section) configItems = self.items(section) for configItem in configItems: - if not isinstance(configItem[1], basestring): + if not isinstance(configItem[1], str): sectionLines.append('config.%s.%s = %s'%(section,configItem[0],configItem[1])) elif "True" in configItem[1] or "False" in configItem[1]: sectionLines.append('config.%s.%s = %s'%(section,configItem[0],configItem[1])) diff --git a/Configuration/AlCa/python/GlobalTag.py b/Configuration/AlCa/python/GlobalTag.py index ccec5b4895966..bd07128629fec 100644 --- a/Configuration/AlCa/python/GlobalTag.py +++ b/Configuration/AlCa/python/GlobalTag.py @@ -104,7 +104,7 @@ def GlobalTag(essource = None, globaltag = None, conditions = None): # add any explicitly requested conditions, possibly overriding those from autoCond.py if conditions is not None: # TODO backward compatible code: to be removed after migrating ConfigBuilder.py and confdb.py to use a map for custom conditions - if isinstance(conditions, basestring): + if isinstance(conditions, str): if conditions: map = {} for entry in conditions.split('+'): diff --git a/Configuration/PyReleaseValidation/python/relval_machine.py b/Configuration/PyReleaseValidation/python/relval_machine.py index 376e19ebc1589..a3d204f6f78bc 100644 --- a/Configuration/PyReleaseValidation/python/relval_machine.py +++ b/Configuration/PyReleaseValidation/python/relval_machine.py @@ -36,7 +36,7 @@ def convert_keys_to_string(dictionary): Utility to help deal with unicode keys in dictionaries created from json requests. In order to pass dict to function as **kwarg we should transform key/value to str. """ - if isinstance(dictionary, basestring): + if isinstance(dictionary, str): return str(dictionary) elif isinstance(dictionary, collections.Mapping): return dict(map(convert_keys_to_string, dictionary.iteritems())) diff --git a/Documentation/ReferenceManualScripts/python/BeautifulSoup.py b/Documentation/ReferenceManualScripts/python/BeautifulSoup.py index 52719ec87fc7b..25ae0e8e4d414 100644 --- a/Documentation/ReferenceManualScripts/python/BeautifulSoup.py +++ b/Documentation/ReferenceManualScripts/python/BeautifulSoup.py @@ -202,7 +202,7 @@ def _lastRecursiveChild(self): return lastChild def insert(self, position, newChild): - if isinstance(newChild, basestring) \ + if isinstance(newChild, str) \ and not isinstance(newChild, NavigableString): newChild = NavigableString(newChild) @@ -357,7 +357,7 @@ def _findAll(self, name, attrs, text, limit, generator, **kwargs): return [element for element in generator() if isinstance(element, Tag)] # findAll*('tag-name') - elif isinstance(name, basestring): + elif isinstance(name, str): return [element for element in generator() if isinstance(element, Tag) and element.name == name] @@ -708,7 +708,7 @@ def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING, if self.attrs: for key, val in self.attrs: fmt = '%s="%s"' - if isinstance(val, basestring): + if isinstance(val, str): if self.containsSubstitutions and '%SOUP-ENCODING%' in val: val = self.substituteEncoding(val, encoding) @@ -892,7 +892,7 @@ class SoupStrainer: def __init__(self, name=None, attrs={}, text=None, **kwargs): self.name = name - if isinstance(attrs, basestring): + if isinstance(attrs, str): kwargs['class'] = _match_css_class(attrs) attrs = None if kwargs: @@ -966,7 +966,7 @@ def search(self, markup): found = self.searchTag(markup) # If it's text, make sure the text matches. elif isinstance(markup, NavigableString) or \ - isinstance(markup, basestring): + isinstance(markup, str): if self._matches(markup, self.text): found = markup else: @@ -986,7 +986,7 @@ def _matches(self, markup, matchAgainst): #other ways of matching match the tag name as a string. if isinstance(markup, Tag): markup = markup.name - if markup and not isinstance(markup, basestring): + if markup and not isinstance(markup, str): markup = unicode(markup) #Now we know that chunk is either a string, or None. if hasattr(matchAgainst, 'match'): @@ -996,7 +996,7 @@ def _matches(self, markup, matchAgainst): result = markup in matchAgainst elif hasattr(matchAgainst, 'items'): result = matchAgainst in markup - elif matchAgainst and isinstance(markup, basestring): + elif matchAgainst and isinstance(markup, str): if isinstance(markup, unicode): matchAgainst = unicode(matchAgainst) else: diff --git a/FWCore/ParameterSet/python/Types.py b/FWCore/ParameterSet/python/Types.py index cce94555f8e17..19337cf83b699 100644 --- a/FWCore/ParameterSet/python/Types.py +++ b/FWCore/ParameterSet/python/Types.py @@ -188,7 +188,7 @@ def __nonzero__(self): class EventID(_ParameterTypeBase): def __init__(self, run, *args): super(EventID,self).__init__() - if isinstance(run, basestring): + if isinstance(run, str): self.__run = self._valueFromString(run).__run self.__luminosityBlock = self._valueFromString(run).__luminosityBlock self.__event = self._valueFromString(run).__event @@ -233,7 +233,7 @@ def insertInto(self, parameterSet, myname): class LuminosityBlockID(_ParameterTypeBase): def __init__(self, run, block=None): super(LuminosityBlockID,self).__init__() - if isinstance(run, basestring): + if isinstance(run, str): self.__run = self._valueFromString(run).__run self.__block = self._valueFromString(run).__block else: @@ -262,7 +262,7 @@ def insertInto(self, parameterSet, myname): class LuminosityBlockRange(_ParameterTypeBase): def __init__(self, start, startSub=None, end=None, endSub=None): super(LuminosityBlockRange,self).__init__() - if isinstance(start, basestring): + if isinstance(start, str): parsed = self._valueFromString(start) self.__start = parsed.__start self.__startSub = parsed.__startSub @@ -323,7 +323,7 @@ def insertInto(self, parameterSet, myname): class EventRange(_ParameterTypeBase): def __init__(self, start, *args): super(EventRange,self).__init__() - if isinstance(start, basestring): + if isinstance(start, str): parsed = self._valueFromString(start) self.__start = parsed.__start self.__startLumi = parsed.__startLumi @@ -803,7 +803,7 @@ def insertInto(self, parameterSet, myname): cppIDs = list() for i in self: item = i - if isinstance(item, basestring): + if isinstance(item, str): item = LuminosityBlockID._valueFromString(item) cppIDs.append(item.cppID(parameterSet)) parameterSet.addVLuminosityBlockID(self.isTracked(), myname, cppIDs) @@ -879,7 +879,7 @@ def configValueForItem(self,item,options): return EventID.formatValueForConfig(item) def pythonValueForItem(self,item, options): # we tolerate strings as members - if isinstance(item, basestring): + if isinstance(item, str): return '"'+item+'"' else: return item.dumpPython(options) @@ -890,7 +890,7 @@ def insertInto(self, parameterSet, myname): cppIDs = list() for i in self: item = i - if isinstance(item, basestring): + if isinstance(item, str): item = EventID._valueFromString(item) cppIDs.append(item.cppID(parameterSet)) parameterSet.addVEventID(self.isTracked(), myname, cppIDs) @@ -905,7 +905,7 @@ def _itemIsValid(item): def configValueForItem(self,item,options): return LuminosityBlockRange.formatValueForConfig(item) def pythonValueForItem(self,item, options): - if isinstance(item, basestring): + if isinstance(item, str): return '"'+item+'"' else: return item.dumpPython(options) @@ -916,7 +916,7 @@ def insertInto(self, parameterSet, myname): cppIDs = list() for i in self: item = i - if isinstance(item, basestring): + if isinstance(item, str): item = LuminosityBlockRange._valueFromString(item) cppIDs.append(item.cppID(parameterSet)) parameterSet.addVLuminosityBlockRange(self.isTracked(), myname, cppIDs) @@ -931,7 +931,7 @@ def _itemIsValid(item): def configValueForItem(self,item,options): return EventRange.formatValueForConfig(item) def pythonValueForItem(self,item, options): - if isinstance(item, basestring): + if isinstance(item, str): return '"'+item+'"' else: return item.dumpPython(options) @@ -942,7 +942,7 @@ def insertInto(self, parameterSet, myname): cppIDs = list() for i in self: item = i - if isinstance(item, basestring): + if isinstance(item, str): item = EventRange._valueFromString(item) cppIDs.append(item.cppID(parameterSet)) parameterSet.addVEventRange(self.isTracked(), myname, cppIDs) diff --git a/FWCore/PythonUtilities/python/XML2Python.py b/FWCore/PythonUtilities/python/XML2Python.py index 90cb98544231d..3843ca43924c3 100644 --- a/FWCore/PythonUtilities/python/XML2Python.py +++ b/FWCore/PythonUtilities/python/XML2Python.py @@ -23,7 +23,7 @@ def __len__ (self): def __getitem__ (self, key): - if isinstance (key, basestring): + if isinstance (key, str): return self._attrs.get(key,None) else: return [self][key] diff --git a/FWCore/PythonUtilities/scripts/fjr2json.py b/FWCore/PythonUtilities/scripts/fjr2json.py index a2e374532eeb7..b86186ae4154c 100755 --- a/FWCore/PythonUtilities/scripts/fjr2json.py +++ b/FWCore/PythonUtilities/scripts/fjr2json.py @@ -36,7 +36,7 @@ runList.append (lumi) except: try: # JSON-like version in CRAB XML files, runObjects is usually a list - if isinstance(inputFile.Runs, basestring): + if isinstance(inputFile.Runs, str): runObjects = [inputFile.Runs] else: runObjects = inputFile.Runs diff --git a/FWCore/Skeletons/python/pkg.py b/FWCore/Skeletons/python/pkg.py index 521caa65d2d93..07c21dc946c62 100644 --- a/FWCore/Skeletons/python/pkg.py +++ b/FWCore/Skeletons/python/pkg.py @@ -135,7 +135,7 @@ def write(self, fname, tmpl_name, kwds): continue if not read_code: for key, val in kwds.items(): - if isinstance(val, basestring): + if isinstance(val, str): line = line.replace(key, val) stream.write(line) diff --git a/FWCore/Skeletons/python/utils.py b/FWCore/Skeletons/python/utils.py index 9aec2b259053a..eec835d14d317 100644 --- a/FWCore/Skeletons/python/utils.py +++ b/FWCore/Skeletons/python/utils.py @@ -59,7 +59,7 @@ def functor(code, kwds, debug=0): """ args = [] for key, val in kwds.items(): - if isinstance(val, basestring): + if isinstance(val, str): arg = '%s="%s"' % (key, val) elif isinstance(val, list): arg = '%s=%s' % (key, val) @@ -99,7 +99,7 @@ def user_info(ainput=None): return ainput pwdstr = pwd.getpwnam(os.getlogin()) author = pwdstr.pw_gecos - if author and isinstance(author, basestring): + if author and isinstance(author, str): author = author.split(',')[0] return author diff --git a/L1Trigger/L1TMuonEndCap/test/unittests/FWLiteAnalyzer.py b/L1Trigger/L1TMuonEndCap/test/unittests/FWLiteAnalyzer.py index e539c458f41ee..090aab0dfb83b 100644 --- a/L1Trigger/L1TMuonEndCap/test/unittests/FWLiteAnalyzer.py +++ b/L1Trigger/L1TMuonEndCap/test/unittests/FWLiteAnalyzer.py @@ -14,7 +14,7 @@ def __init__(self, inputFiles=None, handles=None, firstEvent=None, maxEvents=Non gROOT.SetBatch() # don't pop up canvases if inputFiles: - if isinstance(inputFiles, basestring): + if isinstance(inputFiles, str): self.inputFiles = [inputFiles] else: self.inputFiles = inputFiles diff --git a/PhysicsTools/HeppyCore/python/analyzers/Matcher.py b/PhysicsTools/HeppyCore/python/analyzers/Matcher.py index 5636852911bc1..2d414ff6b1e22 100644 --- a/PhysicsTools/HeppyCore/python/analyzers/Matcher.py +++ b/PhysicsTools/HeppyCore/python/analyzers/Matcher.py @@ -54,7 +54,7 @@ class Matcher(Analyzer): def beginLoop(self, setup): super(Matcher, self).beginLoop(setup) self.match_collections = [] - if isinstance( self.cfg_ana.match_particles, basestring): + if isinstance( self.cfg_ana.match_particles, str): self.match_collections.append( (self.cfg_ana.match_particles, None) ) else: self.match_collections = self.cfg_ana.match_particles diff --git a/PhysicsTools/HeppyCore/python/framework/chain.py b/PhysicsTools/HeppyCore/python/framework/chain.py index d2cffbaf7ed2a..4d071c8024698 100644 --- a/PhysicsTools/HeppyCore/python/framework/chain.py +++ b/PhysicsTools/HeppyCore/python/framework/chain.py @@ -45,7 +45,7 @@ def __init__(self, input, tree_name=None): this TTree is used. """ self.files = input - if isinstance(input, basestring): # input is a pattern + if isinstance(input, str): # input is a pattern self.files = glob.glob(input) if len(self.files)==0: raise ValueError('no matching file name: '+input) diff --git a/PhysicsTools/HeppyCore/python/framework/config.py b/PhysicsTools/HeppyCore/python/framework/config.py index 13cedadd870fb..51dc8efd6c3ab 100644 --- a/PhysicsTools/HeppyCore/python/framework/config.py +++ b/PhysicsTools/HeppyCore/python/framework/config.py @@ -188,7 +188,7 @@ class Component( CFG ): DataComponent, MCComponent, EmbedComponent for more information.''' def __init__(self, name, files, tree_name=None, triggers=None, **kwargs): - if isinstance(triggers, basestring): + if isinstance(triggers, str): triggers = [triggers] if isinstance(files, str): files = sorted(glob.glob(files)) diff --git a/PhysicsTools/PythonAnalysis/python/XML2Python.py b/PhysicsTools/PythonAnalysis/python/XML2Python.py index b178414b81a15..707f135b17728 100644 --- a/PhysicsTools/PythonAnalysis/python/XML2Python.py +++ b/PhysicsTools/PythonAnalysis/python/XML2Python.py @@ -18,7 +18,7 @@ def __len__ (self): return 1 def __getitem__ (self, key): - if isinstance (key, basestring): + if isinstance (key, str): return self._attrs.get(key,None) else: return [self][key] diff --git a/RecoHI/HiEgammaAlgos/python/HiHelperTools.py b/RecoHI/HiEgammaAlgos/python/HiHelperTools.py index 301efed3e181d..29500682d0ffb 100644 --- a/RecoHI/HiEgammaAlgos/python/HiHelperTools.py +++ b/RecoHI/HiEgammaAlgos/python/HiHelperTools.py @@ -101,7 +101,7 @@ def clonedSequence(self): return self._sequenceStack[-1] def __appendToTopSequence(self, visitee):#this is darn ugly because empty cms.Sequences are not supported - if isinstance(self._sequenceStack[-1], basestring):#we have the name of an empty sequence on the stack. create it! + if isinstance(self._sequenceStack[-1], str):#we have the name of an empty sequence on the stack. create it! oldSequenceLabel = self._sequenceStack.pop() newSequenceLabel = oldSequenceLabel + self._postfix self._sequenceStack.append(cms.Sequence(visitee)) diff --git a/RecoLuminosity/LumiDB/python/CommonUtil.py b/RecoLuminosity/LumiDB/python/CommonUtil.py index 1e0b1512673f7..096206a4b0f17 100644 --- a/RecoLuminosity/LumiDB/python/CommonUtil.py +++ b/RecoLuminosity/LumiDB/python/CommonUtil.py @@ -5,7 +5,7 @@ def flatten(obj): '''Given nested lists or tuples, returns a single flattened list''' result = [] for piece in obj: - if hasattr (piece, '__iter__') and not isinstance (piece, basestring): + if hasattr (piece, '__iter__') and not isinstance (piece, str): result.extend( flatten (piece) ) else: result.append (piece) diff --git a/RecoLuminosity/LumiDB/python/lumiQueryAPI.py b/RecoLuminosity/LumiDB/python/lumiQueryAPI.py index 00d26b50b7f95..53d789417ef3a 100644 --- a/RecoLuminosity/LumiDB/python/lumiQueryAPI.py +++ b/RecoLuminosity/LumiDB/python/lumiQueryAPI.py @@ -867,7 +867,7 @@ def flatten (obj): '''Given nested lists or tuples, returns a single flattened list''' result = [] for piece in obj: - if hasattr (piece, '__iter__') and not isinstance (piece, basestring): + if hasattr (piece, '__iter__') and not isinstance (piece, str): result.extend( flatten (piece) ) else: result.append (piece) diff --git a/SimTracker/TrackerMaterialAnalysis/test/tools/material.py b/SimTracker/TrackerMaterialAnalysis/test/tools/material.py index df4af083561bc..cafcf823b9fce 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/tools/material.py +++ b/SimTracker/TrackerMaterialAnalysis/test/tools/material.py @@ -57,7 +57,7 @@ def __init__(self, other = None): self.name = [] elif isinstance(other, ElementBase): self.name = other.name - elif isinstance(other, basestring): + elif isinstance(other, str): self.parse(other) else: raise TypeError("Cannot initialize an ElementBase from type %s" % type(other)) diff --git a/Utilities/ReleaseScripts/scripts/XML2Python.py b/Utilities/ReleaseScripts/scripts/XML2Python.py index b178414b81a15..707f135b17728 100644 --- a/Utilities/ReleaseScripts/scripts/XML2Python.py +++ b/Utilities/ReleaseScripts/scripts/XML2Python.py @@ -18,7 +18,7 @@ def __len__ (self): return 1 def __getitem__ (self, key): - if isinstance (key, basestring): + if isinstance (key, str): return self._attrs.get(key,None) else: return [self][key] diff --git a/Validation/RecoTrack/python/plotting/plotting.py b/Validation/RecoTrack/python/plotting/plotting.py index 90508b8dde1b4..49952949e1777 100644 --- a/Validation/RecoTrack/python/plotting/plotting.py +++ b/Validation/RecoTrack/python/plotting/plotting.py @@ -1551,7 +1551,7 @@ def __init__(self, x, y, text, size=None, bold=True, align="left", color=ROOT.kB self._l.SetTextFont(font) if size is not None: self._l.SetTextSize(size) - if isinstance(align, basestring): + if isinstance(align, str): if align.lower() == "left": self._l.SetTextAlign(11) elif align.lower() == "center":