Permalink
Browse files

Merge remote-tracking branch 'origin/mobile'

  • Loading branch information...
javipalanca committed May 8, 2013
2 parents d785870 + 13e5cac commit 038572a411f524c2590954b2b2d70ea50c57ca83
View
@@ -1,2 +1,3 @@
SPARQLWrapper
unittest-xml-reporting
unittest-xml-reporting
simplejson
View
@@ -569,4 +569,4 @@ def loadJSON(self, jsonstring):
self.setProtocol(p['protocol'])
if "conversation-id" in p:
self.setConversationId(p["conversation-id"])
self.setConversationId(p["conversation-id"])
View
@@ -220,7 +220,10 @@ def asJSON(self):
"""
returns a version of an AID in JSON format
"""
import json
try:
import json
except ImportError:
import simplejson as json
return json.dumps(self.asContentObject())
def asXML(self):
View
@@ -42,7 +42,10 @@
import colors
import cPickle as pickle
import uuid
import json
try:
import json
except ImportError:
import simplejson as json
import DF
View
@@ -1,7 +1,10 @@
# -*- coding: utf-8 -*-
import types
import AID
import json
try:
import json
except ImportError:
import simplejson as json
class Envelope:
View
@@ -8,7 +8,6 @@
import spade.ACLMessage
import spade.BasicFipaDateTime
#from spade.wui import require_login
from os.path import abspath
@@ -110,12 +109,12 @@ def _setup(self):
self.wui.setPort(8008)
self.wui.start()
import spade.mtp
import mtps
# Load MTPs
for name, _mtp in self.config.acc.mtp.items():
try:
mod = "spade.mtp." + name
mod = __import__(mod, globals(), locals(), [name])
mod = "mtps."+name
mod = __import__(mod, globals(), locals(),[name])
self.mtps[_mtp['protocol']] = mod.INSTANCE(name, self.config, self)
except Exception, e:
self.DEBUG("EXCEPTION IMPORTING MTPS: " + str(e), 'err', 'acc')
View
@@ -157,7 +157,7 @@ def configure(self, typ, sentence=None, path=None):
else:
raise KBConfigurationFailed("Could not import " + str(typ) + " KB.")
except KBConfigurationFailed as e:
except KBConfigurationFailed, e:
#self.myAgent.DEBUG(str(e)+" Using Fol KB.", 'warn')
typ = "Spade"
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -5,6 +5,11 @@
import unittest
import BaseHTTPServer
try:
import json
except ImportError:
import simplejson as json
import spade
host = "127.0.0.1"
@@ -174,7 +179,6 @@ def do_POST(self):
self.server.done = True
def testSend2HTTPServer(self):
import json
template = spade.Behaviour.ACLTemplate()
#template.setSender(self.Aaid)
template.setContent("HTTPtestSendJSONMsg")

0 comments on commit 038572a

Please sign in to comment.