Commit 5d9f57b5 authored by Nicolas Delaby's avatar Nicolas Delaby

add missing import, add break, typo

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25225 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e403864b
...@@ -60,6 +60,8 @@ import random ...@@ -60,6 +60,8 @@ import random
from DateTime import DateTime from DateTime import DateTime
from zLOG import LOG, TRACE, DEBUG, INFO from zLOG import LOG, TRACE, DEBUG, INFO
from lxml import etree
class TimeoutHTTPConnection(httplib.HTTPConnection): class TimeoutHTTPConnection(httplib.HTTPConnection):
""" """
Custom Classes to set timeOut on handle sockets Custom Classes to set timeOut on handle sockets
...@@ -929,7 +931,7 @@ class SynchronizationTool( SubscriptionSynchronization, ...@@ -929,7 +931,7 @@ class SynchronizationTool( SubscriptionSynchronization,
request = urllib2.Request(url=to_url, data=data) request = urllib2.Request(url=to_url, data=data)
else: else:
#XXX only to synchronize with other server than erp5 (must be improved): #XXX only to synchronize with other server than erp5 (must be improved):
data=head+xml data = head+xml
request = urllib2.Request(to_url, data, headers) request = urllib2.Request(to_url, data, headers)
try: try:
...@@ -957,7 +959,7 @@ class SynchronizationTool( SubscriptionSynchronization, ...@@ -957,7 +959,7 @@ class SynchronizationTool( SubscriptionSynchronization,
if domain.domain_type == self.SUB and not domain.getActivityEnabled(): if domain.domain_type == self.SUB and not domain.getActivityEnabled():
#if we don't use activity : #if we don't use activity :
gpg_key = domain.getGPGKey() gpg_key = domain.getGPGKey()
if result not in (None, ''): if result:
self.readResponse(sync_id=sync_id, text=result) self.readResponse(sync_id=sync_id, text=result)
return result return result
...@@ -989,7 +991,7 @@ class SynchronizationTool( SubscriptionSynchronization, ...@@ -989,7 +991,7 @@ class SynchronizationTool( SubscriptionSynchronization,
#LOG('readResponse, text :', DEBUG, text) #LOG('readResponse, text :', DEBUG, text)
#LOG('readResponse, hexdump(text) :', DEBUG, self.hexdump(text)) #LOG('readResponse, hexdump(text) :', DEBUG, self.hexdump(text))
status_code = None status_code = None
if text not in ('', None): if text:
# XXX We will look everywhere for a publication/subsription with # XXX We will look everywhere for a publication/subsription with
# the id sync_id, this is not so good, but there is no way yet # the id sync_id, this is not so good, but there is no way yet
# to know if we will call a publication or subscription XXX # to know if we will call a publication or subscription XXX
...@@ -999,7 +1001,8 @@ class SynchronizationTool( SubscriptionSynchronization, ...@@ -999,7 +1001,8 @@ class SynchronizationTool( SubscriptionSynchronization,
if publication.getTitle() == sync_id: if publication.getTitle() == sync_id:
gpg_key = publication.getGPGKey() gpg_key = publication.getGPGKey()
domain = publication domain = publication
if gpg_key == '': break
if not gpg_key:
for subscription in self.getSubscriptionList(): for subscription in self.getSubscriptionList():
if subscription.getTitle() == sync_id: if subscription.getTitle() == sync_id:
gpg_key = subscription.getGPGKey() gpg_key = subscription.getGPGKey()
...@@ -1007,13 +1010,14 @@ class SynchronizationTool( SubscriptionSynchronization, ...@@ -1007,13 +1010,14 @@ class SynchronizationTool( SubscriptionSynchronization,
user = domain.getZopeUser() user = domain.getZopeUser()
#LOG('readResponse, user :', DEBUG, user) #LOG('readResponse, user :', DEBUG, user)
newSecurityManager(None, user) newSecurityManager(None, user)
break
# decrypt the message if needed # decrypt the message if needed
if gpg_key not in (None,''): else:
filename = str(random.randrange(1, 2147483600)) + '.txt' filename = str(random.randrange(1, 2147483600)) + '.txt'
encrypted = file('/tmp/%s.gz.gpg' % filename,'w') encrypted = file('/tmp/%s.gz.gpg' % filename,'w')
encrypted.write(text) encrypted.write(text)
encrypted.close() encrypted.close()
(status,output)=commands.getstatusoutput('gpg --homedir \ (status, output) = commands.getstatusoutput('gpg --homedir \
/var/lib/zope/Products/ERP5SyncML/gnupg_keys -r "%s" --decrypt \ /var/lib/zope/Products/ERP5SyncML/gnupg_keys -r "%s" --decrypt \
/tmp/%s.gz.gpg > /tmp/%s.gz' % (gpg_key, filename, filename)) /tmp/%s.gz.gpg > /tmp/%s.gz' % (gpg_key, filename, filename))
LOG('readResponse, gpg output:', TRACE, output) LOG('readResponse, gpg output:', TRACE, output)
...@@ -1033,7 +1037,7 @@ class SynchronizationTool( SubscriptionSynchronization, ...@@ -1033,7 +1037,7 @@ class SynchronizationTool( SubscriptionSynchronization,
xml = etree.XML(text) xml = etree.XML(text)
url = self.getTarget(xml) url = self.getTarget(xml)
for publication in self.getPublicationList(): for publication in self.getPublicationList():
if publication.getPublicationUrl()==url and \ if publication.getPublicationUrl() == url and \
publication.getTitle() == sync_id: publication.getTitle() == sync_id:
if publication.getActivityEnabled(): if publication.getActivityEnabled():
#use activities to send SyncML data. #use activities to send SyncML data.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment