2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/f2ee4ba93917/
Changeset: f2ee4ba93917
User: dannon
Date: 2014-01-31 15:36:37
Summary: Require pytz in web framework where Babel depends on it.
Affected #: 1 file
diff -r b3e8c0ab30c94906be2bb5d76776b22f120c9c8e -r
f2ee4ba93917f89e95971f198f96117ed67fda55 lib/galaxy/web/framework/__init__.py
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -37,6 +37,7 @@
import mako.lookup
import mako.runtime
+pkg_resources.require( "pytz" ) # Used by Babel.
pkg_resources.require( "Babel" )
from babel.support import Translations
from babel import Locale, UnknownLocaleError
https://bitbucket.org/galaxy/galaxy-central/commits/00810d29c09d/
Changeset: 00810d29c09d
User: dannon
Date: 2014-01-31 15:42:24
Summary: Slight import cleanup in galaxy.web.framework, remove unsafe relative
imports.
Affected #: 1 file
diff -r f2ee4ba93917f89e95971f198f96117ed67fda55 -r
00810d29c09d351e6e582d4868907b989e686059 lib/galaxy/web/framework/__init__.py
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -5,7 +5,6 @@
import hashlib
import inspect
import os
-import pkg_resources
import random
import socket
import string
@@ -14,40 +13,39 @@
from Cookie import CookieError
from functools import wraps
-pkg_resources.require( "Cheetah" )
+from galaxy import eggs
+
+eggs.require( "Cheetah" )
from Cheetah.Template import Template
-#TODO: Relative imports to be removed
-import base
-import helpers
-
from galaxy import util
+from galaxy.exceptions import error_codes
from galaxy.exceptions import MessageException
-from galaxy.exceptions import error_codes
from galaxy.util import asbool
from galaxy.util import safe_str_cmp
from galaxy.util.backports.importlib import import_module
from galaxy.util.json import from_json_string, to_json_string
from galaxy.util.sanitize_html import sanitize_html
+from galaxy.web.framework import base, helpers
import paste.httpexceptions
-pkg_resources.require( "Mako" )
+eggs.require( "Mako" )
import mako.template
import mako.lookup
import mako.runtime
-pkg_resources.require( "pytz" ) # Used by Babel.
-pkg_resources.require( "Babel" )
+eggs.require( "pytz" ) # Used by Babel.
+eggs.require( "Babel" )
from babel.support import Translations
from babel import Locale, UnknownLocaleError
-pkg_resources.require( "SQLAlchemy >= 0.4" )
+eggs.require( "SQLAlchemy >= 0.4" )
from sqlalchemy import and_
from sqlalchemy.orm.exc import NoResultFound
-pkg_resources.require( "pexpect" )
-pkg_resources.require( "amqplib" )
+eggs.require( "pexpect" )
+eggs.require( "amqplib" )
import logging
log = logging.getLogger( __name__ )
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.