Skip to content

Commit 895a1a1

Browse files
ReikaNekoUwUReikaNekoUwU
authored
Add files via upload
1 parent 95cb7c8 commit 895a1a1

4 files changed

Lines changed: 40 additions & 32 deletions

File tree

‎pywwwget_chatgpt.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ def _wrap_text(binary_handle):
700700

701701
# Fallback: pure-Python in-memory objects
702702
if isbytes:
703-
f = io.MkTempFile(init if init is not None else b"")
703+
f = BytesIO(init if init is not None else b"")
704704
if reset_to_start:
705705
f.seek(0)
706706
_created(f, "bytesio")
@@ -1284,12 +1284,12 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
12841284
if('User-Agent' in headers):
12851285
headers['User-Agent'] = httpuseragent
12861286
else:
1287-
httpuseragent.update({'User-Agent': httpuseragent})
1287+
headers.update({'User-Agent': httpuseragent})
12881288
if(httpreferer is not None):
12891289
if('Referer' in headers):
12901290
headers['Referer'] = httpreferer
12911291
else:
1292-
httpuseragent.update({'Referer': httpreferer})
1292+
headers.update({'Referer': httpreferer})
12931293

12941294
# Requests
12951295
if usehttp == "requests" and haverequests:
@@ -1392,7 +1392,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
13921392
httpmethodout = httpmethod
13931393
httpurlout = resp.geturl()
13941394
httpheaderout = resp.info()
1395-
httpheadersentout = httpheaders
1395+
httpheadersentout = headers
13961396
resp.release_conn()
13971397

13981398
# urllib fallback
@@ -1422,10 +1422,13 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14221422
httpversionout = resp.version
14231423
except AttributeError:
14241424
httpversionout = "1.1"
1425-
httpmethodout = resp.get_method()
1425+
try:
1426+
httpmethodout = resp.get_method()
1427+
except AttributeError:
1428+
httpmethodout = resp._method
14261429
httpurlout = resp.geturl()
14271430
httpheaderout = resp.info()
1428-
httpheadersentout = httpheaders
1431+
httpheadersentout = headers
14291432
try:
14301433
httpfile.seek(0, 0)
14311434
except Exception:
@@ -1434,7 +1437,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14341437
if(isinstance(httpheaderout, list)):
14351438
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
14361439
httpheaderout = fix_header_names(httpheaderout)
1437-
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': headers, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1440+
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
14381441
return returnval
14391442
else:
14401443
return httpfile

‎pywwwget_deepseek.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ def _wrap_text(binary_handle):
935935

936936
# Fallback: pure-Python in-memory objects
937937
if isbytes:
938-
f = io.MkTempFile(init if init is not None else b"")
938+
f = BytesIO(init if init is not None else b"")
939939
if reset_to_start:
940940
f.seek(0)
941941
_created(f, "bytesio")
@@ -1513,17 +1513,16 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
15131513
if resume_off and "Range" not in headers and "range" not in headers:
15141514
headers["Range"] = "bytes=%d-" % resume_off
15151515

1516-
headers = fix_header_names(headers)
15171516
if(httpuseragent is not None):
15181517
if('User-Agent' in headers):
15191518
headers['User-Agent'] = httpuseragent
15201519
else:
1521-
httpuseragent.update({'User-Agent': httpuseragent})
1520+
headers.update({'User-Agent': httpuseragent})
15221521
if(httpreferer is not None):
15231522
if('Referer' in headers):
15241523
headers['Referer'] = httpreferer
15251524
else:
1526-
httpuseragent.update({'Referer': httpreferer})
1525+
headers.update({'Referer': httpreferer})
15271526

15281527
# Requests
15291528
if usehttp == "requests" and haverequests:
@@ -1626,7 +1625,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
16261625
httpmethodout = httpmethod
16271626
httpurlout = resp.geturl()
16281627
httpheaderout = resp.info()
1629-
httpheadersentout = httpheaders
1628+
httpheadersentout = headers
16301629
resp.release_conn()
16311630

16321631
# urllib fallback
@@ -1656,10 +1655,13 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
16561655
httpversionout = resp.version
16571656
except AttributeError:
16581657
httpversionout = "1.1"
1659-
httpmethodout = resp.get_method()
1658+
try:
1659+
httpmethodout = resp.get_method()
1660+
except AttributeError:
1661+
httpmethodout = resp._method
16601662
httpurlout = resp.geturl()
16611663
httpheaderout = resp.info()
1662-
httpheadersentout = httpheaders
1664+
httpheadersentout = headers
16631665
try:
16641666
httpfile.seek(0, 0)
16651667
except Exception:
@@ -1668,7 +1670,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
16681670
if(isinstance(httpheaderout, list)):
16691671
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
16701672
httpheaderout = fix_header_names(httpheaderout)
1671-
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': headers, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1673+
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
16721674
return returnval
16731675
else:
16741676
return httpfile

‎pywwwget_merged.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ def _wrap_text(binary_handle):
707707

