From c0ea647c3742d17808da346fbaba058eab558e7d Mon Sep 17 00:00:00 2001
From: Daniil Yarancev <21169548+Yardanico@users.noreply.github.com>
Date: Sun, 27 May 2018 18:48:24 +0300
Subject: [PATCH 1/4] Remove #

I don't even know how it got there.
---
 doc/nep1.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/nep1.rst b/doc/nep1.rst
index 6924a86f6e..c4d4456815 100644
--- a/doc/nep1.rst
+++ b/doc/nep1.rst
@@ -181,7 +181,7 @@ Conventions for multi-line statements and expressions
       LongTupleA = tuple[wordyTupleMemberOne: int, wordyTupleMemberTwo: string,
                          wordyTupleMemberThree: float]
 
-- Similarly, any procedure and procedure type declarations that are longer#
+- Similarly, any procedure and procedure type declarations that are longer
   than one line should do the same thing.
 
   .. code-block:: nim
@@ -198,4 +198,4 @@ Conventions for multi-line statements and expressions
 
   .. code-block:: nim
     startProcess(nimExecutable, currentDirectory, compilerArguments
-                 environment, processOptions)
\ No newline at end of file
+                 environment, processOptions)

From b36c499907e923d6836c9341e494bfdd89be489e Mon Sep 17 00:00:00 2001
From: WhiteDuke <Wh1teDuke@users.noreply.github.com>
Date: Sun, 27 May 2018 21:08:37 +0200
Subject: [PATCH 2/4] Set domain to client

---
 lib/pure/net.nim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pure/net.nim b/lib/pure/net.nim
index fc04ef1af4..bf5f3f57e1 100644
--- a/lib/pure/net.nim
+++ b/lib/pure/net.nim
@@ -803,6 +803,7 @@ proc acceptAddr*(server: Socket, client: var Socket, address: var string,
   else:
     address = ret[1]
     client.fd = sock
+    client.domain = getSockDomain(sock)
     client.isBuffered = server.isBuffered
 
     # Handle SSL.

From 21fb0db6e271148e5c8970f0f9f4805bae2ca59a Mon Sep 17 00:00:00 2001
From: Federico Ceratto <federico.ceratto@gmail.com>
Date: Mon, 28 May 2018 00:35:19 +0100
Subject: [PATCH 3/4] Update existsFile documentation (#7888)

---
 lib/pure/os.nim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 370420d37c..3ff608cfc0 100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -70,7 +70,8 @@ when defined(windows):
 
 proc existsFile*(filename: string): bool {.rtl, extern: "nos$1",
                                           tags: [ReadDirEffect].} =
-  ## Returns true if the file exists, false otherwise.
+  ## Returns true if `filename` exists and is a regular file or symlink.
+  ## (directories, device files, named pipes and sockets return false)
   when defined(windows):
     when useWinUnicode:
       wrapUnary(a, getFileAttributesW, filename)

From b6b6382e0b4f86759d07a1be150a826b9e0fe054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E7=A7=92=E4=B8=8D=E8=A7=89=E6=A2=A6?=
 <7822577+7sDream@users.noreply.github.com>
Date: Mon, 28 May 2018 10:24:04 +0800
Subject: [PATCH 4/4] Added: type name output when exception raised from
 unittest (#7869)

---
 changelog.md                            |  2 ++
 lib/pure/unittest.nim                   | 10 +++++++---
 tests/stdlib/tunittestexceptiontype.nim | 10 ++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 tests/stdlib/tunittestexceptiontype.nim

diff --git a/changelog.md b/changelog.md
index 57b54c71ef..813c4caf84 100644
--- a/changelog.md
+++ b/changelog.md
@@ -76,6 +76,8 @@
 - The `terminal` module now exports additional procs for generating ANSI color
   codes as strings.
 - Added the parameter ``val`` for the ``CritBitTree[int].inc`` proc.
+- An exception raised from ``test`` block of ``unittest`` now show its type in
+  error message
 
 ### Language additions
 
diff --git a/lib/pure/unittest.nim b/lib/pure/unittest.nim
index 917251a6cd..d804ba7c83 100644
--- a/lib/pure/unittest.nim
+++ b/lib/pure/unittest.nim
@@ -462,6 +462,8 @@ template suite*(name, body) {.dirty.} =
     finally:
       suiteEnded()
 
+template exceptionTypeName(e: typed): string = $e.name
+
 template test*(name, body) {.dirty.} =
   ## Define a single test case identified by `name`.
   ##
@@ -476,7 +478,7 @@ template test*(name, body) {.dirty.} =
   ## .. code-block::
   ##
   ##  [OK] roses are red
-  bind shouldRun, checkpoints, formatters, ensureInitialized, testEnded
+  bind shouldRun, checkpoints, formatters, ensureInitialized, testEnded, exceptionTypeName
 
   ensureInitialized()
 
@@ -495,8 +497,10 @@ template test*(name, body) {.dirty.} =
 
     except:
       when not defined(js):
-        checkpoint("Unhandled exception: " & getCurrentExceptionMsg())
-        var stackTrace {.inject.} = getCurrentException().getStackTrace()
+        let e = getCurrentException()
+        let eTypeDesc = "[" & exceptionTypeName(e) & "]"
+        checkpoint("Unhandled exception: " & getCurrentExceptionMsg() & " " & eTypeDesc)
+        var stackTrace {.inject.} = e.getStackTrace()
       fail()
 
     finally:
diff --git a/tests/stdlib/tunittestexceptiontype.nim b/tests/stdlib/tunittestexceptiontype.nim
new file mode 100644
index 0000000000..e05a254099
--- /dev/null
+++ b/tests/stdlib/tunittestexceptiontype.nim
@@ -0,0 +1,10 @@
+discard """
+  exitcode: 1
+  outputsub: '''exception type is [ValueError]'''
+"""
+
+import unittest
+
+suite "exception from test":
+  test "show exception type":
+    raise newException(ValueError, "exception type is")