From c72d93e42630702f782bbd83a3072fb1411ea859 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nbollweg@continuum.io>
Date: Mon, 21 Mar 2016 09:34:57 -0400
Subject: [PATCH] adding sys_prefix override of user

---
 notebook/nbextensions.py     | 14 ++++++++++----
 notebook/serverextensions.py |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/notebook/nbextensions.py b/notebook/nbextensions.py
index b1a9e97eb..1ada71584 100644
--- a/notebook/nbextensions.py
+++ b/notebook/nbextensions.py
@@ -325,10 +325,12 @@ def _set_nbextension_state(section, require, state,
     user : bool [default: True]
         Whether to update the user's .jupyter/nbextensions directory
     sys_prefix : bool [default: False]
-        Whether to update the sys.prefix, i.e. environment
+        Whether to update the sys.prefix, i.e. environment. Will override
+        `user`.
     logger : Jupyter logger [optional]
         Logger instance to use
     """
+    user = False if sys_prefix else user
     config_dir = os.path.join(
         _get_config_dir(user=user, sys_prefix=sys_prefix), 'nbconfig')
     cm = BaseJSONConfigManager(config_dir=config_dir)
@@ -392,7 +394,8 @@ def enable_nbextension(section, require, user=True, sys_prefix=False,
     user : bool [default: True]
         Whether to enable in the user's nbextensions directory.
     sys_prefix : bool [default: False]
-        Whether to enable in the sys.prefix, i.e. environment
+        Whether to enable in the sys.prefix, i.e. environment. Will override
+        `user`
     logger : Jupyter logger [optional]
         Logger instance to use
     """
@@ -418,7 +421,8 @@ def disable_nbextension(section, require, user=True, sys_prefix=False,
     user : bool [default: True]
         Whether to enable in the user's nbextensions directory.
     sys_prefix : bool [default: False]
-        Whether to enable in the sys.prefix, i.e. environment
+        Whether to enable in the sys.prefix, i.e. environment. Will override
+        `user`.
     logger : Jupyter logger [optional]
         Logger instance to use
     """
@@ -444,7 +448,8 @@ def enable_nbextension_python(module, user=True, sys_prefix=False,
     user : bool [default: True]
         Whether to enable in the user's nbextensions directory.
     sys_prefix : bool [default: False]
-        Whether to enable in the sys.prefix, i.e. environment
+        Whether to enable in the sys.prefix, i.e. environment. Will override
+        `user`
     logger : Jupyter logger [optional]
         Logger instance to use
     """
@@ -1043,6 +1048,7 @@ def _get_config_dir(user=False, sys_prefix=False):
     sys_prefix : bool [default: False]
         Get sys.prefix, i.e. ~/.envs/my-env/etc/jupyter
     """
+    user = False if sys_prefix else user
     if user and sys_prefix:
         raise ArgumentConflict("Cannot specify more than one of user or sys_prefix")
     if user:
diff --git a/notebook/serverextensions.py b/notebook/serverextensions.py
index 20f5f4a72..e055a1d0e 100644
--- a/notebook/serverextensions.py
+++ b/notebook/serverextensions.py
@@ -51,10 +51,11 @@ def toggle_serverextension_python(import_name, enabled=None, parent=None,
         Toggle in the user's configuration location (e.g. ~/.jupyter).
     sys_prefix : bool [default: False]
         Toggle in the current Python environment's configuration location
-        (e.g. ~/.envs/my-env/etc/jupyter).
+        (e.g. ~/.envs/my-env/etc/jupyter). Will override `user`.
     logger : Jupyter logger [optional]
         Logger instance to use
     """
+    user = False if sys_prefix else user
     config_dir = _get_config_dir(user=user, sys_prefix=sys_prefix)
     cm = BaseJSONConfigManager(parent=parent, config_dir=config_dir)
     cfg = cm.get("jupyter_notebook_config")