708708
# Fallback: pure-Python in-memory objects
709709
if isbytes:
710-
f = io.MkTempFile(init if init is not None else b"")
710+
f = BytesIO(init if init is not None else b"")
711711
if reset_to_start:
712712
f.seek(0)
713713
_created(f, "bytesio")
@@ -1313,18 +1313,16 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
13131313
if resume_off and "Range" not in headers and "range" not in headers:
13141314
headers["Range"] = "bytes=%d-" % resume_off
13151315

1316-
headers = fix_header_names(headers)
13171316
if(httpuseragent is not None):
13181317
if('User-Agent' in headers):
13191318
headers['User-Agent'] = httpuseragent
13201319
else:
1321-
httpuseragent.update({'User-Agent': httpuseragent})
1320+
headers.update({'User-Agent': httpuseragent})
13221321
if(httpreferer is not None):
13231322
if('Referer' in headers):
13241323
headers['Referer'] = httpreferer
13251324
else:
1326-
httpuseragent.update({'Referer': httpreferer})
1327-
1325+
headers.update({'Referer': httpreferer})
13281326
# Requests
13291327
if usehttp == "requests" and haverequests:
13301328
auth = (username, password) if (username and password) else None
@@ -1426,7 +1424,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14261424
httpmethodout = httpmethod
14271425
httpurlout = resp.geturl()
14281426
httpheaderout = resp.info()
1429-
httpheadersentout = httpheaders
1427+
httpheadersentout = headers
14301428
resp.release_conn()
14311429

14321430
# urllib fallback
@@ -1456,10 +1454,13 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14561454
httpversionout = resp.version
14571455
except AttributeError:
14581456
httpversionout = "1.1"
1459-
httpmethodout = resp.get_method()
1457+
try:
1458+
httpmethodout = resp.get_method()
1459+
except AttributeError:
1460+
httpmethodout = resp._method
14601461
httpurlout = resp.geturl()
14611462
httpheaderout = resp.info()
1462-
httpheadersentout = httpheaders
1463+
httpheadersentout = headers
14631464
try:
14641465
httpfile.seek(0, 0)
14651466
except Exception:
@@ -1468,7 +1469,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14681469
if(isinstance(httpheaderout, list)):
14691470
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
14701471
httpheaderout = fix_header_names(httpheaderout)
1471-
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': headers, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1472+
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
14721473
return returnval
14731474
else:
14741475
return httpfile

‎pywwwget_nextver.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ def _wrap_text(binary_handle):
715715

716716
# Fallback: pure-Python in-memory objects
717717
if isbytes:
718-
f = io.MkTempFile(init if init is not None else b"")
718+
f = BytesIO(init if init is not None else b"")
719719
if reset_to_start:
720720
f.seek(0)
721721
_created(f, "bytesio")
@@ -1294,17 +1294,16 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
12941294
if resume_off and "Range" not in headers and "range" not in headers:
12951295
headers["Range"] = "bytes=%d-" % resume_off
12961296

1297-
headers = fix_header_names(headers)
12981297
if(httpuseragent is not None):
12991298
if('User-Agent' in headers):
13001299
headers['User-Agent'] = httpuseragent
13011300
else:
1302-
httpuseragent.update({'User-Agent': httpuseragent})
1301+
headers.update({'User-Agent': httpuseragent})
13031302
if(httpreferer is not None):
13041303
if('Referer' in headers):
13051304
headers['Referer'] = httpreferer
13061305
else:
1307-
httpuseragent.update({'Referer': httpreferer})
1306+
headers.update({'Referer': httpreferer})
13081307

13091308
# Requests
13101309
if usehttp == "requests" and haverequests:
@@ -1407,7 +1406,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14071406
httpmethodout = httpmethod
14081407
httpurlout = resp.geturl()
14091408
httpheaderout = resp.info()
1410-
httpheadersentout = httpheaders
1409+
httpheadersentout = headers
14111410
resp.release_conn()
14121411

14131412
# urllib fallback
@@ -1437,10 +1436,13 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14371436
httpversionout = resp.version
14381437
except AttributeError:
14391438
httpversionout = "1.1"
1440-
httpmethodout = resp.get_method()
1439+
try:
1440+
httpmethodout = resp.get_method()
1441+
except AttributeError:
1442+
httpmethodout = resp._method
14411443
httpurlout = resp.geturl()
14421444
httpheaderout = resp.info()
1443-
httpheadersentout = httpheaders
1445+
httpheadersentout = headers
14441446
try:
14451447
httpfile.seek(0, 0)
14461448
except Exception:
@@ -1449,7 +1451,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__, ht
14491451
if(isinstance(httpheaderout, list)):
14501452
httpheaderout = make_http_headers_from_list_to_dict(httpheaderout)
14511453
httpheaderout = fix_header_names(httpheaderout)
1452-
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': headers, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
1454+
returnval = {'Type': "Content", 'Headers': httpheaderout, 'Version': httpversionout, 'Method': httpmethodout, 'HeadersSent': httpheadersentout, 'URL': httpurlout, 'Code': httpcodeout, 'Reason': httpcodereason, 'HTTPLib': usehttp}
14531455
return returnval
14541456
else:
14551457
return httpfile

0 commit comments

Comments
 (0)