From de72d93b9c307884324f0e45bb3f003c068429d2 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 18 Sep 2020 18:50:13 +0200 Subject: [PATCH] Minor cleanup, and made status class properties private --- nw/core/status.py | 80 ++++++++++++++++++++++---------------------- nw/core/tohtml.py | 3 +- nw/core/tokenizer.py | 6 ++-- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/nw/core/status.py b/nw/core/status.py index 81496743..c495e93c 100644 --- a/nw/core/status.py +++ b/nw/core/status.py @@ -36,12 +36,12 @@ logger = logging.getLogger(__name__) class NWStatus(): def __init__(self): - self.theLabels = [] - self.theColours = [] - self.theCounts = [] - self.theMap = {} - self.theLength = 0 - self.theIndex = 0 + self._theLabels = [] + self._theColours = [] + self._theCounts = [] + self._theMap = {} + self._theLength = 0 + self._theIndex = 0 return def addEntry(self, theLabel, theColours): @@ -50,11 +50,11 @@ class NWStatus(): """ theLabel = theLabel.strip() if self.lookupEntry(theLabel) is None: - self.theLabels.append(theLabel) - self.theColours.append(theColours) - self.theCounts.append(0) - self.theMap[theLabel] = self.theLength - self.theLength += 1 + self._theLabels.append(theLabel) + self._theColours.append(theColours) + self._theCounts.append(0) + self._theMap[theLabel] = self._theLength + self._theLength += 1 return True def lookupEntry(self, theLabel): @@ -64,8 +64,8 @@ class NWStatus(): if theLabel is None: return None theLabel = theLabel.strip() - if theLabel in self.theMap.keys(): - return self.theMap[theLabel] + if theLabel in self._theMap.keys(): + return self._theMap[theLabel] return None def checkEntry(self, theStatus): @@ -77,8 +77,8 @@ class NWStatus(): if self.lookupEntry(theStatus) is not None: return theStatus theStatus = checkInt(theStatus, 0, False) - if theStatus >= 0 and theStatus < self.theLength: - return self.theLabels[theStatus] + if theStatus >= 0 and theStatus < self._theLength: + return self._theLabels[theStatus] def setNewEntries(self, newList): """Update the list of entries after they have been modified by @@ -87,12 +87,12 @@ class NWStatus(): replaceMap = {} if newList is not None: - self.theLabels = [] - self.theColours = [] - self.theCounts = [] - self.theMap = {} - self.theLength = 0 - self.theIndex = 0 + self._theLabels = [] + self._theColours = [] + self._theCounts = [] + self._theMap = {} + self._theLength = 0 + self._theIndex = 0 for nName, nR, nG, nB, oName in newList: self.addEntry(nName, (nR, nG, nB)) @@ -104,7 +104,7 @@ class NWStatus(): def resetCounts(self): """Clear the counts of references to the status entries. """ - self.theCounts = [0]*self.theLength + self._theCounts = [0]*self._theLength return def countEntry(self, theLabel): @@ -112,20 +112,20 @@ class NWStatus(): """ theIndex = self.lookupEntry(theLabel) if theIndex is not None: - self.theCounts[theIndex] += 1 + self._theCounts[theIndex] += 1 return def packXML(self, xParent): """Pack the status entries into an XML object for saving to the main project file. """ - for n in range(self.theLength): + for n in range(self._theLength): xSub = etree.SubElement(xParent, "entry", attrib={ - "blue" : str(self.theColours[n][2]), - "green" : str(self.theColours[n][1]), - "red" : str(self.theColours[n][0]), + "blue" : str(self._theColours[n][2]), + "green" : str(self._theColours[n][1]), + "red" : str(self._theColours[n][0]), }) - xSub.text = self.theLabels[n] + xSub.text = self._theLabels[n] return True def unpackXML(self, xParent): @@ -151,12 +151,12 @@ class NWStatus(): theColours.append((cR, cG, cB)) if len(theLabels) > 0: - self.theLabels = [] - self.theColours = [] - self.theCounts = [] - self.theMap = {} - self.theLength = 0 - self.theIndex = 0 + self._theLabels = [] + self._theColours = [] + self._theCounts = [] + self._theMap = {} + self._theLength = 0 + self._theIndex = 0 for n in range(len(theLabels)): self.addEntry(theLabels[n], theColours[n]) @@ -170,22 +170,22 @@ class NWStatus(): def __getitem__(self, n): """Return an entry by its index. """ - if n >= 0 and n < self.theLength: - return self.theLabels[n], self.theColours[n], self.theCounts[n] + if n >= 0 and n < self._theLength: + return self._theLabels[n], self._theColours[n], self._theCounts[n] return None, None, None def __iter__(self): """Initialise the iterator. """ - self.theIndex = 0 + self._theIndex = 0 return self def __next__(self): """Return the next entry for the iterator. """ - if self.theIndex < self.theLength: - theLabel, theColour, theCount = self.__getitem__(self.theIndex) - self.theIndex += 1 + if self._theIndex < self._theLength: + theLabel, theColour, theCount = self.__getitem__(self._theIndex) + self._theIndex += 1 return theLabel, theColour, theCount else: raise StopIteration diff --git a/nw/core/tohtml.py b/nw/core/tohtml.py index 720ac9cd..7190bb9e 100644 --- a/nw/core/tohtml.py +++ b/nw/core/tohtml.py @@ -309,8 +309,7 @@ class ToHtml(Tokenizer): def _formatKeywords(self, tText): """Apply HTML formatting to keywords. """ - tText = "@"+tText - isValid, theBits, thePos = self.theParent.theIndex.scanThis(tText) + isValid, theBits, thePos = self.theParent.theIndex.scanThis("@"+tText) if not isValid or not theBits: return "" diff --git a/nw/core/tokenizer.py b/nw/core/tokenizer.py index 5db2d19d..f1c6a988 100644 --- a/nw/core/tokenizer.py +++ b/nw/core/tokenizer.py @@ -27,7 +27,6 @@ import logging import re -import nw from operator import itemgetter from PyQt5.QtCore import QRegularExpression @@ -74,9 +73,8 @@ class Tokenizer(): def __init__(self, theProject, theParent): - self.mainConf = nw.CONFIG - self.theProject = theProject - self.theParent = theParent + self.theProject = theProject + self.theParent = theParent # Data Variables self.theText = None # The raw text to be tokenized