From 73480423b4cf5b773be465b0167341256b219c97 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 9 Feb 2010 15:36:09 +0100 Subject: [PATCH] style fixes --- pyweb/mumble/MumbleCtlIce.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index 02b2791..ae4219d 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -15,7 +15,7 @@ * GNU General Public License for more details. """ -from os.path import join, exists +from os.path import exists from PIL import Image from struct import pack, unpack from zlib import compress, decompress @@ -26,7 +26,7 @@ from mctl import MumbleCtlBase from utils import ObjectInfo -import Ice, sys, re +import Ice def protectDjangoErrPage( func ): @@ -39,6 +39,7 @@ def protectDjangoErrPage( func ): """ def protection_wrapper( *args, **kwargs ): + """ Call the original function and catch Ice exceptions. """ try: return func( *args, **kwargs ); except Ice.Exception, e: @@ -75,9 +76,6 @@ def MumbleCtlIce( connstring ): elif murmurversion[:2] == (1, 2): return MumbleCtlIce_120( connstring, meta ); - - - class MumbleCtlIce_118(MumbleCtlBase):