From 0c29cf2df41600d3906d521c72991c7686018b71 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 15 Oct 2018 16:24:07 +0200
Subject: [PATCH] format source using black
---
src/pyramid/asset.py | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/pyramid/asset.py b/src/pyramid/asset.py
index 9d7a3ee..0d7575a 100644
--- a/src/pyramid/asset.py
+++ b/src/pyramid/asset.py
@@ -3,14 +3,12 @@
from pyramid.compat import string_types
-from pyramid.path import (
- package_path,
- package_name,
- )
+from pyramid.path import package_path, package_name
+
def resolve_asset_spec(spec, pname='__main__'):
if pname and not isinstance(pname, string_types):
- pname = pname.__name__ # as package
+ pname = pname.__name__ # as package
if os.path.isabs(spec):
return None, spec
filename = spec
@@ -20,6 +18,7 @@
pname, filename = None, spec
return pname, filename
+
def asset_spec_from_abspath(abspath, package):
""" Try to convert an absolute path to a resource in a package to
a resource specification if possible; otherwise return the
@@ -28,10 +27,13 @@
return abspath
pp = package_path(package) + os.path.sep
if abspath.startswith(pp):
- relpath = abspath[len(pp):]
- return '%s:%s' % (package_name(package),
- relpath.replace(os.path.sep, '/'))
+ relpath = abspath[len(pp) :]
+ return '%s:%s' % (
+ package_name(package),
+ relpath.replace(os.path.sep, '/'),
+ )
return abspath
+
# bw compat only; use pyramid.path.AssetResolver().resolve(spec).abspath()
def abspath_from_asset_spec(spec, pname='__main__'):
@@ -41,4 +43,3 @@
if pname is None:
return filename
return pkg_resources.resource_filename(pname, filename)
-
--
Gitblit v1.9.3