<!doctype html>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel=stylesheet href=/repo/static/pygments.css>
<link rel=stylesheet href=/repo/static/klaus.css>
<link rel=icon type="image/png" href="/repo/static/favicon.png" />


<!-- Start Google Analytics -->
<script>
    const gtmDict = {
        'localhost:8899': '',

        '192.168.31.11:8899': 'GTM-TW67359',
        's.momodel.cn': 'GTM-TW67359',

        'momodel.natapp1.cc': 'GTM-KJR4BDW',
        '10.214.223.201:8899': 'GTM-KJR4BDW',
        'momodel-zju.natapp1.cc': 'GTM-KJR4BDW',

        'www.momodel.cn:8899': 'GTM-TNSNRQ9',
        'momodel.cn': 'GTM-TNSNRQ9',
        '36.26.77.39:8899': 'GTM-TNSNRQ9',
    }
    const gtmId = gtmDict[window.location.host] || ''
</script>
<!-- End Google Analytics -->

<!-- Google Tag Manager -->
<script>(function (w, d, s, l, i) {
    w[l] = w[l] || []
    w[l].push({
        'gtm.start':
            new Date().getTime(), event: 'gtm.js',
    })
    var f = d.getElementsByTagName(s)[0],
        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''
    j.async = true
    j.src =
        'https://www.googletagmanager.com/gtm.js?id=' + i + dl
    f.parentNode.insertBefore(j, f)
})(window, document, 'script', 'dataLayer', gtmId)</script>
<!-- End Google Tag Manager -->

<script>
    const isCrawler = /bot|google|baidu|bing|msn|duckduckbot|teoma|slurp|yandex|crawler|crawling|spider/i.test(navigator.userAgent)
    const isInIframe = window.location !== window.parent.location
    const repoName = window.location.pathname.split('/')[2]
    const param = window.location.pathname.split('/')[3] + '=' + encodeURIComponent(window.location.pathname.split('/').slice(4).join('/'))
    const distOriginDict = {
        'http://www.momodel.cn:8899': 'https://momodel.cn',
        'http://momodel.cn': 'https://momodel.cn'
    }
    const distOrigin = distOriginDict[window.location.origin] || window.location.origin
    if (!isCrawler && !isInIframe) {
        fetch(`/pyapi/project/projects/${repoName}?by=encoded_name`)
            .then(response => response.json())
            .then((res) => {
                const project = res.response
                let url
                if (window.location.pathname.split('/')[3]) {
                    url = `${distOrigin}/explore/${project._id}?type=${project.type}&${param}`
                } else {
                    url = `${distOrigin}/explore/${project._id}?type=${project.type}`
                }
                location.replace(url)
            })
    }
</script>

<script>
	window.onload = function () {
	  const content = document.getElementById('content')
	  if(content){
	    const contentWrap = content.children[1]
        contentWrap.setAttribute('data-scroll', 'true')
	    const treeList = content.children[0]
        treeList.setAttribute('data-scroll', 'true')
        addTreeToggle(content)
	    
	    // 添加
	    if(window.frameElement.getAttribute('data-toggle') === 'hide'){
	      content.classList.add('tree-hide')
	    }
	  }
	  if(window.frameElement.getAttribute('data-height') && document.getElementById('content')){
	    document.getElementById('content').style.height = `${window.frameElement.getAttribute('data-height')}px`
	  }

	  // 添加展开和收起的图标
	  function addTreeToggle(treeList) {

        const treeToggle = document.createElement('div')
        treeToggle.onclick = function (){
          toggler.hideTree()
        }
        treeToggle.id = 'tree-toggle'
        const treeToggleWrap = document.createElement('div')
        treeToggleWrap.id = 'tree-toggle-icon'
        treeToggleWrap.innerHTML = '<svg t="1607065355038" class="icon close" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11296" ><path d="M265.88223994 506.97586365a37.42797241 37.42797241 0 0 1 10.99679209-26.57865326L701.62300492 55.65156169a37.57376956 37.57376956 0 0 1 53.08357006 53.15730655l-424.67191221 424.7456487a37.57376956 37.57376956 0 0 1-64.15409865-26.57865329" fill="#1890ff" p-id="11297"></path><path d="M265.88223994 506.97586365a37.42797241 37.42797241 0 0 1 64.08036217-26.57865326l434.72186073 434.79392138a37.57376956 37.57376956 0 0 1-53.08357006 53.08524588L276.87903203 533.62657759a37.7195667 37.7195667 0 0 1-10.99679209-26.65071394" fill="#1890ff" p-id="11298"></path></svg>' +
          '<svg t="1607065492217" class="icon expand" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11673" ><path d="M758.11776006 517.02413635a37.42797241 37.42797241 0 0 1-10.99679209 26.57865326L322.37699508 968.34843831a37.57376956 37.57376956 0 0 1-53.08357006-53.15730655l424.67191221-424.7456487a37.57376956 37.57376956 0 0 1 64.15409865 26.57865329" fill="#1890ff" p-id="11674"></path><path d="M758.11776006 517.02413635a37.42797241 37.42797241 0 0 1-64.08036217 26.57865326l-434.72186073-434.79392137a37.57376956 37.57376956 0 0 1 53.08357006-53.08524589L747.12096797 490.37342241a37.7195667 37.7195667 0 0 1 10.99679209 26.65071394" fill="#1890ff" p-id="11675"></path></svg>'
	    treeToggle.appendChild(treeToggleWrap)
        treeList.appendChild(treeToggle)
      }
    }
