From a8922c32a86e29b091d0c87e2df50d15326c7082 Mon Sep 17 00:00:00 2001
From: Jefry Lagrange <jefry.reyes@gmail.com>
Date: Sat, 22 Sep 2012 22:16:03 -0400
Subject: [PATCH] coding standards
---
src/common/connection_handlers_events.py | 4 ++--
src/common/jingle.py | 6 +++---
src/common/jingle_content.py | 2 +-
src/common/jingle_ft.py | 2 +-
src/common/jingle_session.py | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 06bb22c836..2f94f80d15 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -2003,9 +2003,9 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
h = file_tag.getTag('hash')
n = file_tag.getTag('name')
if h:
- file_info = self.conn.get_files_info(hash_=h)
+ file_info = self.conn.get_file_info(hash_=h)
elif n:
- file_info = self.conn.get_files_info(name=n)
+ file_info = self.conn.get_file_info(name=n)
self.file_props.file_name = file_info['file-name']
self.file_props.sender = self.conn._ft_get_our_jid()
self.file_props.receiver = self.fjid
diff --git a/src/common/jingle.py b/src/common/jingle.py
index 45bf7154b9..985003aa73 100644
--- a/src/common/jingle.py
+++ b/src/common/jingle.py
@@ -189,12 +189,12 @@ class ConnectionJingle(object):
else:
return sessions
- def set_files_info(self, file_):
+ def set_file_info(self, file_):
# Saves information about the files we have transfered in case they need
# to be requested again.
self.files.append(file_)
- def get_files_info(self, hash_=None, name=None):
+ def get_file_info(self, hash_=None, name=None):
if hash_:
for f in self.files: # DEBUG
#if f['hash'] == '1294809248109223':
@@ -217,5 +217,5 @@ class ConnectionJingle(object):
for session in self._sessions.values():
if session.peerjid == jid and session.get_content(media):
return session
-
return None
+
diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py
index 5aaff47899..adb32814ae 100644
--- a/src/common/jingle_content.py
+++ b/src/common/jingle_content.py
@@ -203,7 +203,7 @@ class JingleContent(object):
'date' : self.file_props.date,
'peerjid' : pjid
}
- self.session.connection.set_files_info(file_info)
+ self.session.connection.set_file_info(file_info)
desc = file_tag.setTag('desc')
if self.file_props.desc:
desc.setData(self.file_props.desc)
diff --git a/src/common/jingle_ft.py b/src/common/jingle_ft.py
index fda8758aba..ae214b38e8 100644
--- a/src/common/jingle_ft.py
+++ b/src/common/jingle_ft.py
@@ -142,7 +142,7 @@ class JingleFileTransfer(JingleContent):
'date' : self.file_props.date,
'peerjid' : pjid
}
- self.session.connection.set_files_info(file_info)
+ self.session.connection.set_file_info(file_info)
def _calcHash(self):
# Caculates the hash and returns a xep-300 hash stanza
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
index bfb7925a0f..7ef8ea37e0 100644
--- a/src/common/jingle_session.py
+++ b/src/common/jingle_session.py
@@ -522,9 +522,9 @@ class JingleSession(object):
h = request.getTag('file').getTag('hash')
n = request.getTag('file').getTag('name')
if h:
- file_info = self.connection.get_files_info(hash_=h)
+ file_info = self.connection.get_file_info(hash_=h)
elif n:
- file_info = self.connection.get_files_info(name=n)
+ file_info = self.connection.get_file_info(name=n)
pjid = gajim.get_jid_without_resource(self.peerjid)
if not file_info or file_info['peerjid'] != pjid:
log.warning('The peer ' + pjid + \
--
GitLab