# HG changeset patch # User RĂ©mi Cardona # Date 1400861567 -7200 # Node ID 3f1685ac2f16b2c9e117ba2b7743f9e5c3266414 # Parent 23bad0114b841b8b8a1a111fdb3a470a549f5b16 [etwist] Remove unused host_prefixed_baseurl() diff -r 23bad0114b84 -r 3f1685ac2f16 etwist/server.py --- a/etwist/server.py Fri May 23 12:26:52 2014 +0200 +++ b/etwist/server.py Fri May 23 18:12:47 2014 +0200 @@ -47,14 +47,6 @@ # to wait all tasks to be finished for the server to be actually started lc.start(interval, now=False) -def host_prefixed_baseurl(baseurl, host): - scheme, netloc, url, query, fragment = urlsplit(baseurl) - netloc_domain = '.' + '.'.join(netloc.split('.')[-2:]) - if host.endswith(netloc_domain): - netloc = host - baseurl = urlunsplit((scheme, netloc, url, query, fragment)) - return baseurl - class CubicWebRootResource(resource.Resource): def __init__(self, config, repo): diff -r 23bad0114b84 -r 3f1685ac2f16 etwist/test/unittest_server.py --- a/etwist/test/unittest_server.py Fri May 23 12:26:52 2014 +0200 +++ b/etwist/test/unittest_server.py Fri May 23 18:12:47 2014 +0200 @@ -19,41 +19,7 @@ import os, os.path as osp, glob import urllib -from cubicweb.devtools.testlib import CubicWebTC from cubicweb.devtools.httptest import CubicWebServerTC -from cubicweb.etwist.server import host_prefixed_baseurl - - -class HostPrefixedBaseURLTC(CubicWebTC): - - def _check(self, baseurl, host, waited): - self.assertEqual(host_prefixed_baseurl(baseurl, host), waited, - 'baseurl %s called through host %s should be considered as %s' - % (baseurl, host, waited)) - - def test1(self): - self._check('http://www.cubicweb.org/hg/', 'code.cubicweb.org', - 'http://code.cubicweb.org/hg/') - - def test2(self): - self._check('http://www.cubicweb.org/hg/', 'cubicweb.org', - 'http://www.cubicweb.org/hg/') - - def test3(self): - self._check('http://cubicweb.org/hg/', 'code.cubicweb.org', - 'http://code.cubicweb.org/hg/') - - def test4(self): - self._check('http://www.cubicweb.org/hg/', 'localhost', - 'http://www.cubicweb.org/hg/') - - def test5(self): - self._check('http://www.cubicweb.org/cubes/', 'hg.code.cubicweb.org', - 'http://hg.code.cubicweb.org/cubes/') - - def test6(self): - self._check('http://localhost:8080/hg/', 'code.cubicweb.org', - 'http://localhost:8080/hg/') class ETwistHTTPTC(CubicWebServerTC):