summaryrefslogtreecommitdiff
path: root/openid/test/test_etxrd.py
diff options
context:
space:
mode:
authorJosh Hoyt <josh@janrain.com>2006-12-19 22:11:19 +0000
committerJosh Hoyt <josh@janrain.com>2006-12-19 22:11:19 +0000
commitbbad35017456a4f6af83e669d496b979b7ebc8e2 (patch)
tree8f39daf28e932b7041e7e50ffc3a000003654b89 /openid/test/test_etxrd.py
parentdb65e271713867efa4470b5e27cc064790dfba69 (diff)
downloadopenid-bbad35017456a4f6af83e669d496b979b7ebc8e2.tar.gz
[project @ Remove crufty verbose data-path manipulation stuff from test_etxrd]
Looks like I introduced it!
Diffstat (limited to 'openid/test/test_etxrd.py')
-rw-r--r--openid/test/test_etxrd.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/openid/test/test_etxrd.py b/openid/test/test_etxrd.py
index ce0dab2..ece1d4b 100644
--- a/openid/test/test_etxrd.py
+++ b/openid/test/test_etxrd.py
@@ -2,16 +2,9 @@ import unittest
from openid.yadis import services, etxrd, xri
import os.path
-def sibpath(one, other, make_absolute=True):
- if os.path.isabs(other):
- return other
- p = os.path.join(os.path.dirname(one), other)
- if make_absolute:
- p = os.path.abspath(p)
- return p
-
def datapath(filename):
- return sibpath(__file__, os.path.join("data", "test_etxrd", filename))
+ module_directory = os.path.dirname(os.path.abspath(__file__))
+ return os.path.join(module_directory, 'data', 'test_etxrd', filename)
XRD_FILE = datapath('valid-populated-xrds.xml')
NOXRDS_FILE = datapath('not-xrds.xml')