From f7171cc18d2452797e1497158bed21d779c54355 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 17 Dec 2015 21:53:34 -0600
Subject: ensure IAssetDescriptor.abspath always returns an abspath

fixes #2184
---
 pyramid/path.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyramid/path.py b/pyramid/path.py
index b79c5a6ac..ceb0a0cf3 100644
--- a/pyramid/path.py
+++ b/pyramid/path.py
@@ -396,7 +396,8 @@ class PkgResourcesAssetDescriptor(object):
         return '%s:%s' % (self.pkg_name, self.path)
 
     def abspath(self):
-        return self.pkg_resources.resource_filename(self.pkg_name, self.path)
+        return os.path.abspath(
+            self.pkg_resources.resource_filename(self.pkg_name, self.path))
 
     def stream(self):
         return self.pkg_resources.resource_stream(self.pkg_name, self.path)
-- 
cgit v1.2.3


From 010218070ef62a31e3880acf2994ea217797332a Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 17 Dec 2015 22:19:46 -0600
Subject: add changelog for #2187

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3c3dd6e79..0f88a95da 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -252,6 +252,11 @@ Bug Fixes
   process failed to fork because it could not find the pserve script to
   run. See https://github.com/Pylons/pyramid/pull/2137
 
+- Ensure that ``IAssetDescriptor.abspath`` always returns an absolute path.
+  There were cases depending on the process CWD that a relative path would
+  be returned. See https://github.com/Pylons/pyramid/issues/2187
+
+
 Deprecations
 ------------
 
-- 
cgit v1.2.3