babyweb 0.1.1.9__py3-none-any.whl → 0.1.3__py3-none-any.whl

babyweb/requesters.py

@@ -35,21 +35,19 @@ def parse_url_parts(host, path, port, protocol):
 		port = protocol == "https" and 443 or 80
 	return host, path, port, protocol
 
-def fetch(host, path="/", port=None, asjson=False, cb=None, timeout=1, asyn=False, protocol="http", ctjson=False, qsp=None, fakeua=False, retries=5):
+def fetch(host, path="/", port=None, asjson=False, cb=None, timeout=1, asyn=False, protocol="http", ctjson=False, qsp=None, fakeua=False, retries=5, headers={}):
 	host, path, port, protocol = parse_url_parts(host, path, port, protocol)
 	if qsp:
 		path += "?"
 		for k, v in list(qsp.items()):
 			path += "%s=%s&"%(k, v)
 		path = path[:-1]
-	gkwargs = {}
-	headers = {}
+	gkwargs = { "headers": headers }
 	if fakeua:
 		if type(fakeua) is str:
 			headers['User-Agent'] = fakeua
 		else:
 			headers['User-Agent'] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.75 Safari/537.36'
-		gkwargs["headers"] = headers
 	if asyn or cb: # asyn w/o cb works, will just log
 		secure = protocol == "https"
 		if ctjson:
