migration: remove usage of pylons inside migration schemas and code.

This commit is contained in:
Marcin Kuzminski 2017-09-19 12:27:45 +02:00
parent cfe326566d
commit a3a6e8ca3f
32 changed files with 63 additions and 102 deletions

View file

@ -17,3 +17,11 @@
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
def url(*args, **kwargs):
"""
Dummy url generator to be used inside the old db migration schemas that rely on it.
It would protect from errors after removal of pylons.
"""
return '/'

View file

@ -34,8 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm
from rhodecode.lib.vcs.exceptions import VCSError

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -33,7 +33,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -33,7 +33,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -33,7 +33,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -33,7 +33,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -34,7 +34,7 @@ from sqlalchemy.exc import DatabaseError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -37,7 +37,7 @@ from sqlalchemy.exc import OperationalError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -38,7 +38,7 @@ from sqlalchemy.exc import OperationalError
from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.backends.base import MergeFailureReason

View file

@ -42,7 +42,7 @@ from Crypto.Cipher import AES
from Crypto import Random
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -40,8 +40,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -41,8 +41,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -41,8 +41,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -42,8 +42,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -42,8 +42,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -42,8 +42,7 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm

View file

@ -46,8 +46,9 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.utils.helpers import get_scm
@ -1775,7 +1776,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1789,13 +1790,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -46,8 +46,9 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend, get_vcs_instance
from rhodecode.lib.vcs.utils.helpers import get_scm
@ -1778,7 +1779,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1792,13 +1793,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -46,8 +46,9 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend, get_vcs_instance
from rhodecode.lib.vcs.utils.helpers import get_scm
@ -1778,7 +1779,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1792,13 +1793,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -47,8 +47,9 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend, get_vcs_instance
from rhodecode.lib.vcs.utils.helpers import get_scm
@ -1780,7 +1781,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1794,13 +1795,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -47,8 +47,9 @@ from beaker.cache import cache_region, region_invalidate
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_backend, get_vcs_instance
from rhodecode.lib.vcs.utils.helpers import get_scm
@ -1780,7 +1781,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1794,13 +1795,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -45,8 +45,9 @@ from beaker.cache import cache_region
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_vcs_instance
from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
@ -1822,7 +1823,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1836,13 +1837,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -45,8 +45,9 @@ from beaker.cache import cache_region
from webob.exc import HTTPNotFound
from zope.cachedescriptors.property import Lazy as LazyProperty
from pylons import url
from pylons.i18n.translation import lazy_ugettext as _
# replace pylons with fake url for migration
from rhodecode.lib.dbmigrate.schema import url
from rhodecode.translation import _
from rhodecode.lib.vcs import get_vcs_instance
from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
@ -1823,7 +1824,7 @@ class Repository(Base, BaseModel):
return clone_uri
def clone_url(self, **override):
qualified_home_url = url('home', qualified=True)
qualified_home_url = '/'
uri_tmpl = None
if 'with_id' in override:
@ -1837,13 +1838,6 @@ class Repository(Base, BaseModel):
# we didn't override our tmpl from **overrides
if not uri_tmpl:
uri_tmpl = self.DEFAULT_CLONE_URI
try:
from pylons import tmpl_context as c
uri_tmpl = c.clone_uri_tmpl
except Exception:
# in any case if we call this outside of request context,
# ie, not having tmpl_context set up
pass
return get_clone_url(uri_tmpl=uri_tmpl,
qualifed_home_url=qualified_home_url,

View file

@ -38,9 +38,11 @@ def downgrade(migrate_engine):
def fixups(models, _SESSION):
from pylons import config
from rhodecode.lib.utils2 import str2bool
# fake config because we cannot extract the proper values from .ini here
config = {
'use_gravatar': 'true'
}
Optional = models.Optional
def get_by_name(cls, key):