Fixed recvLine deprecation warnings.
This commit is contained in:
parent
43499b9f07
commit
e3d097c4e9
6 changed files with 72 additions and 80 deletions
|
|
@ -28,9 +28,6 @@
|
|||
## For SSL support this module relies on OpenSSL. If you want to
|
||||
## enable SSL, compile with ``-d:ssl``.
|
||||
|
||||
when not defined(ssl):
|
||||
{.error: "The SMTP module should be compiled with SSL support. Compile with -d:ssl."}
|
||||
|
||||
import sockets, strutils, strtabs, base64, os
|
||||
|
||||
type
|
||||
|
|
@ -54,16 +51,11 @@ proc debugSend(smtp: TSMTP, cmd: string) =
|
|||
|
||||
proc debugRecv(smtp: var TSMTP): TaintedString =
|
||||
var line = TaintedString""
|
||||
var ret = False
|
||||
ret = smtp.sock.recvLine(line)
|
||||
smtp.sock.readLine(line)
|
||||
|
||||
if ret:
|
||||
if smtp.debug:
|
||||
echo("S:" & line.string)
|
||||
return line
|
||||
else:
|
||||
OSError()
|
||||
return TaintedString""
|
||||
if smtp.debug:
|
||||
echo("S:" & line.string)
|
||||
return line
|
||||
|
||||
proc quitExcpt(smtp: TSMTP, msg: string) =
|
||||
smtp.debugSend("QUIT")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue