summaryrefslogtreecommitdiff
path: root/addons/document_ftp/ftpserver
diff options
context:
space:
mode:
authorAntonin Bourguignon <abo@openerp.com>2012-08-06 19:08:41 +0200
committerAntonin Bourguignon <abo@openerp.com>2012-08-06 19:08:41 +0200
commita52eeef5194b5fdab2b1d659f383c7589a2ebb98 (patch)
treeb494ed4d9c36efccba46a2814bea097af47b57f7 /addons/document_ftp/ftpserver
parentd928b07ace2b1f9b8a50ef11075cbea0fa9a6060 (diff)
[IMP] rephrase some error and warning messages in document, edi, google_base_account, mrp and mrp_repair
remove exclamation marks at the end of messages remove unjustified capital letters bzr revid: abo@openerp.com-20120806170841-cx9vuend1vglmsqk
Diffstat (limited to 'addons/document_ftp/ftpserver')
-rw-r--r--addons/document_ftp/ftpserver/abstracted_fs.py4
-rwxr-xr-xaddons/document_ftp/ftpserver/ftpserver.py20
2 files changed, 12 insertions, 12 deletions
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index d5bcd04e6eb..dbda715f614 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -303,7 +303,7 @@ class abstracted_fs(object):
raise
if not uid:
cr.close()
- raise OSError(2, 'Authentification is Required!')
+ raise OSError(2, 'Authentification required.')
n = get_node_context(cr, uid, {})
node = n.get_uri(cr, p_parts[1:])
return (cr, node, rem_path)
@@ -318,7 +318,7 @@ class abstracted_fs(object):
node = self.cwd_node
if node is False and mode not in ('???'):
cr.close()
- raise IOError(errno.ENOENT, 'Path does not exist!')
+ raise IOError(errno.ENOENT, 'Path does not exist.')
return (cr, node, rem_path)
def get_node_cr_uid(self, node):
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index e20ee305c36..1e8b8d88468 100755
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -302,13 +302,13 @@ class DummyAuthorizer:
provide customized response strings when user log-in and quit.
"""
if self.has_user(username):
- raise AuthorizerError('User "%s" already exists!' %username)
+ raise AuthorizerError('User "%s" already exists.' %username)
homedir = os.path.realpath(homedir)
if not os.path.isdir(homedir):
- raise AuthorizerError('No such directory: "%s"!' %homedir)
+ raise AuthorizerError('No such directory: "%s".' %homedir)
for p in perm:
if p not in 'elradfmw':
- raise AuthorizerError('No such permission: "%s"!' %p)
+ raise AuthorizerError('No such permission: "%s".' %p)
for p in perm:
if (p in self.write_perms) and (username == 'anonymous'):
warnings.warn("Write permissions are assigned to anonymous user.",
@@ -638,7 +638,7 @@ class DTPHandler(asyncore.dispatcher):
elif type == 'i':
self.data_wrapper = lambda x: x
else:
- raise TypeError, "Unsupported type!"
+ raise TypeError, "Unsupported type."
self.receive = True
def get_transmitted_bytes(self):
@@ -767,7 +767,7 @@ class DTPHandler(asyncore.dispatcher):
# some other exception occurred; we don't want to provide
# confidential error messages
logerror(traceback.format_exc())
- error = "Internal error!"
+ error = "Internal error."
self.cmd_channel.respond("426 %s; transfer aborted." %error)
self.close()
@@ -823,7 +823,7 @@ class FileProducer:
elif type == 'i':
self.data_wrapper = lambda x: x
else:
- raise TypeError, "Unsupported type!"
+ raise TypeError, "Unsupported type."
def more(self):
"""Attempt a chunk of data of size self.buffer_size."""
@@ -2150,7 +2150,7 @@ class FTPHandler(asynchat.async_chat):
datacr = self.get_crdata2(line, mode='list')
# RFC-3659 requires 501 response code if path is not a directory
if not self.fs.isdir(datacr[1]):
- err = 'No such directory!'
+ err = 'No such directory.'
self.log('FAIL MLSD "%s". %s.' %(line, err))
self.respond("501 %s." %err)
return
@@ -2191,7 +2191,7 @@ class FTPHandler(asynchat.async_chat):
fd.seek(self.restart_position)
ok = 1
except AssertionError:
- why = "Invalid REST parameter!"
+ why = "Invalid REST parameter."
except IOError, err:
why = _strerror(err)
self.restart_position = 0
@@ -2240,7 +2240,7 @@ class FTPHandler(asynchat.async_chat):
fd.seek(self.restart_position)
ok = 1
except AssertionError:
- why = "Invalid REST parameter!"
+ why = "Invalid REST parameter."
except IOError, err:
why = _strerror(err)
self.restart_position = 0
@@ -2760,7 +2760,7 @@ class FTPHandler(asynchat.async_chat):
def ftp_OPTS(self, line):
"""Specify options for FTP commands as specified in RFC-2389."""
try:
- assert (not line.count(' ') > 1), 'Invalid number of arguments!'
+ assert (not line.count(' ') > 1), 'Invalid number of arguments.'
if ' ' in line:
cmd, arg = line.split(' ')
assert (';' in arg), 'Invalid argument!'