Browse Source

style fixes

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
73480423b4
  1. 8
      pyweb/mumble/MumbleCtlIce.py

8
pyweb/mumble/MumbleCtlIce.py

@ -15,7 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
""" """
from os.path import join, exists
from os.path import exists
from PIL import Image from PIL import Image
from struct import pack, unpack from struct import pack, unpack
from zlib import compress, decompress from zlib import compress, decompress
@ -26,7 +26,7 @@ from mctl import MumbleCtlBase
from utils import ObjectInfo from utils import ObjectInfo
import Ice, sys, re
import Ice
def protectDjangoErrPage( func ): def protectDjangoErrPage( func ):
@ -39,6 +39,7 @@ def protectDjangoErrPage( func ):
""" """
def protection_wrapper( *args, **kwargs ): def protection_wrapper( *args, **kwargs ):
""" Call the original function and catch Ice exceptions. """
try: try:
return func( *args, **kwargs ); return func( *args, **kwargs );
except Ice.Exception, e: except Ice.Exception, e:
@ -77,9 +78,6 @@ def MumbleCtlIce( connstring ):
return MumbleCtlIce_120( connstring, meta ); return MumbleCtlIce_120( connstring, meta );
class MumbleCtlIce_118(MumbleCtlBase): class MumbleCtlIce_118(MumbleCtlBase):
method = "ICE"; method = "ICE";

Loading…
Cancel
Save