|
5 | 5 | <head>
|
6 | 6 | <meta charset="utf-8" />
|
7 | 7 | <meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
8 |
| - <title>shotgun_model.shotgun_hierarchy_model — tk-framework-shotgunutils v5.10.0 documentation</title> |
| 8 | + <title>shotgun_model.shotgun_hierarchy_model — tk-framework-shotgunutils v5.10.1 documentation</title> |
9 | 9 | <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
|
10 | 10 | <link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" />
|
11 | 11 | <link rel="stylesheet" href="../../_static/graphviz.css" type="text/css" />
|
|
84 | 84 | text-decoration: underline; }
|
85 | 85 | </style>
|
86 | 86 |
|
87 |
| - <b>tk-framework-shotgunutils</b> v5.10.0.<br> |
| 87 | + <b>tk-framework-shotgunutils</b> v5.10.1.<br> |
88 | 88 |
|
89 | 89 | This documentation is part of the Flow Production Tracking.
|
90 | 90 |
|
@@ -152,7 +152,11 @@ <h1>Source code for shotgun_model.shotgun_hierarchy_model</h1><div class="highli
|
152 | 152 | <span class="kn">from</span> <span class="nn">.shotgun_query_model</span> <span class="kn">import</span> <span class="n">ShotgunQueryModel</span>
|
153 | 153 | <span class="kn">from</span> <span class="nn">.data_handler_nav</span> <span class="kn">import</span> <span class="n">ShotgunNavDataHandler</span>
|
154 | 154 | <span class="kn">from</span> <span class="nn">.util</span> <span class="kn">import</span> <span class="n">sanitize_for_qt_model</span>
|
155 |
| -<span class="kn">from</span> <span class="nn">tank_vendor</span> <span class="kn">import</span> <span class="n">six</span> |
| 155 | + |
| 156 | +<span class="k">try</span><span class="p">:</span> |
| 157 | + <span class="kn">from</span> <span class="nn">tank_vendor</span> <span class="kn">import</span> <span class="n">sgutils</span> |
| 158 | +<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span> |
| 159 | + <span class="kn">from</span> <span class="nn">tank_vendor</span> <span class="kn">import</span> <span class="n">six</span> <span class="k">as</span> <span class="n">sgutils</span> |
156 | 160 |
|
157 | 161 | <span class="n">logger</span> <span class="o">=</span> <span class="n">sgtk</span><span class="o">.</span><span class="n">platform</span><span class="o">.</span><span class="n">get_logger</span><span class="p">(</span><span class="vm">__name__</span><span class="p">)</span>
|
158 | 162 |
|
@@ -734,26 +738,26 @@ <h1>Source code for shotgun_model.shotgun_hierarchy_model</h1><div class="highli
|
734 | 738 | <span class="c1"># even though the navigation path provides a nice organizational</span>
|
735 | 739 | <span class="c1"># structure for caching, it can get long. to avoid MAX_PATH issues on</span>
|
736 | 740 | <span class="c1"># windows, just hash it</span>
|
737 |
| - <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">six</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_path</span><span class="p">)))</span> |
| 741 | + <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">sgutils</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_path</span><span class="p">)))</span> |
738 | 742 |
|
739 | 743 | <span class="c1"># include the schema generation number for clients</span>
|
740 |
| - <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">six</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_schema_generation</span><span class="p">)))</span> |
| 744 | + <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">sgutils</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_schema_generation</span><span class="p">)))</span> |
741 | 745 |
|
742 | 746 | <span class="c1"># If this value changes over time (like between Qt4 and Qt5), we need to</span>
|
743 | 747 | <span class="c1"># assume our previous user roles are invalid since Qt might have taken</span>
|
744 | 748 | <span class="c1"># it over. If role's value is 32, don't add it to the hash so we don't</span>
|
745 | 749 | <span class="c1"># invalidate PySide/PyQt4 caches.</span>
|
746 | 750 | <span class="k">if</span> <span class="n">QtCore</span><span class="o">.</span><span class="n">Qt</span><span class="o">.</span><span class="n">UserRole</span> <span class="o">!=</span> <span class="mi">32</span><span class="p">:</span>
|
747 |
| - <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">six</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">QtCore</span><span class="o">.</span><span class="n">Qt</span><span class="o">.</span><span class="n">UserRole</span><span class="p">)))</span> |
| 751 | + <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">sgutils</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">QtCore</span><span class="o">.</span><span class="n">Qt</span><span class="o">.</span><span class="n">UserRole</span><span class="p">)))</span> |
748 | 752 |
|
749 | 753 | <span class="c1"># include the cache_seed for additional user control over external state</span>
|
750 |
| - <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">six</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">cache_seed</span><span class="p">)))</span> |
| 754 | + <span class="n">params_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">sgutils</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">cache_seed</span><span class="p">)))</span> |
751 | 755 |
|
752 | 756 | <span class="c1"># iterate through the sorted entity fields to ensure consistent order</span>
|
753 | 757 | <span class="k">for</span> <span class="p">(</span><span class="n">entity_type</span><span class="p">,</span> <span class="n">fields</span><span class="p">)</span> <span class="ow">in</span> <span class="nb">sorted</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_entity_fields</span><span class="o">.</span><span class="n">items</span><span class="p">()):</span>
|
754 | 758 | <span class="k">for</span> <span class="n">field</span> <span class="ow">in</span> <span class="n">fields</span><span class="p">:</span>
|
755 | 759 | <span class="n">entity_field_hash</span><span class="o">.</span><span class="n">update</span><span class="p">(</span>
|
756 |
| - <span class="n">six</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="s2">"</span><span class="si">%s</span><span class="s2">.</span><span class="si">%s</span><span class="s2">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">entity_type</span><span class="p">,</span> <span class="n">field</span><span class="p">))</span> |
| 760 | + <span class="n">sgutils</span><span class="o">.</span><span class="n">ensure_binary</span><span class="p">(</span><span class="s2">"</span><span class="si">%s</span><span class="s2">.</span><span class="si">%s</span><span class="s2">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">entity_type</span><span class="p">,</span> <span class="n">field</span><span class="p">))</span> |
757 | 761 | <span class="p">)</span>
|
758 | 762 |
|
759 | 763 | <span class="c1"># convert the seed entity field into a path segment.</span>
|
|
0 commit comments