Mercurial Repositories > eric / changeset
changeset
Modified the datetime.datetime methods to include the 'tz' argument.
Mon, 04 Sep 2023 17:58:15 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 04 Sep 2023 17:58:15 +0200
- branch
- eric7
- changeset 10192
- f457742dd3d6
- parent 10191
- dc47d7d2ff34
- child 10193
- 0d7392e49c48
Modified the datetime.datetime methods to include the 'tz' argument.
--- a/eric7.epj Sun Sep 03 17:35:15 2023 +0200 +++ b/eric7.epj Mon Sep 04 17:58:15 2023 +0200 @@ -68,7 +68,7 @@ "DocstringType": "eric_black", "EnabledCheckerCategories": "C, D, E, I, M, NO, N, Y, U, W", "ExcludeFiles": "*/ThirdParty/*, */coverage/*, */Ui_*.py, */Examples/*, */pycodestyle.py,*/pyflakes/checker.py,*/mccabe.py,*/eradicate.py,*/ast_unparse.py,*/piplicenses.py,*/pipdeptree.py,*/MCUScripts/*,*/MicroPython/Tools/*", - "ExcludeMessages": "C101,E203,E265,E266,E305,E402,M201,M301,M302,M303,M304,M305,M306,M307,M308,M311,M312,M313,M314,M315,M321,M701,M702,M811,M834,N802,N803,N807,N808,N821,W293,W503,Y119,Y401,Y402", + "ExcludeMessages": "C101,E203,E265,E266,E305,E402,M201,M701,M702,M811,M834,N802,N803,N807,N808,N821,W293,W503,Y119,Y401,Y402", "FixCodes": "", "FixIssues": false, "FutureChecker": "",
--- a/scripts/install.py Sun Sep 03 17:35:15 2023 +0200 +++ b/scripts/install.py Mon Sep 04 17:58:15 2023 +0200 @@ -1425,7 +1425,7 @@ global createInstallInfoFile, installInfo, installCwd, cfg if createInstallInfoFile: - installDateTime = datetime.datetime.now(tz=None) + installDateTime = datetime.datetime.now(tz=datetime.timezone.utc) try: installInfo["sudo"] = os.getuid() == 0 except AttributeError:
--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py Mon Sep 04 17:58:15 2023 +0200 @@ -480,7 +480,9 @@ @param relSrc name of the file relative to the project (defaults to "") @type str (optional) """ - then = datetime.datetime.utcfromtimestamp(src.stat().st_mtime) + then = datetime.datetime.fromtimestamp( + src.stat().st_mtime, tz=datetime.timezone.utc + ) with open(src, "rb") as buf: srcContents, _, _ = black.decode_bytes(buf.read()) try: @@ -491,7 +493,7 @@ fileName = relSrc if bool(relSrc) else str(src) - now = datetime.datetime.utcnow() + now = datetime.datetime.now(tz=datetime.timezone.utc) srcName = f"{fileName}\t{then} +0000" dstName = f"{fileName}\t{now} +0000" diffContents = black.diff(srcContents, dstContents, srcName, dstName)
--- a/src/eric7/HelpViewer/HelpBookmarksWidget.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/HelpViewer/HelpBookmarksWidget.py Mon Sep 04 17:58:15 2023 +0200 @@ -429,7 +429,7 @@ bookmarksDict = { "creator": "eric7", "version": 1, - "created": datetime.datetime.now().isoformat( + "created": datetime.datetime.now(tz=datetime.timezone.utc).isoformat( sep=" ", timespec="seconds" ), "bookmarks": [],
--- a/src/eric7/PluginManager/PluginManager.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/PluginManager/PluginManager.py Mon Sep 04 17:58:15 2023 +0200 @@ -1257,9 +1257,10 @@ elif period in [1, 2, 3] and pathlib.Path(self.pluginRepositoryFile).exists(): lastModified = datetime.datetime.fromtimestamp( - pathlib.Path(self.pluginRepositoryFile).stat().st_mtime + pathlib.Path(self.pluginRepositoryFile).stat().st_mtime, + tz=datetime.timezone.utc, ) - now = datetime.datetime.now() + now = datetime.datetime.now(tz=datetime.timezone.utc) delta = now - lastModified if ( (period == 1 and delta.days < 1)
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py Mon Sep 04 17:58:15 2023 +0200 @@ -157,12 +157,12 @@ "M303": QCoreApplication.translate( "MiscellaneousChecker", "use of 'datetime.datetime.utcnow()' should be avoided.\n" - "Use 'datetime.datetime.now(tz=)' instead.", + "Use 'datetime.datetime.now(tz=datetime.timezone.utc)' instead.", ), "M304": QCoreApplication.translate( "MiscellaneousChecker", "use of 'datetime.datetime.utcfromtimestamp()' should be avoided.\n" - "Use 'datetime.datetime.fromtimestamp(, tz=)' instead.", + "Use 'datetime.datetime.fromtimestamp(..., tz=datetime.timezone.utc)' instead.", ), "M305": QCoreApplication.translate( "MiscellaneousChecker",
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Mon Sep 04 17:58:15 2023 +0200 @@ -256,7 +256,10 @@ self.homePageUrlEdit.text(), os.linesep ) sourceCode += '__date__ = "{0}"{1}'.format( - datetime.datetime.now().isoformat().split(".")[0], os.linesep + datetime.datetime.now(tz=datetime.timezone.utc) + .isoformat() + .split(".")[0], + os.linesep, ) sourceCode += '__prj__ = "{0}"{1}'.format(self.nameEdit.text(), os.linesep) sourceCode += os.linesep
--- a/src/eric7/QtHelpInterface/HelpDocsInstaller.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/QtHelpInterface/HelpDocsInstaller.py Mon Sep 04 17:58:15 2023 +0200 @@ -230,7 +230,12 @@ if ( dt is not None and namespace in engine.registeredDocumentations() - and (datetime.datetime.fromtimestamp(f.stat().st_mtime) == dt) + and ( + datetime.datetime.fromtimestamp( + f.stat().st_mtime, tz=datetime.timezone.utc + ) + == dt + ) and qchFile == str(f.resolve()) ): return False @@ -249,7 +254,9 @@ engine.setCustomValue( versionKey, - datetime.datetime.fromtimestamp(f.stat().st_mtime).isoformat() + datetime.datetime.fromtimestamp( + f.stat().st_mtime, tz=datetime.timezone.utc + ).isoformat() + "|" + str(f.resolve()), ) @@ -294,7 +301,12 @@ if ( dt is not None and namespace in engine.registeredDocumentations() - and (datetime.datetime.fromtimestamp(f.stat().st_mtime) == dt) + and ( + datetime.datetime.fromtimestamp( + f.stat().st_mtime, tz=datetime.timezone.utc + ) + == dt + ) and qchFile == str(f.resolve()) ): return False @@ -313,7 +325,9 @@ engine.setCustomValue( versionKey, - datetime.datetime.fromtimestamp(f.stat().st_mtime).isoformat() + datetime.datetime.fromtimestamp( + f.stat().st_mtime, tz=datetime.timezone.utc + ).isoformat() + "|" + str(f.resolve()), )
--- a/src/eric7/Templates/TemplateViewer.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/Templates/TemplateViewer.py Mon Sep 04 17:58:15 2023 +0200 @@ -656,7 +656,7 @@ """ project = ericApp().getObject("Project") editor = self.viewmanager.activeWindow() - now = datetime.datetime.now() + now = datetime.datetime.now() # noqa: M305 sepchar = Preferences.getTemplates("SeparatorChar") keyfmt = sepchar + "{0}" + sepchar varValues = {
--- a/src/eric7/UI/UserInterface.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/UI/UserInterface.py Mon Sep 04 17:58:15 2023 +0200 @@ -1707,7 +1707,9 @@ if os.path.exists(filename): # eric was installed via pip (i.e. eric-ide) with contextlib.suppress(OSError): - installDateTime = datetime.datetime.now(tz=None) + installDateTime = datetime.datetime.now( + tz=datetime.timezone.utc + ) with open(filename, "r") as infoFile: installInfo = json.load(infoFile) installInfo["guessed"] = True @@ -1768,7 +1770,7 @@ ) > os.path.getmtime(installInfoFile): # eric was updated via pip (i.e. eric-ide) # just update the installation date and time - installDateTime = datetime.datetime.now(tz=None) + installDateTime = datetime.datetime.now(tz=datetime.timezone.utc) installInfo["installed_on"] = installDateTime.strftime( "%Y-%m-%d %H:%M:%S" )
--- a/src/eric7/WebBrowser/Session/SessionManagerDialog.py Sun Sep 03 17:35:15 2023 +0200 +++ b/src/eric7/WebBrowser/Session/SessionManagerDialog.py Mon Sep 04 17:58:15 2023 +0200 @@ -69,7 +69,8 @@ itm.setText( 1, datetime.datetime.fromtimestamp( - pathlib.Path(session.filePath).stat().st_mtime + pathlib.Path(session.filePath).stat().st_mtime, + tz=datetime.timezone.utc, ).isoformat(sep=" ", timespec="minutes"), ) itm.setData(0, SessionManagerDialog.SessionFileRole, session.filePath)
