~widelands-dev/widelands-website/trunk

« back to all changes in this revision

Viewing changes to widelandslib/tribe.py

Committer: kaputtnik
Date: 2019-03-31 11:08:21 UTC
mto: This revision was merged to the branch mainline in revision 531.
Revision ID: kaputtnik-20190331110821-1o6c8ebh1sag7xat

mv main files into mainpage directory; apply needed changes

files removed:
__init__.py

files renamed:
local_settings.py.sample => mainpage/local_settings.py.sample

local_urls.py.sample => mainpage/local_urls.py.sample

mainpage/urls.py => mainpage/mainpage_urls.py

online_users_middleware.py => mainpage/online_users_middleware.py

settings.py => mainpage/settings.py

sitemap_urls.py => mainpage/sitemap_urls.py

static_sitemap.py => mainpage/static_sitemap.py

urls.py => mainpage/urls.py

wl_utils.py => mainpage/wl_utils.py

wlwebsite_wsgi.py => mainpage/wlwebsite_wsgi.py

diff_match_patch.py => wiki/diff_match_patch.py

files modified:
mainpage/templatetags/wl_markdown.py

mainpage/utest/test_wl_markdown.py

mainpage/views.py

manage.py

news/models.py

threadedcomments/views.py

widelandslib/make_flow_diagram.py

widelandslib/tribe.py

wiki/forms.py

wiki/urls.py

wiki/views.py

wlggz/migrations/0001_initial.py

wlggz/models.py

wlhelp/management/commands/update_help.py

wlhelp/management/commands/update_help_pdf.py

wlhelp/views.py

wlimages/models.py

wlmaps/forms.py

wlmaps/tests/test_views.py

wlmaps/views.py

wlprofile/forms.py

wlprofile/migrations/0001_initial.py

wlprofile/models.py

wlprofile/templatetags/custom_date.py

wlscreens/models.py

wlscreens/tests/test_models.py

Show diffs side-by-side

added added

removed removed

widelandslib/tribe.py

import os.path as p

import json

try:

from settings import WIDELANDS_SVN_DIR

basedir = WIDELANDS_SVN_DIR

from django.conf import settings

basedir = settings.WIDELANDS_SVN_DIR

except:

basedir = p.join(p.dirname(__file__), p.pardir, p.pardir)

@property

def image(self):

return p.abspath(p.join(WIDELANDS_SVN_DIR, 'data', self._json['icon']))

return p.abspath(p.join(settings.WIDELANDS_SVN_DIR, 'data', self._json['icon']))

class Ware(BaseDescr):

Older »