sqlobject
diff --git a/‎devel/_modules/_pytest/_code/code.html
Lines changed: 16 additions & 6 deletions b/‎devel/_modules/_pytest/_code/code.html
Lines changed: 16 additions & 6 deletions
@@ -72,6 +72,7 @@ <h1>Source code for _pytest._code.code</h1><div class="highlight"><pre>
 <span></span><span class="kn">import</span> <span class="nn">sys</span>
 <span class="kn">from</span> <span class="nn">inspect</span> <span class="k">import</span> <span class="n">CO_VARARGS</span><span class="p">,</span> <span class="n">CO_VARKEYWORDS</span>
 <span class="kn">import</span> <span class="nn">re</span>
+<span class="kn">from</span> <span class="nn">weakref</span> <span class="k">import</span> <span class="n">ref</span>
 
 <span class="kn">import</span> <span class="nn">py</span>
 <span class="n">builtin_repr</span> <span class="o">=</span> <span class="nb">repr</span>
@@ -301,7 +302,7 @@ <h1>Source code for _pytest._code.code</h1><div class="highlight"><pre>
                 <span class="k">return</span> <span class="kc">False</span>
 
         <span class="k">if</span> <span class="n">py</span><span class="o">.</span><span class="n">builtin</span><span class="o">.</span><span class="n">callable</span><span class="p">(</span><span class="n">tbh</span><span class="p">):</span>
-            <span class="k">return</span> <span class="n">tbh</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_excinfo</span><span class="p">)</span>
+            <span class="k">return</span> <span class="n">tbh</span><span class="p">(</span><span class="kc">None</span> <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_excinfo</span> <span class="ow">is</span> <span class="kc">None</span> <span class="k">else</span> <span class="bp">self</span><span class="o">.</span><span class="n">_excinfo</span><span class="p">())</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="k">return</span> <span class="n">tbh</span>
 
@@ -413,6 +414,7 @@ <h1>Source code for _pytest._code.code</h1><div class="highlight"><pre>
             <span class="n">l</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">entry</span><span class="o">.</span><span class="n">frame</span><span class="o">.</span><span class="n">f_locals</span><span class="p">)</span>
         <span class="k">return</span> <span class="kc">None</span>
 
+
 <span class="n">co_equal</span> <span class="o">=</span> <span class="nb">compile</span><span class="p">(</span><span class="s1">&#39;__recursioncache_locals_1 == __recursioncache_locals_2&#39;</span><span class="p">,</span>
                    <span class="s1">&#39;?&#39;</span><span class="p">,</span> <span class="s1">&#39;eval&#39;</span><span class="p">)</span>
 
@@ -441,7 +443,7 @@ <h1>Source code for _pytest._code.code</h1><div class="highlight"><pre>
         <span class="c1">#: the exception type name</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">typename</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">type</span><span class="o">.</span><span class="n">__name__</span>
         <span class="c1">#: the exception traceback (_pytest._code.Traceback instance)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">traceback</span> <span class="o">=</span> <span class="n">_pytest</span><span class="o">.</span><span class="n">_code</span><span class="o">.</span><span class="n">Traceback</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">tb</span><span class="p">,</span> <span class="n">excinfo</span><span class="o">=</span><span class="bp">self</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">traceback</span> <span class="o">=</span> <span class="n">_pytest</span><span class="o">.</span><span class="n">_code</span><span class="o">.</span><span class="n">Traceback</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">tb</span><span class="p">,</span> <span class="n">excinfo</span><span class="o">=</span><span class="n">ref</span><span class="p">(</span><span class="bp">self</span><span class="p">))</span>
 
     <span class="k">def</span> <span class="nf">__repr__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="k">return</span> <span class="s2">&quot;&lt;ExceptionInfo </span><span class="si">%s</span><span class="s2"> tblen=</span><span class="si">%d</span><span class="s2">&gt;&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">typename</span><span class="p">,</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">traceback</span><span class="p">))</span>
@@ -694,16 +696,23 @@ <h1>Source code for _pytest._code.code</h1><div class="highlight"><pre>
             <span class="n">e</span> <span class="o">=</span> <span class="n">excinfo</span><span class="o">.</span><span class="n">value</span>
             <span class="n">descr</span> <span class="o">=</span> <span class="kc">None</span>
             <span class="k">while</span> <span class="n">e</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-                <span class="n">reprtraceback</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">repr_traceback</span><span class="p">(</span><span class="n">excinfo</span><span class="p">)</span>
