mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
- move the try/except dance in support.py
- use relative . imports in test files - remove the "future with import", since python < 2.6 is not supported
This commit is contained in:
parent
7fcfea647f
commit
ff5921a469
7 changed files with 24 additions and 31 deletions
|
|
@ -1,14 +1,10 @@
|
|||
try:
|
||||
import unittest2
|
||||
except ImportError, e:
|
||||
import unittest as unittest2
|
||||
|
||||
from os.path import dirname, abspath, join
|
||||
|
||||
from pelican.settings import read_settings, _DEFAULT_CONFIG
|
||||
from .support import unittest
|
||||
|
||||
|
||||
class TestSettingsFromFile(unittest2.TestCase):
|
||||
class TestSettingsFromFile(unittest.TestCase):
|
||||
"""Providing a file, it should read it, replace the default values and
|
||||
append new values to the settings, if any
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue