Skip to content

Commit e6c29b4

Browse files
committed
version 1.20211227.1
1 parent 6fcb812 commit e6c29b4

File tree

8 files changed

+17
-34
lines changed

8 files changed

+17
-34
lines changed

docs/chapter-01.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ details if you come from web2py):
5252
now exclusively on the regular Python import mechanism.
5353
- PY4WEB, like web2py, can serve multiple applications concurrently, as
5454
long as the apps are submodules of the apps module.
55-
- PY4WEB, unlike web2py, is based on bottlepy and in particular uses
56-
the Bottle request object and the Bottle routing mechanism. This is
57-
achieved with `ombott (One More BOTTle) <https://github.com/valq7711/ombott>`__,
58-
which is a fast bottlepy spin-off.
55+
- PY4WEB, unlike web2py, is based on ombott
56+
(a reduced and faster spin-off of Bottle) and in particular uses
57+
a Bottle-compatible request object and routing mechanism.
58+
5959
- PY4WEB, unlike web2py, does not create a new environment at every
6060
request. It introduces the concept of fixtures to explicitly declare
6161
which objects need to be (re)initialized when a new http request arrives

docs/chapter-05.rst

+6-7
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ The newly created file will be accessible at
6969
Notice that ``static`` is a special path for py4web and only files under
7070
the ``static`` folder are served.
7171

72-
Important: internally py4web uses the bottle
73-
`static_file <https://bottlepy.org/docs/dev/tutorial.html#static-files>`__
74-
method for serving static files, which means it supports streaming,
75-
partial content, range requests, and if-modified-since. This is all
72+
Important: internally py4web uses the ombott
73+
(One More BOTTle) <https://github.com/valq7711/ombott>`__,
74+
It supports streaming, partial content, range requests,
75+
and if-modified-since. This is all
7676
handled automatically based on the HTTP request headers.
7777

7878
Dynamic Web Pages
@@ -218,7 +218,7 @@ This action can be accessed at:
218218

219219

220220

221-
Notice that the request object is a `Bottle request object <https://bottlepy.org/docs/dev/api.html#the-request-object>`__.
221+
Notice that the request object is equivalent to a `Bottle request object <https://bottlepy.org/docs/dev/api.html#the-request-object>`__.
222222
with one additional attribute:
223223

224224
::
@@ -364,8 +364,7 @@ The scaffold app contains an example of a more complex action:
364364
365365
Notice the following:
366366

367-
- ``request``, ``response``, ``abort`` are defined by Bottle, using
368-
`ombott (One More BOTTle) <https://github.com/valq7711/ombott>`__,
367+
- ``request``, ``response``, ``abort`` are defined by
369368
which is a fast bottlepy spin-off.
370369
- ``redirect`` and ``URL`` are similar to their web2py counterparts
371370
- helpers (``A``, ``DIV``, ``SPAN``, ``IMG``, etc) must be imported

docs/chapter-15.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ Some of the main differences are the following:
6767
upon redirection.
6868

6969
- web2py uses its own request/response objects. py4web uses the request/response objects from the
70-
underlying Bottle framework. While this may change in the future we are committed to keep them
71-
compatible with Bottle because of its excellent documentation. Bottle also handles for py4web
70+
underlying Ombott library. While this may change in the future we are committed to keep them
7271
the interface with the web server, routing, partial requests, if modified since, and file
7372
streaming.
7473

docs/chapter-16.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Advanced topics and examples
77
py4web and asyncio
88
------------------
99

10-
py4web (as bottle) is thread-based, with high speed and efficient memory usage.
1110
Asyncio is not strictly needed, at least for most of the normal use
1211
cases where it will add problems more than value because of its concurrency model.
1312
On the other hand, we think py4web needs a built-in websocket async based solution.

docs/locales/pt/LC_MESSAGES/chapter-01.po

-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ msgstr ""
151151

152152
#: ../../chapter-01.rst:53
153153
msgid ""
154-
"PY4WEB, unlike web2py, is based on bottlepy and in particular uses the "
155154
"Bottle request object and the Bottle routing mechanism."
156155
msgstr ""
157156
"PY4WEB, ao contrário web2py, é baseado em bottlepy e em usos particulares do"

docs/spelling_wordlist_en.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ multiselect
144144
multiuser
145145
myfunction
146146
mysql
147-
MySQLdb
148147
natively
149148
ndb
150149
Northwind
151150
NoSQL
152151
OAuth
152+
ombott
153153
ondelete
154154
onwards
155155
optimiser

py4web/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
__author__ = "Massimo Di Pierro <[email protected]>"
44
__license__ = "BSDv3"
5-
__version__ = "1.20211208.1"
5+
__version__ = "1.20211227.1"
66

77

88
def _maybe_gevent():

setup.py

+4-17
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,10 @@ def get_version():
2323
description="Experimental py4web (a better web2py)",
2424
packages=["py4web", "py4web.utils", "py4web.utils.auth_plugins"],
2525
package_data={"py4web": ["assets/*"],},
26-
install_requires=[
27-
"wheel",
28-
"click",
29-
"colorama",
30-
"cryptography",
31-
"ombott",
32-
"tornado",
33-
"renoir >= 1.4.0",
34-
"requests",
35-
"rocket3",
36-
"threadsafevariable >= 1.1",
37-
"pyjwt >= 2.0.1",
38-
"pluralize >= 0.1.7",
39-
"yatl >= 20210326.1",
40-
"pydal >= 20210626.3",
41-
"watchgod >= 0.6",
42-
],
26+
install_requires=[line for line in [
27+
line.split('#')[0].strip() for line in
28+
open("requirements.txt")
29+
] if line],
4330
entry_points={"console_scripts": ["py4web=py4web.core:cli"],},
4431
zip_safe=False,
4532
platforms="any",

0 commit comments

Comments
 (0)