* fixed some python3 transition bugs

* added status options to muc joining

4 files changed, 8 insertions, 8 deletions

diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py
index 422b50f7..6b4af9b6 100644
--- a/sleekxmpp/__init__.py
+++ b/sleekxmpp/__init__.py
@@ -93,7 +93,7 @@ class ClientXMPP(basexmpp, XMLStream):
 				self.registerStanza(**register)
 
 	def __getitem__(self, key):
-		if self.plugin.has_key(key):
+		if key in self.plugin:
 			return self.plugin[key]
 		else:
 			logging.warning("""Plugin "%s" is not loaded.""" % key)
diff --git a/sleekxmpp/plugins/xep_0030.py b/sleekxmpp/plugins/xep_0030.py
index fc921020..791038cd 100644
--- a/sleekxmpp/plugins/xep_0030.py
+++ b/sleekxmpp/plugins/xep_0030.py
@@ -36,17 +36,17 @@ class xep_0030(base.base_plugin):
 		self.xmpp.add_handler("<iq type='get' xmlns='%s'><query xmlns='http://jabber.org/protocol/disco#items' /></iq>" % self.xmpp.default_ns, self.item_handler)
 	
 	def add_feature(self, feature, node='main'):
-		if not self.features.has_key(node):
+		if not node in self.features:
 			self.features[node] = []
 		self.features[node].append(feature)
 	
 	def add_identity(self, category=None, itype=None, name=None, node='main'):
-		if not self.identities.has_key(node):
+		if not node in self.identities:
 			self.identities[node] = []
 		self.identities[node].append({'category': category, 'type': itype, 'name': name})
 	
 	def add_item(self, jid=None, name=None, node='main', subnode=''):
-		if not self.items.has_key(node):
+		if not node in self.items:
 			self.items[node] = []
 		self.items[node].append({'jid': jid, 'name': name, 'node': subnode})
 
diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py
index b0523755..54b86019 100644
--- a/sleekxmpp/plugins/xep_0045.py
+++ b/sleekxmpp/plugins/xep_0045.py
@@ -87,10 +87,10 @@ class xep_0045(base.base_plugin):
 		mtype = xml.attrib.get('type', 'normal')
 		self.xmpp.event("groupchat_message", {'room': mfrom, 'name': resource, 'type': mtype, 'subject': subject, 'message': message})
 	
-	def joinMUC(self, room, nick, maxhistory="0", password='', wait=False):
+	def joinMUC(self, room, nick, maxhistory="0", password='', wait=False, pstatus=None, pshow=None):
 		""" Join the specified room, requesting 'maxhistory' lines of history.
 		"""
-		stanza = self.xmpp.makePresence(pto="%s/%s" % (room, nick))
+		stanza = self.xmpp.makePresence(pto="%s/%s" % (room, nick), pstatus=pstatus, pshow=pshow)
 		x = ET.Element('{http://jabber.org/protocol/muc}x')
 		if password:
 			passelement = ET.Element('password')
@@ -180,7 +180,7 @@ class xep_0045(base.base_plugin):
 		""" Get the property of a nick in a room, such as its 'jid' or 'affiliation'
 			If not found, return None.
 		"""
-		if self.rooms.has_key(room) and self.rooms[room].has_key(nick) and self.rooms[room][nick].has_key(jidProperty):
+		if room in self.rooms and nick in self.rooms[room] and jidProperty in self.rooms[room][nick]:
 			return self.rooms[room][nick][jidProperty]
 		else:
 			return None
diff --git a/sleekxmpp/xmlstream/statemachine.py b/sleekxmpp/xmlstream/statemachine.py
index 66aa358f..e9e270c8 100644
--- a/sleekxmpp/xmlstream/statemachine.py
+++ b/sleekxmpp/xmlstream/statemachine.py
@@ -25,7 +25,7 @@ class StateMachine(object):
 				if gstate in self.__state or gstate in self.__group:
 					raise IndexError("The key or group '%s' is already in the StateMachine." % gstate)
 				for state in groups[gstate]:
-					if self.__state.has_key(state):
+					if state in self.__state:
 						raise IndexError("The group %s contains a key %s which is not set in the StateMachine." % (gstate, state))
 				self.__group[gstate] = groups[gstate]