-                <span class="n">reprcrash</span> <span class="o">=</span> <span class="n">excinfo</span><span class="o">.</span><span class="n">_getreprcrash</span><span class="p">()</span>
+                <span class="k">if</span> <span class="n">excinfo</span><span class="p">:</span>
+                    <span class="n">reprtraceback</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">repr_traceback</span><span class="p">(</span><span class="n">excinfo</span><span class="p">)</span>
+                    <span class="n">reprcrash</span> <span class="o">=</span> <span class="n">excinfo</span><span class="o">.</span><span class="n">_getreprcrash</span><span class="p">()</span>
+                <span class="k">else</span><span class="p">:</span>
+                    <span class="c1"># fallback to native repr if the exception doesn&#39;t have a traceback:</span>
+                    <span class="c1"># ExceptionInfo objects require a full traceback to work</span>
+                    <span class="n">reprtraceback</span> <span class="o">=</span> <span class="n">ReprTracebackNative</span><span class="p">(</span><span class="n">py</span><span class="o">.</span><span class="n">std</span><span class="o">.</span><span class="n">traceback</span><span class="o">.</span><span class="n">format_exception</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">e</span><span class="p">),</span> <span class="n">e</span><span class="p">,</span> <span class="kc">None</span><span class="p">))</span>
+                    <span class="n">reprcrash</span> <span class="o">=</span> <span class="kc">None</span>
+
                 <span class="n">repr_chain</span> <span class="o">+=</span> <span class="p">[(</span><span class="n">reprtraceback</span><span class="p">,</span> <span class="n">reprcrash</span><span class="p">,</span> <span class="n">descr</span><span class="p">)]</span>
                 <span class="k">if</span> <span class="n">e</span><span class="o">.</span><span class="n">__cause__</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
                     <span class="n">e</span> <span class="o">=</span> <span class="n">e</span><span class="o">.</span><span class="n">__cause__</span>
-                    <span class="n">excinfo</span> <span class="o">=</span> <span class="n">ExceptionInfo</span><span class="p">((</span><span class="nb">type</span><span class="p">(</span><span class="n">e</span><span class="p">),</span> <span class="n">e</span><span class="p">,</span> <span class="n">e</span><span class="o">.</span><span class="n">__traceback__</span><span class="p">))</span>
+                    <span class="n">excinfo</span> <span class="o">=</span> <span class="n">ExceptionInfo</span><span class="p">((</span><span class="nb">type</span><span class="p">(</span><span class="n">e</span><span class="p">),</span> <span class="n">e</span><span class="p">,</span> <span class="n">e</span><span class="o">.</span><span class="n">__traceback__</span><span class="p">))</span> <span class="k">if</span> <span class="n">e</span><span class="o">.</span><span class="n">__traceback__</span> <span class="k">else</span> <span class="kc">None</span>
                     <span class="n">descr</span> <span class="o">=</span> <span class="s1">&#39;The above exception was the direct cause of the following exception:&#39;</span>
                 <span class="k">elif</span> <span class="n">e</span><span class="o">.</span><span class="n">__context__</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
                     <span class="n">e</span> <span class="o">=</span> <span class="n">e</span><span class="o">.</span><span class="n">__context__</span>
-                    <span class="n">excinfo</span> <span class="o">=</span> <span class="n">ExceptionInfo</span><span class="p">((</span><span class="nb">type</span><span class="p">(</span><span class="n">e</span><span class="p">),</span> <span class="n">e</span><span class="p">,</span> <span class="n">e</span><span class="o">.</span><span class="n">__traceback__</span><span class="p">))</span>
+                    <span class="n">excinfo</span> <span class="o">=</span> <span class="n">ExceptionInfo</span><span class="p">((</span><span class="nb">type</span><span class="p">(</span><span class="n">e</span><span class="p">),</span> <span class="n">e</span><span class="p">,</span> <span class="n">e</span><span class="o">.</span><span class="n">__traceback__</span><span class="p">))</span> <span class="k">if</span> <span class="n">e</span><span class="o">.</span><span class="n">__traceback__</span> <span class="k">else</span> <span class="kc">None</span>
                     <span class="n">descr</span> <span class="o">=</span> <span class="s1">&#39;During handling of the above exception, another exception occurred:&#39;</span>
                 <span class="k">else</span><span class="p">:</span>
                     <span class="n">e</span> <span class="o">=</span> <span class="kc">None</span>
@@ -909,6 +918,7 @@ <h1>Source code for _pytest._code.code</h1><div class="highlight"><pre>
                     <span class="k">return</span> <span class="n">x</span>
         <span class="k">return</span> <span class="n">obj</span>
 
+
 <span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">version_info</span><span class="p">[:</span><span class="mi">2</span><span class="p">]</span> <span class="o">&gt;=</span> <span class="p">(</span><span class="mi">3</span><span class="p">,</span> <span class="mi">5</span><span class="p">):</span>  <span class="c1"># RecursionError introduced in 3.5</span>
     <span class="k">def</span> <span class="nf">is_recursion_error</span><span class="p">(</span><span class="n">excinfo</span><span class="p">):</span>
         <span class="k">return</span> <span class="n">excinfo</span><span class="o">.</span><span class="n">errisinstance</span><span class="p">(</span><span class="n">RecursionError</span><span class="p">)</span>  <span class="c1"># noqa</span>