Cosmetic changes

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@21 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/lang.py b/src/lang.py
index 0e616e44ad231023fe8314897841e7ff242677d1..f62d189f4a392ce9a6b87fdcbe93592e7ddc7e60 100644 (file)
--- a/src/lang.py
+++ b/src/lang.py
@@ -3,13 +3,14 @@
 import config
 
 def get(lang=config.lang):
-       if not (lang.__class__ == str or lang.__class__ == unicode):
+       if not (isinstance(lang, str) or isinstance(lang, unicode)):
                lang = config.lang
-       try:
-               lang = lang.replace("-", "_")
-               return strings.__dict__[lang]
-       except KeyError:
-               return strings.__dict__[config.lang]
+       lang = lang.replace("-", "_")
+       if hasattr(strings, lang):
+               return getattr(strings, lang)
+       if hasattr(strings, config.lang):
+               return getattr(strings, config.lang)
+       return strings.en
 
 
 # If you change or add any strings in this file please contact the translators listed below

diff --git a/src/legacy/msnw.py b/src/legacy/msnw.py
index 01be0d77c3fbc704f8e0496ad2f2a3b187902603..ff32fd760817ac368ed31e9c6801606cba9b9886 100644 (file)
--- a/src/legacy/msnw.py
+++ b/src/legacy/msnw.py
@@ -272,7 +272,7 @@ class SwitchboardSessionBase:
        def sendMessage(self, message, noerror):
                if self.ready:
                        def failedMessage(ignored):
-                               if self.__class__ == GroupchatSwitchboardSession:
+                               if isinstance(self, GroupchatSwitchboardSession):
                                        tempmsncon.failedMessage(self.groupchat.roomJID(), message)
                                else:
                                        tempmsncon.failedMessage(self.remoteUser, message)
@@ -730,7 +730,7 @@ class Switchboard(msn.SwitchboardClient):
        
        def loggedIn(self):
                if self.badConditions(): return
-               if (not self.reply) and self.switchboardSession.__class__ == SwitchboardSession:
+               if (not self.reply) and isinstance(self, SwitchboardSession):
                        def failCB(arg=None):
                                LogEvent(INFO, ident, "User has not joined after 30 seconds.")
                                self.switchboardSession.removeMe()
@@ -797,7 +797,7 @@ class Switchboard(msn.SwitchboardClient):
        
        def userTyping(self, message):
                if self.badConditions(): return
-               if self.switchboardSession.__class__ == SwitchboardSession: # Ignore typing in groupchats
+               if isinstance(self, SwitchboardSession): # Ignore typing in groupchats
                        if message.userHandle == self.switchboardSession.remoteUser:
                                self.switchboardSession.contactTyping()