Always use os.path.abspath(__file__) instead of just __file__

mjumbewu · Dec 9, 2014 · 972fd48 · 972fd48
1 parent e8e6190
commit 972fd48
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -12,9 +12,9 @@
 # serve to show the default.
 
 import sys, os
-from os.path import join, dirname
+from os.path import join, dirname, abspath
 
-here = dirname(__file__)
+here = dirname(abspath(__file__))
 def get_version():
     fh = open(join(here, "..", "jstemplate", "__init__.py"))
     try:

diff --git a/jstemplate/finders.py b/jstemplate/finders.py
@@ -110,7 +110,7 @@ def _get_app_template_dirs():
             mod = import_module(app)
         except ImportError as e:
             raise ImproperlyConfigured("ImportError %s: %s" % (app, e.args[0]))
-        app_dir = os.path.dirname(mod.__file__)
+        app_dir = os.path.dirname(os.path.abspath(mod.__file__))
         for dirname in conf.JSTEMPLATE_APP_DIRNAMES:
             template_dir = os.path.join(app_dir, dirname)
             if os.path.isdir(template_dir):

diff --git a/jstemplate/tests/project/project/settings.py b/jstemplate/tests/project/project/settings.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-DIR = os.path.dirname(__file__)
+DIR = os.path.dirname(os.path.abspath(__file__))
 BASE_DIR = os.path.join(DIR, '..', '..', '..', '..')
 sys.path.insert(0, os.path.abspath(BASE_DIR))
 

diff --git a/jstemplate/tests/test_finders.py b/jstemplate/tests/test_finders.py
@@ -13,7 +13,7 @@
            "FilesystemRegexFinderTest"]
 
 
-here = os.path.abspath(os.path.dirname(__file__))
+here = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
 
 
 

diff --git a/jstemplate/tests/test_makemessages.py b/jstemplate/tests/test_makemessages.py
@@ -9,7 +9,7 @@
 
 from .utils import override_settings
 
-DIR = os.path.join(os.path.dirname(__file__), "project", "project", "jstemplates")
+DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "project", "project", "jstemplates")
 
 class MonkeyPatchedTemplatizeTest (TestCase):
 

diff --git a/jstemplate/tests/test_translation.py b/jstemplate/tests/test_translation.py
@@ -16,7 +16,7 @@
 ]
 
 
-DIR = os.path.join(os.path.dirname(__file__), "templates")
+DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
 
 
 class I18nTest (TestCase):

diff --git a/jstemplate/tests/test_ttag.py b/jstemplate/tests/test_ttag.py
@@ -22,7 +22,7 @@
 ]
 
 
-DIR = os.path.join(os.path.dirname(__file__), "templates")
+DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
 
 
 class BaseJSTemplateTagTestMixin (object):

diff --git a/setup.py b/setup.py
@@ -1,8 +1,8 @@
-from os.path import join, dirname
+from os.path import join, dirname, abspath
 
 from setuptools import setup, find_packages
 
-here = dirname(__file__)
+here = dirname(abspath(__file__))
 
 long_description = (open(join(here, "README.rst")).read() + "\n\n" +
                     open(join(here, "CHANGES.rst")).read() + "\n\n" +