Merge remote-tracking branch 'origin/master'

openshift/virtualenv.py

-# -*- coding: utf-8 -*-
-#
-# Copyright © 2014 Daniel Tschan <tschan@puzzle.ch>
-#
-# This file is part of Weblate <http://weblate.org/>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import os
-
-
-def activate():
-    virtenv = os.environ['OPENSHIFT_PYTHON_DIR'] + '/virtenv/'
-    virtualenv = os.path.join(virtenv, 'bin/activate_this.py')
-    try:
-        execfile(virtualenv, dict(__file__=virtualenv))
-    except IOError:
-        pass

openshift/wsgi.py

@@ -22,13 +22,17 @@
 import os
 import sys
 from django.core.wsgi import get_wsgi_application
-from .virtualenv import activate
 
 sys.path.append(os.path.join(os.environ['OPENSHIFT_REPO_DIR'], 'weblate'))
 sys.path.append(os.path.join(os.environ['OPENSHIFT_REPO_DIR'], 'openshift'))
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'weblate.settings_openshift'
 
-activate()
+virtenv = os.environ['OPENSHIFT_PYTHON_DIR'] + '/virtenv/'
+virtualenv = os.path.join(virtenv, 'bin/activate_this.py')
+try:
+    execfile(virtualenv, dict(__file__=virtualenv))
+except IOError:
+    pass
 
 application = get_wsgi_application()

openshift/wsgi_install.py

@@ -21,9 +21,13 @@
 
 import os
 from string import Template
-from .virtualenv import activate
 
-activate()
+virtenv = os.environ['OPENSHIFT_PYTHON_DIR'] + '/virtenv/'
+virtualenv = os.path.join(virtenv, 'bin/activate_this.py')
+try:
+    execfile(virtualenv, dict(__file__=virtualenv))
+except IOError:
+    pass
 
 
 def application(environ, start_response):