@@ -62,18 +60,18 @@ def fetch(host, path="/", port=None, asjson=False, cb=None, timeout=1, asyn=Fals
 	log("fetch %s"%(furl,))
 	return syncreq(furl, "get", asjson, ctjson, retries, gkwargs)
 
-def post(host, path="/", port=80, data=None, protocol="http", asjson=False, ctjson=False, text=None, cb=None):
+def post(host, path="/", port=None, data=None, protocol="http", asjson=False, ctjson=False, text=None, cb=None, headers={}):
+	host, path, port, protocol = parse_url_parts(host, path, port, protocol)
 	if ctjson:
 		data = rec_conv(data)
 	if cb:
 		if ctjson:
 			orig_cb = cb
 			cb = lambda v : orig_cb(_ctjson(v))
-		host, path, port, protocol = parse_url_parts(host, path, port, protocol)
-		return dpost(host, path, port, protocol == "https", data=data, text=text, cb=cb)
+		return dpost(host, path, port, protocol == "https", headers, data, text, cb)
 	url = "://" in host and host or "%s://%s:%s%s"%(protocol, host, port, path)
 	log("post %s"%(url,))
-	kwargs = {}
+	kwargs = { "headers": headers }
 	if data:
 		kwargs["json"] = data
 	elif text:

babyweb/response.py

@@ -10,6 +10,7 @@ def read_file(data_field):
 
 class Response(object):
     def __init__(self, request):
+        self.noabort = False
         self.id = request.id
         self.ip = request.real_ip
         self.request = request
@@ -52,7 +53,7 @@ class Response(object):
 
     def _close(self):
         timeout(.001, self.response.dispatch)
-        abort_branch()
+        self.noabort or abort_branch()
 
     def _header(self, *args, **kwargs):
         self.response.__setitem__(*args, **kwargs)

babyweb/version.py

@@ -1 +1 @@
-__version__ = "0.1.1.9"
+__version__ = "0.1.3"

{babyweb-0.1.1.9.dist-info → babyweb-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: babyweb
-Version: 0.1.1.9
+Version: 0.1.3
 Summary: Basic Asynchronous weB librarY
 Author: Mario Balibrera
 Author-email: mario.balibrera@gmail.com
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 License-File: LICENSE
-Requires-Dist: dez >=0.10.10.42
+Requires-Dist: dez >=0.10.10.43
 Requires-Dist: fyg >=0.1.7.8
 Requires-Dist: requests >=2.28.1
 

{babyweb-0.1.1.9.dist-info → babyweb-0.1.3.dist-info}/RECORD

@@ -6,20 +6,20 @@ babyweb/daemons.py,sha256=YbTVcyG7xlOm1LFtJcsFGIGsV1I-jjjn_byqMPSPnQI,1886
 babyweb/logger.py,sha256=evX96jubM5UlF20-1v83Z0rqKnSPDjIYkiE75YUlD1c,1083
 babyweb/mail.py,sha256=A7FL99zDU9Y_LAZPpw9-LWOsxuc1eoiGMN1EYVrwOIo,607
 babyweb/memcache.py,sha256=W6JWcBjJPZx8RPYQXYRbCWMl-ziwy9OtzCvxV9RlCXs,484
-babyweb/requesters.py,sha256=kbHMjTKiyTx9GNUXA0jzIw6Zl7WdkhjA0O7dcZ7W77A,3507
-babyweb/response.py,sha256=_2hY9ib39MG59nvLDKD37pNCFF9ENuydegBQsd0KV18,2328
+babyweb/requesters.py,sha256=dpkw94d5UbRkEIBwShLQk98571VIP-SI9sSFww3MXtg,3523
+babyweb/response.py,sha256=W5oZsTlUUSee3KeDQDG1QgSNiFx_z96HaNKDogNgtes,2373
 babyweb/routes.py,sha256=V9EQKjWqbwWrR1t4Ren9IGAcmcS5awYCIHdseWoEqVU,483
 babyweb/server.py,sha256=l1Co447w-Ef3Tlu0sj_cERRbvSS_GCbaTkHhfsJrJh8,1561
 babyweb/shield.py,sha256=uB4vDKf6jKwWIebAjitm_q9T86iKPRKPNNeKcPgLfrE,1551
 babyweb/sms.py,sha256=lYQFgpFjAas1XIolE0QC4ro2wgXH7hruzV1Dxz72-sE,299
-babyweb/version.py,sha256=dDZX1_xZ3oW3jX234jh67HjMz1h3qu-h2uxOpeRlO4c,23
+babyweb/version.py,sha256=R5TtpJu7Qu6sOarfDpp-5Oyy8Pi2Ir3VewCvsCQiAgo,21
 babyweb/util/__init__.py,sha256=LWPdEVAVSq9NE7SHH434tlb517B4DfUFIWAc25QECI8,357
 babyweb/util/converters.py,sha256=SfGPkBFK1GBm085WdtUjskXK0Y_j8yRs7UC_aeLIOmg,1541
 babyweb/util/loaders.py,sha256=wD9H9pB6HWAB41i7oTNfxaKd7BOV9p4oNHu4F5-ilkk,1597
 babyweb/util/responders.py,sha256=w_STmdUvdB9seOxOV0v-WAFUrqVrlUtuqoLRG-QugLI,6195
 babyweb/util/setters.py,sha256=xIHtdLQgdlyCUC83q3ZW8ab6U5Rj3UU6ZgK70b-TOg4,337
-babyweb-0.1.1.9.dist-info/LICENSE,sha256=TCGFq2RZnPZed3cKBhfq8EIxNzHcwJWJsBW8p9y1dDk,1068
-babyweb-0.1.1.9.dist-info/METADATA,sha256=FA1_kPF-zLaQtL6Ff24A9oAWZf9Ataec-uMS8HkGJcs,762
-babyweb-0.1.1.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-babyweb-0.1.1.9.dist-info/top_level.txt,sha256=-KcZVMe9-tSS5gwyDZGyLvU5bemV6aWTSofb0B37Mts,8
-babyweb-0.1.1.9.dist-info/RECORD,,
+babyweb-0.1.3.dist-info/LICENSE,sha256=TCGFq2RZnPZed3cKBhfq8EIxNzHcwJWJsBW8p9y1dDk,1068
+babyweb-0.1.3.dist-info/METADATA,sha256=kGEocqJBtxySjK1pK6kNKGrHQBg93ossJq-CqL_1FuQ,760
+babyweb-0.1.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+babyweb-0.1.3.dist-info/top_level.txt,sha256=-KcZVMe9-tSS5gwyDZGyLvU5bemV6aWTSofb0B37Mts,8
+babyweb-0.1.3.dist-info/RECORD,,