← Back to branch summary

~ubuntu-branches/ubuntu/maverick/coherence/maverick

« back to all changes in this revision

Viewing changes to coherence/upnp/core/soap_proxy.py

  • Committer: Bazaar Package Importer
  • Author(s): Charlie Smotherman
  • Date: 2010-01-02 10:57:15 UTC
  • mfrom: (1.1.7 upstream) (3.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100102105715-sghzl2nw4lr5b1ob
Tags: 0.6.6.2-1
*  New  upstream release, summary of changes:
    - adding all necessary files to MANIFEST.in, to compensate for the
      gone 'auto-include-all-files-under-version-control' setuptools
      feature.
    - rearranging genre and genres attribute in DIDLLite - thx Caleb  
    - fix face_path typo, fixes #275.   

Show diffs side-by-side

added added

removed removed

Lines of Context:
coherence/upnp/core/soap_proxy.py
36
36
        self.soapaction = soapaction
37
37
        self.envelope_attrib = envelope_attrib
38
38
 
39
 
    def callRemote(self, soapmethod, *args, **kwargs):
 
39
    def callRemote(self, soapmethod, arguments):
40
40
        soapaction = soapmethod or self.soapaction
41
41
        if '#' not in soapaction:
42
42
            soapaction = '#'.join((self.namespace[1],soapaction))
46
46
 
47
47
        headers = { 'content-type': 'text/xml ;charset="utf-8"',
48
48
                    'SOAPACTION': '"%s"' % soapaction,}
49
 
        if kwargs.has_key('headers'):
50
 
            headers.update(kwargs['headers'])
51
 
            del kwargs['headers']
 
49
        if arguments.has_key('headers'):
 
50
            headers.update(arguments['headers'])
 
51
            del arguments['headers']
52
52
 
53
 
        payload = soap_lite.build_soap_call("{%s}%s" % (self.namespace[1], self.action), kwargs,
 
53
        payload = soap_lite.build_soap_call("{%s}%s" % (self.namespace[1], self.action), arguments,
54
54
                                            encoding=None)
55
55
 
56
56
        self.info("callRemote soapaction: ", self.action,self.url)