diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-09-11 17:27:47 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-09-11 17:27:47 +0200 |
| commit | f7d1902043c1bc70ba0bb159a3e8c71b78947ad7 (patch) | |
| tree | 96adf0fef3b9f1af4b318c1b639797dcca185874 /lib/pure/smtp.nim | |
| parent | 0495e6cf3a1cf0f5f71622a8408d24fbc27642a0 (diff) | |
| parent | af94946517d4e07e91b5c5ca21d58645f6da86c4 (diff) | |
| download | Nim-f7d1902043c1bc70ba0bb159a3e8c71b78947ad7.tar.gz | |
fixes merge conflicts
Diffstat (limited to 'lib/pure/smtp.nim')
| -rw-r--r-- | lib/pure/smtp.nim | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/pure/smtp.nim b/lib/pure/smtp.nim index 08e6c8112..d9b863a52 100644 --- a/lib/pure/smtp.nim +++ b/lib/pure/smtp.nim @@ -51,8 +51,6 @@ type Smtp* = SmtpBase[Socket] AsyncSmtp* = SmtpBase[AsyncSocket] -{.deprecated: [EInvalidReply: ReplyError, TMessage: Message, TSMTP: Smtp].} - proc debugSend(smtp: Smtp | AsyncSmtp, cmd: string) {.multisync.} = if smtp.debug: echo("C:" & cmd) @@ -121,8 +119,7 @@ proc newSmtp*(useSsl = false, debug=false, when compiledWithSsl: sslContext.wrapSocket(result.sock) else: - raise newException(SystemError, - "SMTP module compiled without SSL support") + {.error: "SMTP module compiled without SSL support".} proc newAsyncSmtp*(useSsl = false, debug=false, sslContext = defaultSslContext): AsyncSmtp = @@ -135,8 +132,7 @@ proc newAsyncSmtp*(useSsl = false, debug=false, when compiledWithSsl: sslContext.wrapSocket(result.sock) else: - raise newException(SystemError, - "SMTP module compiled without SSL support") + {.error: "SMTP module compiled without SSL support".} proc quitExcpt(smtp: AsyncSmtp, msg: string): Future[void] = var retFuture = newFuture[void]() |