Merge branch '2017.7' into '2018.3'

Conflicts:
 - doc/conf.py
 - salt/modules/zfs.py

doc/topics/development/conventions/documentation.rst

@@ -340,8 +340,17 @@ Building the documentation
 4.  A useful method of viewing the HTML documentation locally is to start
     Python's built-in HTTP server:
 
+    Python 3:
+    
     .. code-block:: bash
+		    
+        cd /path/to/salt/doc/_build/html
+	python3 -m http.server
 
+    Python 2:
+    
+    .. code-block:: bash
+		    
         cd /path/to/salt/doc/_build/html
         python -m SimpleHTTPServer
 

salt/utils/rsax931.py

@@ -56,6 +56,13 @@ def _init_libcrypto():
     '''
     libcrypto = _load_libcrypto()
 
+    try:
+        libcrypto.OPENSSL_init_crypto()
+    except AttributeError:
+        # Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
+        libcrypto.OPENSSL_no_config()
+        libcrypto.OPENSSL_add_all_algorithms_noconf()
+
     libcrypto.RSA_new.argtypes = ()
     libcrypto.RSA_new.restype = c_void_p
     libcrypto.RSA_free.argtypes = (c_void_p, )
@@ -70,13 +77,6 @@ def _init_libcrypto():
     libcrypto.RSA_private_encrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
     libcrypto.RSA_public_decrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
 
-    try:
-        libcrypto.OPENSSL_init_crypto()
-    except AttributeError:
-        # Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
-        libcrypto.OPENSSL_no_config()
-        libcrypto.OPENSSL_add_all_algorithms_noconf()
-
     return libcrypto
 
 

salt/utils/win_update.py

@@ -25,6 +25,16 @@ except ImportError:
 
 log = logging.getLogger(__name__)
 
+__virtualname__ = 'win_update'
+
+
+def __virtual__():
+    if not salt.utils.platform.is_windows():
+        return False, 'win_update: Not available on Windows'
+    if not HAS_PYWIN32:
+        return False, 'win_update: Missing pywin32'
+    return __virtualname__
+
 
 class Updates(object):
     '''

tests/support/mixins.py

@@ -651,14 +651,18 @@ def _fetch_events(q):
 
     atexit.register(_clean_queue)
     a_config = AdaptedConfigurationTestCaseMixin()
-    event = salt.utils.event.get_event('minion', sock_dir=a_config.get_config('minion')['sock_dir'], opts=a_config.get_config('minion'))
+    event = salt.utils.event.get_event(
+        'minion',
+        sock_dir=a_config.get_config('minion')['sock_dir'],
+        opts=a_config.get_config('minion'),
+    )
     while True:
         try:
             events = event.get_event(full=False)
-        except Exception:
+        except Exception as exc:
             # This is broad but we'll see all kinds of issues right now
             # if we drop the proc out from under the socket while we're reading
-            pass
+            log.exception("Exception caught while getting events %r", exc)
         q.put(events)