Commit 0103562a authored by Aron Helser's avatar Aron Helser
Browse files

Web: bring in vtkWeb changes, address review

Remove the use of six.py, since it's easily done.
Be a bit more explicit about how to update VTK in docs.
parent 7a3e9f57
......@@ -462,8 +462,18 @@ Contribute VTK Changes
If you have any VTK changes, then you are required to get your changes
incorporated into VTK using [VTK's development workflow][]. Once your VTK topic has
been approved and merged into VTK, add your VTK topic head (or the latest VTK
origin/master which includes your VTK topic head) to commit in a
[ParaView topic](#create-a-topic) and follow the process documented earlier.
been approved and merged into VTK, then:
1. Create a [ParaView topic](#create-a-topic) if you haven't already.
2. Add your VTK topic head (or the latest VTK
origin/master which includes your VTK topic head).
$ cd VTK
$ git checkout master
$ cd ..
$ git add VTK
$ git commit
3. Follow the merge process documented earlier.
[VTK's development workflow]: https://gitlab.kitware.com/vtk/vtk/tree/master/Documentation/dev/git
Subproject commit d2903559832f4b10a1a9dc4d240346cd6a113cfe
Subproject commit 2cfb366317fbdbb4eca39a8b6dd5f3a48cc56839
......@@ -19,9 +19,9 @@ from vtk.vtkPVServerManagerCore import *
# vtkSMPVRepresentationProxy
from vtk.vtkPVServerManagerRendering import *
import six
if six.PY3:
if sys.version_info >= (3,):
xrange = range
PY3 = true
# =============================================================================
# Pipeline management
......@@ -317,7 +317,7 @@ def updateProxyProperties(proxy, properties):
def removeUnicode(value):
# python 3 is using str everywhere already.
if six.PY3: return value
if PY3: return value
if type(value) == unicode:
return str(value)
if type(value) == list:
......
......@@ -42,9 +42,9 @@ from vtk.vtkPVServerManagerCore import *
# vtkDataObject
from vtk.vtkCommonDataModel import *
import six
if six.PY3:
if sys.version_info >= (3,):
xrange = range
# =============================================================================
# Helper methods
# =============================================================================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment