Move validation.

Author: kwlzn

notebook/notebookapp.py

@@ -1463,6 +1463,13 @@ def init_webapp(self):
                 )
                 sys.exit(1)
 
+            if self.open_browser:
+                # If we're bound to a UNIX socket, we can't reliably connect from a browser.
+                self.log.critical(
+                    _('Options --open-browser and --sock are mutually exclusive. Aborting.'),
+                )
+                sys.exit(1)
+
             if sys.platform.startswith('win'):
                 self.log.critical(
                     _('Option --sock is not supported on Windows, but got value of %s. Aborting.' % self.sock),
@@ -1935,13 +1942,6 @@ def start(self):
         self.write_server_info_file()
         self.write_browser_open_file()
 
-        if self.sock and self.open_browser:
-            # If we're bound to a UNIX socket, we can't reliably connect from a browser.
-            self.log.critical(
-                _('Options --open_browser and --sock are mutually exclusive. Aborting.'),
-            )
-            sys.exit(1)
-
         if (self.open_browser or self.file_to_run) and not self.sock:
             self.launch_browser()
 

setup.py

@@ -117,8 +117,7 @@
         ':python_version == "2.7"': ['ipaddress'],
         'test:python_version == "2.7"': ['mock'],
         'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',
-                 'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov',
-                 'requests-unixsocket'],
+                 'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
         'test:sys_platform == "win32"': ['nose-exclude'],
     },
     python_requires = '>=3.5',