From 557579da36d431e818a03d9a34be1fc52e4b29b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Rousset?= <tharvik@users.noreply.github.com>
Date: Thu, 28 Jul 2016 15:15:22 +0200
Subject: [PATCH] merge py2 and py3 errno (#413)

---
 stdlib/{2.7 => 2and3}/errno.pyi | 222 ++++++++++++++++----------------
 stdlib/3/errno.pyi              | 132 -------------------
 2 files changed, 111 insertions(+), 243 deletions(-)
 rename stdlib/{2.7 => 2and3}/errno.pyi (95%)
 delete mode 100644 stdlib/3/errno.pyi

diff --git a/stdlib/2.7/errno.pyi b/stdlib/2and3/errno.pyi
similarity index 95%
rename from stdlib/2.7/errno.pyi
rename to stdlib/2and3/errno.pyi
index c60170d66..8f6ce183e 100644
--- a/stdlib/2.7/errno.pyi
+++ b/stdlib/2and3/errno.pyi
@@ -1,129 +1,129 @@
-"""Stubs for the 'errno' module."""
+# Stubs for errno
 
-from typing import Dict
+from typing import Mapping
+import sys
 
-errorcode = ...  # type: Dict[int, str]
+errorcode = ... # type: Mapping[int, str]
 
-E2BIG = ...  # type: int
-EACCES = ...  # type: int
-EADDRINUSE = ...  # type: int
-EADDRNOTAVAIL = ...  # type: int
-EADV = ...  # type: int
-EAFNOSUPPORT = ...  # type: int
-EAGAIN = ...  # type: int
-EALREADY = ...  # type: int
-EBADE = ...  # type: int
-EBADF = ...  # type: int
-EBADFD = ...  # type: int
-EBADMSG = ...  # type: int
-EBADR = ...  # type: int
-EBADRQC = ...  # type: int
-EBADSLT = ...  # type: int
-EBFONT = ...  # type: int
-EBUSY = ...  # type: int
-ECHILD = ...  # type: int
-ECHRNG = ...  # type: int
-ECOMM = ...  # type: int
-ECONNABORTED = ...  # type: int
-ECONNREFUSED = ...  # type: int
-ECONNRESET = ...  # type: int
-EDEADLK = ...  # type: int
-EDEADLOCK = ...  # type: int
-EDESTADDRREQ = ...  # type: int
-EDOM = ...  # type: int
-EDOTDOT = ...  # type: int
-EDQUOT = ...  # type: int
-EEXIST = ...  # type: int
-EFAULT = ...  # type: int
-EFBIG = ...  # type: int
-EHOSTDOWN = ...  # type: int
-EHOSTUNREACH = ...  # type: int
-EIDRM = ...  # type: int
-EILSEQ = ...  # type: int
-EINPROGRESS = ...  # type: int
+EPERM = ...  # type: int
+ENOENT = ...  # type: int
+ESRCH = ...  # type: int
 EINTR = ...  # type: int
-EINVAL = ...  # type: int
 EIO = ...  # type: int
-EISCONN = ...  # type: int
+ENXIO = ...  # type: int
+E2BIG = ...  # type: int
+ENOEXEC = ...  # type: int
+EBADF = ...  # type: int
+ECHILD = ...  # type: int
+EAGAIN = ...  # type: int
+ENOMEM = ...  # type: int
+EACCES = ...  # type: int
+EFAULT = ...  # type: int
+ENOTBLK = ...  # type: int
+EBUSY = ...  # type: int
+EEXIST = ...  # type: int
+EXDEV = ...  # type: int
+ENODEV = ...  # type: int
+ENOTDIR = ...  # type: int
 EISDIR = ...  # type: int
-EISNAM = ...  # type: int
-EL2HLT = ...  # type: int
+EINVAL = ...  # type: int
+ENFILE = ...  # type: int
+EMFILE = ...  # type: int
+ENOTTY = ...  # type: int
+ETXTBSY = ...  # type: int
+EFBIG = ...  # type: int
+ENOSPC = ...  # type: int
+ESPIPE = ...  # type: int
+EROFS = ...  # type: int
+EMLINK = ...  # type: int
+EPIPE = ...  # type: int
+EDOM = ...  # type: int
+ERANGE = ...  # type: int
+EDEADLCK = ...  # type: int
+ENAMETOOLONG = ...  # type: int
+ENOLCK = ...  # type: int
+ENOSYS = ...  # type: int
+ENOTEMPTY = ...  # type: int
+ELOOP = ...  # type: int
+EWOULDBLOCK = ...  # type: int
+ENOMSG = ...  # type: int
+EIDRM = ...  # type: int
+ECHRNG = ...  # type: int
 EL2NSYNC = ...  # type: int
 EL3HLT = ...  # type: int
 EL3RST = ...  # type: int
-ELIBACC = ...  # type: int
-ELIBBAD = ...  # type: int
-ELIBEXEC = ...  # type: int
-ELIBMAX = ...  # type: int
-ELIBSCN = ...  # type: int
 ELNRNG = ...  # type: int
-ELOOP = ...  # type: int
-EMFILE = ...  # type: int
-EMLINK = ...  # type: int
-EMSGSIZE = ...  # type: int
-EMULTIHOP = ...  # type: int
-ENAMETOOLONG = ...  # type: int
-ENAVAIL = ...  # type: int
-ENETDOWN = ...  # type: int
-ENETRESET = ...  # type: int
-ENETUNREACH = ...  # type: int
-ENFILE = ...  # type: int
-ENOANO = ...  # type: int
-ENOBUFS = ...  # type: int
+EUNATCH = ...  # type: int
 ENOCSI = ...  # type: int
+EL2HLT = ...  # type: int
+EBADE = ...  # type: int
+EBADR = ...  # type: int
+EXFULL = ...  # type: int
+ENOANO = ...  # type: int
+EBADRQC = ...  # type: int
+EBADSLT = ...  # type: int
+EDEADLOCK = ...  # type: int
+EBFONT = ...  # type: int
+ENOSTR = ...  # type: int
 ENODATA = ...  # type: int
-ENODEV = ...  # type: int
-ENOENT = ...  # type: int
-ENOEXEC = ...  # type: int
-ENOLCK = ...  # type: int
-ENOLINK = ...  # type: int
-ENOMEM = ...  # type: int
-ENOMSG = ...  # type: int
+ETIME = ...  # type: int
+ENOSR = ...  # type: int
 ENONET = ...  # type: int
 ENOPKG = ...  # type: int
-ENOPROTOOPT = ...  # type: int
-ENOSPC = ...  # type: int
-ENOSR = ...  # type: int
-ENOSTR = ...  # type: int
-ENOSYS = ...  # type: int
-ENOTBLK = ...  # type: int
-ENOTCONN = ...  # type: int
-ENOTDIR = ...  # type: int
-ENOTEMPTY = ...  # type: int
-ENOTNAM = ...  # type: int
-ENOTSOCK = ...  # type: int
-ENOTSUP = ...  # type: int
-ENOTTY = ...  # type: int
-ENOTUNIQ = ...  # type: int
-ENXIO = ...  # type: int
-EOPNOTSUPP = ...  # type: int
-EOVERFLOW = ...  # type: int
-EPERM = ...  # type: int
-EPFNOSUPPORT = ...  # type: int
-EPIPE = ...  # type: int
-EPROTO = ...  # type: int
-EPROTONOSUPPORT = ...  # type: int
-EPROTOTYPE = ...  # type: int
-ERANGE = ...  # type: int
-EREMCHG = ...  # type: int
 EREMOTE = ...  # type: int
-EREMOTEIO = ...  # type: int
-ERESTART = ...  # type: int
-EROFS = ...  # type: int
-ESHUTDOWN = ...  # type: int
-ESOCKTNOSUPPORT = ...  # type: int
-ESPIPE = ...  # type: int
-ESRCH = ...  # type: int
+ENOLINK = ...  # type: int
+EADV = ...  # type: int
 ESRMNT = ...  # type: int
-ESTALE = ...  # type: int
+ECOMM = ...  # type: int
+EPROTO = ...  # type: int
+EMULTIHOP = ...  # type: int
+EDOTDOT = ...  # type: int
+EBADMSG = ...  # type: int
+EOVERFLOW = ...  # type: int
+ENOTUNIQ = ...  # type: int
+EBADFD = ...  # type: int
+EREMCHG = ...  # type: int
+ELIBACC = ...  # type: int
+ELIBBAD = ...  # type: int
+ELIBSCN = ...  # type: int
+ELIBMAX = ...  # type: int
+ELIBEXEC = ...  # type: int
+EILSEQ = ...  # type: int
+ERESTART = ...  # type: int
 ESTRPIPE = ...  # type: int
-ETIME = ...  # type: int
-ETIMEDOUT = ...  # type: int
-ETOOMANYREFS = ...  # type: int
-ETXTBSY = ...  # type: int
-EUCLEAN = ...  # type: int
-EUNATCH = ...  # type: int
 EUSERS = ...  # type: int
-EWOULDBLOCK = ...  # type: int
-EXDEV = ...  # type: int
-EXFULL = ...  # type: int
+ENOTSOCK = ...  # type: int
+EDESTADDRREQ = ...  # type: int
+EMSGSIZE = ...  # type: int
+EPROTOTYPE = ...  # type: int
+ENOPROTOOPT = ...  # type: int
+EPROTONOSUPPORT = ...  # type: int
+ESOCKTNOSUPPORT = ...  # type: int
+EOPNOTSUPP = ...  # type: int
+EPFNOSUPPORT = ...  # type: int
+EAFNOSUPPORT = ...  # type: int
+EADDRINUSE = ...  # type: int
+EADDRNOTAVAIL = ...  # type: int
+ENETDOWN = ...  # type: int
+ENETUNREACH = ...  # type: int
+ENETRESET = ...  # type: int
+ECONNABORTED = ...  # type: int
+ECONNRESET = ...  # type: int
+ENOBUFS = ...  # type: int
+EISCONN = ...  # type: int
+ENOTCONN = ...  # type: int
+ESHUTDOWN = ...  # type: int
+ETOOMANYREFS = ...  # type: int
+ETIMEDOUT = ...  # type: int
+ECONNREFUSED = ...  # type: int
+EHOSTDOWN = ...  # type: int
+EHOSTUNREACH = ...  # type: int
+EALREADY = ...  # type: int
+EINPROGRESS = ...  # type: int
+ESTALE = ...  # type: int
+EUCLEAN = ...  # type: int
+ENOTNAM = ...  # type: int
+ENAVAIL = ...  # type: int
+EISNAM = ...  # type: int
+EREMOTEIO = ...  # type: int
+EDQUOT = ...  # type: int
diff --git a/stdlib/3/errno.pyi b/stdlib/3/errno.pyi
deleted file mode 100644
index e1f2ee311..000000000
--- a/stdlib/3/errno.pyi
+++ /dev/null
@@ -1,132 +0,0 @@
-# Stubs for errno
-
-# Based on http://docs.python.org/3.2/library/errno.html
-
-from typing import Dict
-
-errorcode = ...  # type: Dict[int, str]
-
-# TODO some of the names below are platform specific
-
-EPERM = 0
-ENOENT = 0
-ESRCH = 0
-EINTR = 0
-EIO = 0
-ENXIO = 0
-E2BIG = 0
-ENOEXEC = 0
-EBADF = 0
-ECHILD = 0
-EAGAIN = 0
-ENOMEM = 0
-EACCES = 0
-EFAULT = 0
-ENOTBLK = 0
-EBUSY = 0
-EEXIST = 0
-EXDEV = 0
-ENODEV = 0
-ENOTDIR = 0
-EISDIR = 0
-EINVAL = 0
-ENFILE = 0
-EMFILE = 0
-ENOTTY = 0
-ETXTBSY = 0
-EFBIG = 0
-ENOSPC = 0
-ESPIPE = 0
-EROFS = 0
-EMLINK = 0
-EPIPE = 0
-EDOM = 0
-ERANGE = 0
-EDEADLK = 0
-ENAMETOOLONG = 0
-ENOLCK = 0
-ENOSYS = 0
-ENOTEMPTY = 0
-ELOOP = 0
-EWOULDBLOCK = 0
-ENOMSG = 0
-EIDRM = 0
-ECHRNG = 0
-EL2NSYNC = 0
-EL3HLT = 0
-EL3RST = 0
-ELNRNG = 0
-EUNATCH = 0
-ENOCSI = 0
-EL2HLT = 0
-EBADE = 0
-EBADR = 0
-EXFULL = 0
-ENOANO = 0
-EBADRQC = 0
-EBADSLT = 0
-EDEADLOCK = 0
-EBFONT = 0
-ENOSTR = 0
-ENODATA = 0
-ETIME = 0
-ENOSR = 0
-ENONET = 0
-ENOPKG = 0
-EREMOTE = 0
-ENOLINK = 0
-EADV = 0
-ESRMNT = 0
-ECOMM = 0
-EPROTO = 0
-EMULTIHOP = 0
-EDOTDOT = 0
-EBADMSG = 0
-EOVERFLOW = 0
-ENOTUNIQ = 0
-EBADFD = 0
-EREMCHG = 0
-ELIBACC = 0
-ELIBBAD = 0
-ELIBSCN = 0
-ELIBMAX = 0
-ELIBEXEC = 0
-EILSEQ = 0
-ERESTART = 0
-ESTRPIPE = 0
-EUSERS = 0
-ENOTSOCK = 0
-EDESTADDRREQ = 0
-EMSGSIZE = 0
-EPROTOTYPE = 0
-ENOPROTOOPT = 0
-EPROTONOSUPPORT = 0
-ESOCKTNOSUPPORT = 0
-EOPNOTSUPP = 0
-EPFNOSUPPORT = 0
-EAFNOSUPPORT = 0
-EADDRINUSE = 0
-EADDRNOTAVAIL = 0
-ENETDOWN = 0
-ENETUNREACH = 0
-ENETRESET = 0
-ECONNABORTED = 0
-ECONNRESET = 0
-ENOBUFS = 0
-EISCONN = 0
-ENOTCONN = 0
-ESHUTDOWN = 0
-ETOOMANYREFS = 0
-ETIMEDOUT = 0
-ECONNREFUSED = 0
-EHOSTDOWN = 0
-EHOSTUNREACH = 0
-EALREADY = 0
-EINPROGRESS = 0
-ESTALE = 0
-EUCLEAN = 0
-ENOTNAM = 0
-ENAVAIL = 0
-EISNAM = 0
-EREMOTEIO = 0
-EDQUOT = 0