From a3a6e8ca3f0643dbcda4f3cb0492cf22915300ad Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 19 Sep 2017 12:27:45 +0200 Subject: [PATCH] migration: remove usage of pylons inside migration schemas and code. --- rhodecode/lib/dbmigrate/schema/__init__.py | 8 ++++++++ rhodecode/lib/dbmigrate/schema/db_1_4_0.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_1_5_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_1_5_2.py | 2 +- rhodecode/lib/dbmigrate/schema/db_1_6_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_1_7_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_1_8_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_0_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_0_1.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_0_2.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_1_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_2_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_2_3.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py | 2 +- rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py | 2 +- rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py | 2 +- rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py | 2 +- rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py | 3 +-- rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py | 14 ++++---------- rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py | 14 ++++---------- rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py | 14 ++++---------- rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py | 14 ++++---------- rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py | 14 ++++---------- rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py | 14 ++++---------- rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py | 14 ++++---------- .../lib/dbmigrate/versions/024_version_2_1_0.py | 6 ++++-- 32 files changed, 63 insertions(+), 102 deletions(-) diff --git a/rhodecode/lib/dbmigrate/schema/__init__.py b/rhodecode/lib/dbmigrate/schema/__init__.py index a917aefe..a182a39b 100644 --- a/rhodecode/lib/dbmigrate/schema/__init__.py +++ b/rhodecode/lib/dbmigrate/schema/__init__.py @@ -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 '/' diff --git a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py index 5cf4b825..d9ec10eb 100644 --- a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_1_5_0.py b/rhodecode/lib/dbmigrate/schema/db_1_5_0.py index da07b4cf..f6de88ca 100644 --- a/rhodecode/lib/dbmigrate/schema/db_1_5_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_5_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_1_5_2.py b/rhodecode/lib/dbmigrate/schema/db_1_5_2.py index bf3600db..2cc8aaeb 100644 --- a/rhodecode/lib/dbmigrate/schema/db_1_5_2.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_5_2.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_1_6_0.py b/rhodecode/lib/dbmigrate/schema/db_1_6_0.py index a6eb1579..e2ff1a82 100644 --- a/rhodecode/lib/dbmigrate/schema/db_1_6_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_6_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_1_7_0.py b/rhodecode/lib/dbmigrate/schema/db_1_7_0.py index f1b69089..d50847d8 100644 --- a/rhodecode/lib/dbmigrate/schema/db_1_7_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_7_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_1_8_0.py b/rhodecode/lib/dbmigrate/schema/db_1_8_0.py index 32217b28..d79d9cb4 100644 --- a/rhodecode/lib/dbmigrate/schema/db_1_8_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_8_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_0_0.py b/rhodecode/lib/dbmigrate/schema/db_2_0_0.py index fa8c6428..938fd9b5 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_0_1.py b/rhodecode/lib/dbmigrate/schema/db_2_0_1.py index ed8a5402..929976ef 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_0_1.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_0_1.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_0_2.py b/rhodecode/lib/dbmigrate/schema/db_2_0_2.py index c8c2fb52..da4647d2 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_0_2.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_0_2.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_1_0.py b/rhodecode/lib/dbmigrate/schema/db_2_1_0.py index 94258c8f..1f2256ac 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_1_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_1_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_2_0.py b/rhodecode/lib/dbmigrate/schema/db_2_2_0.py index a4cf5532..51ddd36b 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_2_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_2_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_2_3.py b/rhodecode/lib/dbmigrate/schema/db_2_2_3.py index a6204e93..49e859fe 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_2_3.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_2_3.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py index 8b8de5bc..e0d7bb45 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py b/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py index 42c2bc49..731047e9 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py b/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py index dbb14948..4338ebd2 100644 --- a/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py +++ b/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py index b11c3c44..203a9780 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py b/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py index 4e00e255..000c59c1 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py index 343f00d5..9a27580a 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py b/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py index 68082c7f..1da09bbf 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py index 93e46ec8..1e75dba2 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py index 7abda0f2..0062391f 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py index 7d12c044..361c4390 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py index f0dba930..d036a71f 100644 --- a/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py @@ -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 diff --git a/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py index 9863fc12..df515c52 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py index a7701a45..67df09ee 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py index aa18f792..a46fdad8 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py index 1de50ec8..9fac7f71 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py index 106aacb5..0d1943af 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py index dfc35963..e75d8d4b 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py index 79f8f4f2..63d83263 100644 --- a/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py +++ b/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py @@ -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, diff --git a/rhodecode/lib/dbmigrate/versions/024_version_2_1_0.py b/rhodecode/lib/dbmigrate/versions/024_version_2_1_0.py index b2063631..f95e4cc0 100644 --- a/rhodecode/lib/dbmigrate/versions/024_version_2_1_0.py +++ b/rhodecode/lib/dbmigrate/versions/024_version_2_1_0.py @@ -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):