Skip to content

Commit 10a59ea

Browse files
committed
Fixed script generation
1 parent b872812 commit 10a59ea

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

docs/source/changelog.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ Glossary
3737
Releases
3838
---------------------
3939

40+
v3.2.1
41+
===================
42+
- GUI: Fixed conversion from GUI data to a Python daf core script.
43+
44+
4045
v3.2.0
4146
===================
4247
- GUI:

src/daf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import warnings
2121

2222

23-
VERSION = "3.2.0"
23+
VERSION = "3.2.1"
2424

2525
if sys.version_info.minor == 12 and sys.version_info.major == 3:
2626
warnings.warn(

src/daf_gui/main.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,11 @@ def generate_daf_script(self):
728728

729729
accounts: list[ObjectInfo] = self.lb_accounts.get()
730730

731-
accounts_str, imports, other_str = convert_objects_to_script(accounts)
731+
accounts_str, imports = convert_objects_to_script(accounts)
732732
imports = "\n".join(set(imports))
733-
if other_str != "":
734-
other_str = "\n" + other_str
735733

736734
if logger_is_present:
737-
logger_str, logger_imports, _ = convert_objects_to_script(logger)
735+
logger_str, logger_imports = convert_objects_to_script(logger)
738736
logger_imports = "\n".join(set(logger_imports))
739737
else:
740738
logger_imports = ""
@@ -746,7 +744,7 @@ def generate_daf_script(self):
746744
kwargs["username"] = connection_mgr.auth.login
747745
kwargs["password"] = connection_mgr.auth.password
748746

749-
remote_str, remote_imports, _ = convert_objects_to_script(ObjectInfo(daf.RemoteAccessCLIENT, kwargs))
747+
remote_str, remote_imports = convert_objects_to_script(ObjectInfo(daf.RemoteAccessCLIENT, kwargs))
750748
remote_imports = "\n".join(set(remote_imports))
751749
else:
752750
remote_str, remote_imports = "", ""
@@ -767,7 +765,7 @@ def generate_daf_script(self):
767765
{remote_imports}
768766
{imports}
769767
{f"from {tracing.__module__} import {tracing.__class__.__name__}" if tracing_is_present else ""}
770-
import daf{other_str}
768+
import daf
771769
772770
# Define the logger
773771
{f"logger = {logger_str}" if logger_is_present else ""}

0 commit comments

Comments
 (0)