Skip to content

Commit afbfa5b

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 6af5a55 commit afbfa5b

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

pycatfile.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9804,12 +9804,10 @@ def download_file_from_internet_file(url, headers=geturls_headers_pyfile_python_
98049804
return download_file_from_sftp_file(url)
98059805
elif(urlparts.scheme == "tcp" or urlparts.scheme == "udp"):
98069806
outfile = MkTempFile()
9807-
use_auth = False
9808-
if(urlparts.username is not None and urlparts.password is not None):
9809-
use_auth = True
9810-
returnval = recv_to_fileobj(outfile, urlparts.hostname, urlparts.port, urlparts.scheme, require_auth=use_auth, expected_user=urlparts.username, expected_pass=urlparts.password)
9807+
returnval = recv_via_url(outfile, url, recv_to_fileobj)
98119808
if(not returnval):
98129809
return False
9810+
outfile.seek(0, 0)
98139811
return outfile
98149812
else:
98159813
return False
@@ -9864,11 +9862,10 @@ def upload_file_to_internet_file(ifp, url):
98649862
else:
98659863
return upload_file_to_sftp_file(ifp, url)
98669864
elif(urlparts.scheme == "tcp" or urlparts.scheme == "udp"):
9867-
use_auth = False
9868-
if(urlparts.username is not None and urlparts.password is not None):
9869-
use_auth = True
9870-
sftpfile.seek(0, 0)
9871-
returnval = send_from_fileobj(ifp, urlparts.hostname, urlparts.port, urlparts.scheme, expected_user=urlparts.username, expected_pass=urlparts.password)
9865+
ifp.seek(0, 0)
9866+
returnval = send_via_url(ifp, url, send_from_fileobj)
9867+
if(not returnval):
9868+
return False
98729869
return returnval
98739870
else:
98749871
return False

0 commit comments

Comments
 (0)