From 6cc0107693e1e634387d802929b01b240de33f5d Mon Sep 17 00:00:00 2001 From: Matej Jeglic Date: Tue, 6 Sep 2022 20:53:52 +0200 Subject: [PATCH 1/3] Save output file to local directory instead of desktop (for windows) --- doc/pattern_tools/svgfig.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/pattern_tools/svgfig.py b/doc/pattern_tools/svgfig.py index 4fa69806b4..de5da182ce 100755 --- a/doc/pattern_tools/svgfig.py +++ b/doc/pattern_tools/svgfig.py @@ -452,8 +452,6 @@ class SVG: def interpret_fileName(self, fileName=None): if fileName is None: fileName = _default_fileName - if re.search("windows", platform.system(), re.I) and not os.path.isabs(fileName): - fileName = _default_directory + os.sep + fileName return fileName def save(self, fileName=None, encoding="utf-8", compresslevel=None): From 4bec43cf798b7891b86df89237243f68e38db30c Mon Sep 17 00:00:00 2001 From: Matej Jeglic Date: Tue, 6 Sep 2022 21:08:37 +0200 Subject: [PATCH 2/3] Pythonify the 'interpret_fileName function' --- doc/pattern_tools/svgfig.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/pattern_tools/svgfig.py b/doc/pattern_tools/svgfig.py index de5da182ce..214be640bd 100755 --- a/doc/pattern_tools/svgfig.py +++ b/doc/pattern_tools/svgfig.py @@ -449,10 +449,9 @@ class SVG: return output - def interpret_fileName(self, fileName=None): - if fileName is None: - fileName = _default_fileName - return fileName + @staticmethod + def interpret_fileName(fileName=None): + return fileName or _default_fileName def save(self, fileName=None, encoding="utf-8", compresslevel=None): """Save to a file for viewing. Note that svg.save() overwrites the file named _default_fileName. From 7de7891c4d0427855f473fc296f34282f603cc8e Mon Sep 17 00:00:00 2001 From: Matej Jeglic Date: Wed, 7 Sep 2022 08:25:31 +0200 Subject: [PATCH 3/3] Removed intialization of _default_directory --- doc/pattern_tools/svgfig.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/pattern_tools/svgfig.py b/doc/pattern_tools/svgfig.py index 214be640bd..37eaf77c83 100755 --- a/doc/pattern_tools/svgfig.py +++ b/doc/pattern_tools/svgfig.py @@ -34,18 +34,6 @@ try: except NameError: xrange = range # Python 3 - -if re.search("windows", platform.system(), re.I): - try: - import _winreg - _default_directory = _winreg.QueryValueEx(_winreg.OpenKey(_winreg.HKEY_CURRENT_USER, - r"Software\Microsoft\Windows\Current Version\Explorer\Shell Folders"), "Desktop")[0] -# tmpdir = _winreg.QueryValueEx(_winreg.OpenKey(_winreg.HKEY_CURRENT_USER, "Environment"), "TEMP")[0] -# if tmpdir[0:13] != "%USERPROFILE%": -# tmpdir = os.path.expanduser("~") + tmpdir[13:] - except: - _default_directory = os.path.expanduser("~") + os.sep + "Desktop" - _default_fileName = "tmp.svg" _hacks = {}