diff -r 31e63e25b4cc -r 64beb9e9c749 version.py --- a/version.py Mon Aug 21 20:17:19 2017 +0000 +++ b/version.py Mon Aug 21 23:22:58 2017 +0300 @@ -23,105 +23,114 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -import subprocess, os +import subprocess +import os + import util.paths as paths + def GetCommunityHelpMsg(): - return _("The best place to ask questions about Beremiz/PLCOpenEditor\n" - "is project's mailing list: beremiz-devel@lists.sourceforge.net\n" - "\n" - "This is the main community support channel.\n" - "For posting it is required to be subscribed to the mailing list.\n" - "\n" - "You can subscribe to the list here:\n" - "https://lists.sourceforge.net/lists/listinfo/beremiz-devel") + return _( + "The best place to ask questions about Beremiz/PLCOpenEditor\n" + "is project's mailing list: beremiz-devel@lists.sourceforge.net\n" + "\n" + "This is the main community support channel.\n" + "For posting it is required to be subscribed to the mailing list.\n" + "\n" + "You can subscribe to the list here:\n" + "https://lists.sourceforge.net/lists/listinfo/beremiz-devel" + ) + def GetAppRevision(): rev = None - app_dir=paths.AbsDir(__file__) + app_dir = paths.AbsDir(__file__) try: pipe = subprocess.Popen( ["hg", "id", "-i"], - stdout = subprocess.PIPE, - cwd = app_dir + stdout=subprocess.PIPE, + cwd=app_dir ) rev = pipe.communicate()[0] if pipe.returncode != 0: rev = None - except: + except Exception: pass - + # if this is not mercurial repository # try to read revision from file if rev is None: try: - f = open(os.path.join(app_dir,"revision")) + f = open(os.path.join(app_dir, "revision")) rev = f.readline() - except: + except Exception: pass return rev + def GetAboutDialogInfo(): import wx info = wx.AboutDialogInfo() info.Name = "Beremiz" info.Version = app_version - - info.Copyright = "(C) 2016 Andrey Skvortsov\n" + + info.Copyright = "" + info.Copyright += "(C) 2016-2017 Andrey Skvortsov\n" info.Copyright += "(C) 2008-2015 Eduard Tisserant\n" info.Copyright += "(C) 2008-2015 Laurent Bessard" info.WebSite = ("http://beremiz.org", "beremiz.org") - + info.Description = _("Open Source framework for automation, " - "implemented IEC 61131 IDE with constantly growing set of extensions " - "and flexible PLC runtime.") - - info.Developers = ("Andrey Skvortsov ", - "Sergey Surkov ", - "Edouard Tisserant ", - "Laurent Bessard ") + "implemented IEC 61131 IDE with constantly growing set of extensions " + "and flexible PLC runtime.") + info.Developers = ( + "Andrey Skvortsov ", + "Sergey Surkov ", + "Edouard Tisserant ", + "Laurent Bessard ") - info.License = ('\n This program is free software; you can redistribute it and/or\n' - ' modify it under the terms of the GNU General Public License\n' - ' as published by the Free Software Foundation; either version 2\n' - ' of the License, or (at your option) any later version.\n' - '\n' - ' This program is distributed in the hope that it will be useful,\n' - ' but WITHOUT ANY WARRANTY; without even the implied warranty of\n' - ' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n' - ' GNU General Public License below for more details.\n' - '\n' - '\n' - '\n' - '') + info.License = ( + '\n This program is free software; you can redistribute it and/or\n' + ' modify it under the terms of the GNU General Public License\n' + ' as published by the Free Software Foundation; either version 2\n' + ' of the License, or (at your option) any later version.\n' + '\n' + ' This program is distributed in the hope that it will be useful,\n' + ' but WITHOUT ANY WARRANTY; without even the implied warranty of\n' + ' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n' + ' GNU General Public License below for more details.\n' + '\n' + '\n' + '\n' + '' + ) # read license file - path=paths.AbsDir(__file__) + path = paths.AbsDir(__file__) license_path = os.path.join(path, "COPYING") - license='' + license = '' if os.path.exists(license_path): with open(license_path) as f: info.License += f.read() info.Icon = wx.Icon(os.path.join(path, "images", "about_brz_logo.png"), wx.BITMAP_TYPE_PNG) - info.Translators = ("Russian\t- Andrey Skvortsov ", - "Korean\t- Reinhard Lee ", - "German\t- Mark Muzenhardt ", - "French\t- Laurent Bessard ", - " \t Fabien M ", - "Slovenian\t- Janez Pregelj", - "Portuguese\t- Thiago Alves " + info.Translators = ( + "Russian\t- Andrey Skvortsov ", + "Korean\t- Reinhard Lee ", + "German\t- Mark Muzenhardt ", + "French\t- Laurent Bessard ", + " \t Fabien M ", + "Slovenian\t- Janez Pregelj", + "Portuguese\t- Thiago Alves " ) return info -app_version = "1.2" + +app_version = "1.2" rev = GetAppRevision() if rev is not None: app_version = app_version + "-" + rev.rstrip() - - -