From 238b3c254e7e5c5f712c6d0ab80736944ae89479 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Wed, 30 Sep 2020 23:43:50 +0200 Subject: [PATCH] Fixed the monkeypatching of time.time() --- nw/core/index.py | 21 +++++++++++---------- tests/test_index.py | 3 +-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nw/core/index.py b/nw/core/index.py index 13c6c092..8925b07e 100644 --- a/nw/core/index.py +++ b/nw/core/index.py @@ -29,7 +29,8 @@ import nw import logging import json import os -import time + +from time import time from nw.constants import ( nwFiles, nwKeyWords, nwItemType, nwItemClass, nwItemLayout, nwAlert @@ -176,7 +177,7 @@ class NWIndex(): if "textCounts" in theData.keys(): self.textCounts = theData["textCounts"] - nowTime = round(time.time()) + nowTime = round(time()) self.timeNovel = nowTime self.timeNote = nowTime self.timeIndex = nowTime @@ -304,7 +305,7 @@ class NWIndex(): self.refIndex[tHandle] = {} self.refIndex[tHandle]["T000000"] = { "tags" : [], - "updated" : round(time.time()), + "updated" : round(time()), } if itemLayout == nwItemLayout.NOTE: self.noteIndex[tHandle] = {} @@ -359,7 +360,7 @@ class NWIndex(): self._indexWordCounts(tHandle, isNovel, lastText, nTitle) # Update timestamps for index changes - nowTime = round(time.time()) + nowTime = round(time()) self.timeIndex = nowTime if isNovel: self.timeNovel = nowTime @@ -394,7 +395,7 @@ class NWIndex(): sTitle = "T%06d" % nLine self.refIndex[tHandle][sTitle] = { "tags" : [], - "updated" : round(time.time()), + "updated" : round(time()), } theData = { "level" : hDepth, @@ -404,7 +405,7 @@ class NWIndex(): "cCount" : 0, "wCount" : 0, "pCount" : 0, - "updated" : round(time.time()), + "updated" : round(time()), } if hText != "": @@ -428,14 +429,14 @@ class NWIndex(): self.novelIndex[tHandle][sTitle]["cCount"] = cC self.novelIndex[tHandle][sTitle]["wCount"] = wC self.novelIndex[tHandle][sTitle]["pCount"] = pC - self.novelIndex[tHandle][sTitle]["updated"] = round(time.time()) + self.novelIndex[tHandle][sTitle]["updated"] = round(time()) else: if tHandle in self.noteIndex: if sTitle in self.noteIndex[tHandle]: self.noteIndex[tHandle][sTitle]["cCount"] = cC self.noteIndex[tHandle][sTitle]["wCount"] = wC self.noteIndex[tHandle][sTitle]["pCount"] = pC - self.noteIndex[tHandle][sTitle]["updated"] = round(time.time()) + self.noteIndex[tHandle][sTitle]["updated"] = round(time()) return def _indexSynopsis(self, tHandle, isNovel, theText, nTitle): @@ -446,12 +447,12 @@ class NWIndex(): if tHandle in self.novelIndex: if sTitle in self.novelIndex[tHandle]: self.novelIndex[tHandle][sTitle]["synopsis"] = theText - self.novelIndex[tHandle][sTitle]["updated"] = round(time.time()) + self.novelIndex[tHandle][sTitle]["updated"] = round(time()) else: if tHandle in self.noteIndex: if sTitle in self.noteIndex[tHandle]: self.noteIndex[tHandle][sTitle]["synopsis"] = theText - self.noteIndex[tHandle][sTitle]["updated"] = round(time.time()) + self.noteIndex[tHandle][sTitle]["updated"] = round(time()) return def _indexNoteRef(self, tHandle, aLine, nLine, nTitle): diff --git a/tests/test_index.py b/tests/test_index.py index 11e6c595..a86fb017 100644 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -3,7 +3,6 @@ """ import pytest -import time import os import json @@ -29,7 +28,7 @@ def testIndexBuildCheck(monkeypatch, nwLipsum, nwDummy, nwTempProj, nwRef): assert theProject.openProject(nwLipsum) theProject.mainConf.debugInfo = True - monkeypatch.setattr(time, "time", lambda: 123.4) + monkeypatch.setattr("nw.core.index.time", lambda: 123.4) theIndex = NWIndex(theProject, nwDummy) notIndexable = {