</script>


<title>
  docker/nbdime-2-toc.patch - 
  hands-on-machine-learning (master)

 - Mo Repos</title>

<script src=/repo/static/klaus.js></script>

<header style="padding-left: 24px">



  <span class=breadcrumbs>

    
        <div style="width: 50px; height: 25px">
            
                <span class=branch-selector-singal><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/tree/master/">master</a></span>
            

        </div>
    




  
  <span id='repo-subpath'>
   <span class=slash>/</span>
    
      
      <a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/tree/master/docker">docker</a>
      <span class=slash>/</span>
      
    
      
      <a href="">nbdime-2-toc.patch</a>
      
    
  </span>
  
</span>

</header>

<div id=content>


<div class=tree id=tree-list data-scroll="true">









  <ul>
    
    <li title=".."><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/tree/master/" class=dir>..</a></li>
    
    <li title="bin"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/tree/master/docker/bin" class=dir>bin</a></li>
    
    
    
    <li title=".env"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/.env" class=env>.env</a></li>
    
    <li title="bashrc.bash"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/bashrc.bash" class=bash>bashrc.bash</a></li>
    
    <li title="docker-compose.yml"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/docker-compose.yml" class=yml>docker-compose.yml</a></li>
    
    <li title="Dockerfile"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/Dockerfile" class=Dockerfile>Dockerfile</a></li>
    
    <li title="jupyter_notebook_config.py"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/jupyter_notebook_config.py" class=py>jupyter_notebook_config.py</a></li>
    
    <li title="Makefile"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/Makefile" class=Makefile>Makefile</a></li>
    
    <li title="nbdime-1-details.patch"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/nbdime-1-details.patch" class=patch>nbdime-1-details.patch</a></li>
    
    <li title="nbdime-2-toc.patch"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/nbdime-2-toc.patch" class=patch>nbdime-2-toc.patch</a></li>
    
    <li title="README.md"><a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/blob/master/docker/README.md" class=md>README.md</a></li>
    
  </ul>
</div>

<div class=blameview>
  <h2>
    nbdime-2-toc.patch
    <span>
      @<a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/commit/master/">master</a>
    </span>
  </h2>
  
    <table>
      <tbody>
        <tr>
          <td class="line-info">
            <pre>
<a href="/repo/YKCEDGkzhmuddtIoqoONJrtFLnJXnfugLtPufMWmH-nY6Jw%3D/commit/4d078e200d3ce7aab2a2623594a87cb3e0f4a9a8/">4d078e2</a>
&nbsp;
&nbsp;
&nbsp;
&nbsp;
&nbsp;
&nbsp;
&nbsp;
&nbsp;
&nbsp;
&nbsp;</pre>
          </td>
          <td class="code">
            
              <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><a href="#L-1"> 1</a>
<a href="#L-2"> 2</a>
<a href="#L-3"> 3</a>
<a href="#L-4"> 4</a>
<a href="#L-5"> 5</a>
<a href="#L-6"> 6</a>
<a href="#L-7"> 7</a>
<a href="#L-8"> 8</a>
<a href="#L-9"> 9</a>
<a href="#L-10">10</a>
<a href="#L-11">11</a></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span id="L-1"><a name="L-1"></a><span class=line><span class="gd">--- a/nbdime/diffing/notebooks.py</span>
</span></span><span id="L-2"><a name="L-2"></a><span class=line><span class="gi">+++ b/nbdime/diffing/notebooks.py</span>
</span></span><span id="L-3"><a name="L-3"></a><span class=line><span class="gu">@@ -553,7 +553,7 @@</span>
</span></span><span id="L-4"><a name="L-4"></a><span class=line>                     del notebook_differs[key]
</span></span><span id="L-5"><a name="L-5"></a><span class=line>             else:
</span></span><span id="L-6"><a name="L-6"></a><span class=line>                 notebook_differs[key] = diff_ignore_keys(
</span></span><span id="L-7"><a name="L-7"></a><span class=line><span class="gd">-                    inner_differ=diff, ignore_keys=[&#39;collapsed&#39;, &#39;autoscroll&#39;, &#39;deletable&#39;, &#39;editable&#39;])</span>
</span></span><span id="L-8"><a name="L-8"></a><span class=line><span class="gi">+                    inner_differ=diff, ignore_keys=[&#39;toc&#39;, &#39;collapsed&#39;, &#39;autoscroll&#39;, &#39;deletable&#39;, &#39;editable&#39;])</span>
</span></span><span id="L-9"><a name="L-9"></a><span class=line>     else:
</span></span><span id="L-10"><a name="L-10"></a><span class=line>         for key in metadata_keys:
</span></span><span id="L-11"><a name="L-11"></a><span class=line>             notebook_differs[key] = diff_ignore
</span></span></pre></div>
</td></tr></table>
            
          </td>
        </tr>
      </tbody>
    </table>
  
</div>

<script>
  highlight_linenos({
    linksSelector: '.highlighttable .linenos a',
    getLineFromAnchor: function(anchor) { return anchor.nextSibling }
  })
</script>


</div>



