github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

_ prefix for many private methods of Datasette, refs #576

Browse source
This commit is contained in:
Simon Willison 2020-05-30 07:38:46 -07:00
commit 012c76901a
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
datasette/app.py
View file

@ -279,7 +279,7 @@ class Datasette:
# pylint: disable=no-member # pylint: disable=no-member
pm.hook.prepare_jinja2_environment(env=self.jinja_env) pm.hook.prepare_jinja2_environment(env=self.jinja_env)
self.register_renderers() self._register_renderers()
def get_database(self, name=None): def get_database(self, name=None):
if name is None: if name is None:
@ -392,7 +392,7 @@ class Datasette:
} }
) )
def prepare_connection(self, conn, database): def _prepare_connection(self, conn, database):
conn.row_factory = sqlite3.Row conn.row_factory = sqlite3.Row
conn.text_factory = lambda x: str(x, "utf-8", "replace") conn.text_factory = lambda x: str(x, "utf-8", "replace")
for name, num_args, func in self.sqlite_functions: for name, num_args, func in self.sqlite_functions:
@ -468,12 +468,12 @@ class Datasette:
url = "https://" + url[len("http://") :] url = "https://" + url[len("http://") :]
return url return url
def register_custom_units(self): def _register_custom_units(self):
"Register any custom units defined in the metadata.json with Pint" "Register any custom units defined in the metadata.json with Pint"
for unit in self.metadata("custom_units") or []: for unit in self.metadata("custom_units") or []:
ureg.define(unit) ureg.define(unit)
def connected_databases(self): def _connected_databases(self):
return [ return [
{ {
"name": d.name, "name": d.name,
@ -486,9 +486,9 @@ class Datasette:
for d in sorted(self.databases.values(), key=lambda d: d.name) for d in sorted(self.databases.values(), key=lambda d: d.name)
] ]
def versions(self): def _versions(self):
conn = sqlite3.connect(":memory:") conn = sqlite3.connect(":memory:")
self.prepare_connection(conn, ":memory:") self._prepare_connection(conn, ":memory:")
sqlite_version = conn.execute("select sqlite_version()").fetchone()[0] sqlite_version = conn.execute("select sqlite_version()").fetchone()[0]
sqlite_extensions = {} sqlite_extensions = {}
for extension, testsql, hasversion in ( for extension, testsql, hasversion in (
@ -534,7 +534,7 @@ class Datasette:
}, },
} }
def plugins(self, show_all=False): def _plugins(self, show_all=False):
ps = list(get_plugins()) ps = list(get_plugins())
if not show_all: if not show_all:
ps = [p for p in ps if p["name"] not in DEFAULT_PLUGINS] ps = [p for p in ps if p["name"] not in DEFAULT_PLUGINS]
@ -548,7 +548,7 @@ class Datasette:
for p in ps for p in ps
] ]
def threads(self): def _threads(self):
threads = list(threading.enumerate()) threads = list(threading.enumerate())
d = { d = {
"num_threads": len(threads), "num_threads": len(threads),
@ -576,7 +576,7 @@ class Datasette:
.get(table, {}) .get(table, {})
) )
def register_renderers(self): def _register_renderers(self):
""" Register output renderers which output data in custom formats. """ """ Register output renderers which output data in custom formats. """
# Built-in renderers # Built-in renderers
self.renderers["json"] = (json_renderer, lambda: True) self.renderers["json"] = (json_renderer, lambda: True)
@ -724,11 +724,11 @@ class Datasette:
r"/-/metadata(?P<as_format>(\.json)?)$", r"/-/metadata(?P<as_format>(\.json)?)$",
) )
add_route( add_route(
JsonDataView.as_asgi(self, "versions.json", self.versions), JsonDataView.as_asgi(self, "versions.json", self._versions),
r"/-/versions(?P<as_format>(\.json)?)$", r"/-/versions(?P<as_format>(\.json)?)$",
) )
add_route( add_route(
JsonDataView.as_asgi(self, "plugins.json", self.plugins), JsonDataView.as_asgi(self, "plugins.json", self._plugins),
r"/-/plugins(?P<as_format>(\.json)?)$", r"/-/plugins(?P<as_format>(\.json)?)$",
) )
add_route( add_route(
@ -736,11 +736,11 @@ class Datasette:
r"/-/config(?P<as_format>(\.json)?)$", r"/-/config(?P<as_format>(\.json)?)$",
) )
add_route( add_route(
JsonDataView.as_asgi(self, "threads.json", self.threads), JsonDataView.as_asgi(self, "threads.json", self._threads),
r"/-/threads(?P<as_format>(\.json)?)$", r"/-/threads(?P<as_format>(\.json)?)$",
) )
add_route( add_route(
JsonDataView.as_asgi(self, "databases.json", self.connected_databases), JsonDataView.as_asgi(self, "databases.json", self._connected_databases),
r"/-/databases(?P<as_format>(\.json)?)$", r"/-/databases(?P<as_format>(\.json)?)$",
) )
add_route( add_route(
@ -765,7 +765,7 @@ class Datasette:
+ renderer_regex + renderer_regex
+ r")?$", + r")?$",
) )
self.register_custom_units() self._register_custom_units()
async def setup_db(): async def setup_db():
# First time server starts up, calculate table counts for immutable databases # First time server starts up, calculate table counts for immutable databases

2
datasette/database.py
View file

@ -104,7 +104,7 @@ class Database:
conn = getattr(connections, self.name, None) conn = getattr(connections, self.name, None)
if not conn: if not conn:
conn = self.connect() conn = self.connect()
self.ds.prepare_connection(conn, self.name) self.ds._prepare_connection(conn, self.name)
setattr(connections, self.name, conn) setattr(connections, self.name, conn)
return fn(conn) return fn(conn)