From 32b14762f4bc685174fe3860497ed27802102abe Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 5 Mar 2013 16:10:45 -0500 Subject: [PATCH] Remove import *, fix a docstring in actions/admin --- lib/galaxy/actions/admin.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/actions/admin.py b/lib/galaxy/actions/admin.py index 1bb21f5858c..bf931f51e21 100644 --- a/lib/galaxy/actions/admin.py +++ b/lib/galaxy/actions/admin.py @@ -1,9 +1,10 @@ """ Contains administrative functions """ + import logging from galaxy import util -from galaxy.exceptions import * +from galaxy.exceptions import MessageException log = logging.getLogger( __name__ ) @@ -167,12 +168,14 @@ class AdminActions( object ): self.sa_session.flush() message += ', '.join( names ) return message - + def _purge_quota( self, quota, params ): - # This method should only be called for a Quota that has previously been deleted. - # Purging a deleted Quota deletes all of the following from the database: - # - UserQuotaAssociations where quota_id == Quota.id - # - GroupQuotaAssociations where quota_id == Quota.id + """ + This method should only be called for a Quota that has previously been deleted. + Purging a deleted Quota deletes all of the following from the database: + - UserQuotaAssociations where quota_id == Quota.id + - GroupQuotaAssociations where quota_id == Quota.id + """ quotas = util.listify( quota ) names = [] for q in quotas: @@ -194,3 +197,4 @@ class AdminActions( object ): self.sa_session.flush() message += ', '.join( names ) return message +