Skip to content

Commit

Permalink
Updated identation in setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
vrutkovs authored and BjarniRunar committed Oct 30, 2013
1 parent 2acd01d commit eab36c2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions mailpile/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ def default(self, obj):

def _html_template(self, config, tpl_names, elems=None):
theme_path = os.path.join(config.data_directory('html_theme'), 'html')
sys.stdout.write('theme_path: %s \n' % theme_path)
env = Environment(loader=FileSystemLoader('%s' % theme_path),
extensions=['jinja2.ext.i18n', 'jinja2.ext.with_',
'mailpile.jinjaextensions.MailpileCommand'])
Expand All @@ -260,8 +261,10 @@ def _html_template(self, config, tpl_names, elems=None):
# FIXME(Security): Here we need to sanitize the file name very
# strictly in case it somehow came from user
# data.
sys.stdout.write('template: %s \n' % fn)
return env.get_template(fn)
except (IOError, OSError, AttributeError), e:
sys.stdout.write('exception %s \n' % str(e))
pass
return None

Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from setuptools import setup, find_packages
from mailpile.app import APPVER
import os
from glob import glob

try:
# This borks sdist.
Expand Down Expand Up @@ -32,8 +33,10 @@
packages=find_packages(),
data_files = data_files,
entry_points = {
'console_scripts': [
'mailpile = mailpile.__main__:main'
]
'console_scripts': [
'mailpile = mailpile.__main__:main'
]
},
)


0 comments on commit eab36c2

Please sign in to comment.