sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-21 20:23:50 +03:00
Code Activity

samba-tool gpo: close opened files

Browse Source 
It is almost certain that we are not going to run out of files, as
they get garbage collected anyway, but in some circumstances these can
fill your screen with "ResourceWarning: unclosed file" messages, which
hides the real messages.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
This commit is contained in:
Douglas Bagnall
2025-03-14 19:47:53 +13:00
committed by Douglas Bagnall
parent 20129d16dc
commit 9d3a0ffa8a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/samba/netcmd/gpo.py
View File

@@ -342,7 +342,8 @@ def copy_directory_remote_to_local(conn, remotedir, localdir):
os.mkdir(l_name)
else:
data = conn.loadfile(r_name)
open(l_name, 'wb').write(data)
with open(l_name, 'wb') as f:
f.write(data)
def copy_directory_local_to_remote(conn, localdir, remotedir,
@@ -378,8 +379,8 @@ def copy_directory_local_to_remote(conn, localdir, remotedir,
except NTSTATUSError:
pass
data = open(l_name, 'rb').read()
conn.savefile(r_name, data)
with open(l_name, 'rb') as f:
conn.savefile(r_name, f.read())
class GPOCommand(Command):
@@ -1459,7 +1460,8 @@ class cmd_create(GPOCommand):
os.mkdir(os.path.join(gpodir, "Machine"))
os.mkdir(os.path.join(gpodir, "User"))
gpt_contents = "[General]\r\nVersion=0\r\n"
open(os.path.join(gpodir, "GPT.INI"), "w").write(gpt_contents)
with open(os.path.join(gpodir, "GPT.INI"), "w") as f:
f.write(gpt_contents)
except Exception as e:
raise CommandError("Error Creating GPO files", e)
@@ -3087,7 +3089,8 @@ samba-tool gpo manage files add {31B2F340-016D-11D2-945F-00C04FB984F9} ./source.
out = BytesIO()
xml_data.write(out, encoding='UTF-8', xml_declaration=True)
out.seek(0)
source_data = open(source, 'rb').read()
with open(source, 'rb') as f:
source_data = f.read()
sysvol_source = '\\'.join([vgp_dir, os.path.basename(source)])
try:
create_directory_hier(conn, vgp_dir)
@@ -3555,7 +3558,8 @@ samba-tool gpo manage scripts startup add {31B2F340-016D-11D2-945F-00C04FB984F9}
else:
raise
script_data = open(script, 'rb').read()
with open(script, 'rb') as f:
script_data = f.read()
listelement = ET.SubElement(data, 'listelement')
script_elm = ET.SubElement(listelement, 'script')
script_elm.text = os.path.basename(script)