andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http: Rename 'path' to 'static_file_path'

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-05-20 22:12:06 +02:00
parent 4d7ab27836
commit cad0207ef8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy/http/__init__.py
View File

@ -63,8 +63,8 @@ class Router(object):
#: Name of the HTTP router implementation, must be overridden. #: Name of the HTTP router implementation, must be overridden.
name = None name = None
#: Path to location of static files. #: Path to location of static files to be served.
path = None static_file_path = None
def __init__(self, config): def __init__(self, config):
self.config = config self.config = config
@ -91,13 +91,13 @@ class Router(object):
:return: list of Tornado routes :return: list of Tornado routes
""" """
if self.path is None: if self.static_file_path is None:
raise ValueError('Undefined path in %s' % self) raise ValueError('Undefined static file path in %s' % self)
logger.info( logger.info(
'Serving HTTP extension %s at %s', type(self), self.linkify()) 'Serving HTTP extension %s at %s', type(self), self.linkify())
return [ return [
(r'/%s/(.*)' % self.name, StaticFileHandler, { (r'/%s/(.*)' % self.name, StaticFileHandler, {
'path': self.path, 'path': self.static_file_path,
'default_filename': 'index.html' 'default_filename': 'index.html'
}), }),
] ]

4
tests/http/test_router.py
View File

@ -23,7 +23,7 @@ if tornado:
class TestRouter(http.Router): class TestRouter(http.Router):
name = 'test' name = 'test'
path = os.path.join(os.path.dirname(__file__), 'static') static_file_path = os.path.join(os.path.dirname(__file__), 'static')
class TestRouterMissingPath(http.Router): class TestRouterMissingPath(http.Router):
@ -31,7 +31,7 @@ class TestRouterMissingPath(http.Router):
class TestRouterMissingName(http.Router): class TestRouterMissingName(http.Router):
path = os.path.join(os.path.dirname(__file__), 'static') static_file_path = os.path.join(os.path.dirname(__file__), 'static')
@unittest.skipUnless(tornado, 'tornado is missing') @unittest.skipUnless(tornado, 'tornado is missing')