[python] removed trailing semicolons

pxr/base/lib/tf/__init__.py

@@ -91,7 +91,8 @@ def someCode():
 class ErrorException(RuntimeError):
     def __init__(self, *args):
         RuntimeError.__init__(self, *args)
-        self.__TfException = True;
+        self.__TfException = True
+
     def __str__(self):
         return '\n\t' + '\n\t'.join([str(e) for e in self])
 __SetErrorExceptionClass(ErrorException)

pxr/base/lib/tf/testenv/testTf_PyPtrHolder.py

@@ -77,7 +77,7 @@ def err(msg):
     p = q.GetInstance()
     assert p == q, err("weak equality testing")
     assert not (p != q), err("weak non-equality testing")
-    q.KillInstance();
+    q.KillInstance()
     assert TestWeakObject.GetNumInstances() == 0, err("weak sharing")
     assert q.expired and p.expired, err("weak ptr expiry")
     try:

pxr/usd/lib/ar/testenv/testArDefaultResolver.py

@@ -149,7 +149,8 @@ def test_ResolverContext(self):
                                                     "/test/path/2"]))
         self.assertEqual(eval(repr(context)), context)
 
-        self.assertNotEqual(emptyContext, context);
+        self.assertNotEqual(emptyContext, context)
+
 
 if __name__ == '__main__':
     unittest.main()

pxr/usd/lib/pcp/testenv/testPcpOwner.py

@@ -93,23 +93,23 @@ def TestResolve(expectedSourceLayer):
 
         # Make the owner of the "owned" layer the same as the owner denoted by
         # the session layer. Now the "owned" layer's opinion should win.
-        self.userLayer.owner = self.sessionLayer.sessionOwner;
+        self.userLayer.owner = self.sessionLayer.sessionOwner
         TestResolve(self.userLayer)
 
         # If we change the session's owner, the "stronger" layer should win
         # once again. Setting it back should produce the previous result.
         self.sessionLayer.sessionOwner = "_bogus_user_"
         TestResolve(self.strongerLayer)
 
-        self.sessionLayer.sessionOwner = self.userLayer.owner;
+        self.sessionLayer.sessionOwner = self.userLayer.owner
         TestResolve(self.userLayer)
 
         # Similarly, changing the owner of a sublayer should also let the
         # "stronger" layer win once again.
         self.userLayer.owner = "_other_bogus_user_"
         TestResolve(self.strongerLayer)
 
-        self.userLayer.owner = self.sessionLayer.sessionOwner;
+        self.userLayer.owner = self.sessionLayer.sessionOwner
         TestResolve(self.userLayer)
 
         # Changing both the session owner and the layer's owner to another

pxr/usd/lib/sdf/__init__.py

@@ -44,7 +44,7 @@ def Find(layerFileName, scenePath=None):
 # Test utilities
 def _PathElemsToPrefixes(absolute, elements):
     if absolute:
-        string = "/";
+        string = "/"
     else:
         string = ""
 

pxr/usd/lib/usd/testenv/testUsdBugs.py

@@ -91,7 +91,7 @@ def test_155392(self):
 
         y = Sdf.CreatePrimInLayer(l1, '/x/y')
         y.specifier = Sdf.SpecifierDef
-        y.payload = Sdf.Payload(l2.identifier, '/ypay');
+        y.payload = Sdf.Payload(l2.identifier, '/ypay')
 
         s = Usd.Stage.Open(l1, Usd.Stage.LoadAll)
 

pxr/usd/lib/usd/testenv/testUsdCreateProperties.py

@@ -116,7 +116,7 @@ def test_ImplicitSpecCreation(self):
             weakLayer = _CreateLayer("SpecCreationTest_weak."+fmt)
             strongLayer = _CreateLayer("SpecCreationTest_strong."+fmt)
 
-            stage = Usd.Stage.Open(weakLayer.identifier);
+            stage = Usd.Stage.Open(weakLayer.identifier)
             p = stage.OverridePrim("/Parent/Nested/Child")
             stage.OverridePrim("/Parent/Sibling1")
             stage.OverridePrim("/Parent/Sibling2")
@@ -142,7 +142,7 @@ def test_ImplicitSpecCreation(self):
             rel.SetCustom(False)
             assert not rel.IsCustom()
 
-            stage = Usd.Stage.Open(strongLayer.identifier);
+            stage = Usd.Stage.Open(strongLayer.identifier)
             p = stage.OverridePrim("/Parent")
             p.GetReferences().AddReference(Sdf.Reference(weakLayer.identifier, "/Parent"))
 
@@ -225,7 +225,7 @@ def test_IsDefined(self):
             weakLayer = _CreateLayer("IsDefined_weak."+fmt)
             strongLayer = _CreateLayer("IsDefined_strong."+fmt)
 
-            stage = Usd.Stage.Open(weakLayer.identifier);
+            stage = Usd.Stage.Open(weakLayer.identifier)
             p = stage.OverridePrim("/Parent")
 
             assert not p.GetAttribute("attr1").IsDefined()
@@ -238,7 +238,7 @@ def test_IsDefined(self):
             assert p.GetProperty("attr1") and p.GetProperty("attr1").IsDefined()
             assert p.GetProperty("attr1") == p.GetAttribute("attr1")
 
-            stage = Usd.Stage.Open(strongLayer.identifier);
+            stage = Usd.Stage.Open(strongLayer.identifier)
             p = stage.OverridePrim("/Parent")
             p.GetReferences().AddReference(Sdf.Reference(weakLayer.identifier, "/Parent"))
             assert p.GetAttribute("attr1").IsDefined()

pxr/usd/lib/usd/testenv/testUsdEditTarget.py

@@ -189,7 +189,7 @@ def OpenLayer(name):
 
         # Try authoring to sublayers using context object.
         with Usd.EditContext(stage, subLayer2):
-            prim.GetAttribute('sub2Color').Set(Gf.Vec3d(3,4,5));
+            prim.GetAttribute('sub2Color').Set(Gf.Vec3d(3,4,5))
             assert prim.GetAttribute('sub2Color').Get() == Gf.Vec3d(3,4,5)
             assert not rootLayer.GetAttributeAtPath('/Sarah.sub2Color')
             assert (subLayer2.GetAttributeAtPath('/Sarah.sub2Color').default ==
@@ -207,7 +207,7 @@ def OpenLayer(name):
         with Usd.EditContext(stage, sessionLayer):
             assert stage.GetEditTarget() == sessionLayer
             assert not sessionLayer.GetAttributeAtPath('/Sarah.color')
-            prim.GetAttribute('color').Set(Gf.Vec3d(9,9,9));
+            prim.GetAttribute('color').Set(Gf.Vec3d(9,9,9))
             assert prim.GetAttribute('color').Get() == Gf.Vec3d(9,9,9)
             assert (sessionLayer.GetAttributeAtPath('/Sarah.color').default ==
                     Gf.Vec3d(9,9,9))

pxr/usd/lib/usd/testenv/testUsdMetadata.py

@@ -229,22 +229,22 @@ def test_Documentation(self):
 
             for obj in [foo, attr, rel]:
                 self.assertEqual(obj.GetDocumentation(), "")
-                self.assertFalse(obj.HasAuthoredDocumentation());
+                self.assertFalse(obj.HasAuthoredDocumentation())
                 self.assertEqual(obj.GetMetadata("documentation"), None)
 
                 self.assertEqual(obj.SetDocumentation("foo"), True)
                 self.assertEqual(obj.GetDocumentation(), "foo")
-                self.assertTrue(obj.HasAuthoredDocumentation());
+                self.assertTrue(obj.HasAuthoredDocumentation())
                 self.assertEqual(obj.GetMetadata("documentation"), "foo")
 
                 self.assertEqual(obj.SetDocumentation(""), True)
                 self.assertEqual(obj.GetDocumentation(), "")
-                self.assertTrue(obj.HasAuthoredDocumentation());
+                self.assertTrue(obj.HasAuthoredDocumentation())
                 self.assertEqual(obj.GetMetadata("documentation"), "")
 
                 self.assertEqual(obj.ClearDocumentation(), True)
                 self.assertEqual(obj.GetDocumentation(), "")
-                self.assertFalse(obj.HasAuthoredDocumentation());
+                self.assertFalse(obj.HasAuthoredDocumentation())
                 self.assertEqual(obj.GetMetadata("documentation"), None)
 
     def test_DisplayName(self):
@@ -258,22 +258,22 @@ def test_DisplayName(self):
 
             for prop in [attr, rel]:
                 self.assertEqual(prop.GetDisplayName(), "")
-                self.assertFalse(prop.HasAuthoredDisplayName());
+                self.assertFalse(prop.HasAuthoredDisplayName())
                 self.assertEqual(prop.GetMetadata("displayName"), None)
 
                 self.assertEqual(prop.SetDisplayName("foo"), True)
                 self.assertEqual(prop.GetDisplayName(), "foo")
-                self.assertTrue(prop.HasAuthoredDisplayName());
+                self.assertTrue(prop.HasAuthoredDisplayName())
                 self.assertEqual(prop.GetMetadata("displayName"), "foo")
 
                 self.assertEqual(prop.SetDisplayName(""), True)
                 self.assertEqual(prop.GetDisplayName(), "")
-                self.assertTrue(prop.HasAuthoredDisplayName());
+                self.assertTrue(prop.HasAuthoredDisplayName())
                 self.assertEqual(prop.GetMetadata("displayName"), "")
 
                 self.assertEqual(prop.ClearDisplayName(), True)
                 self.assertEqual(prop.GetDisplayName(), "")
-                self.assertFalse(prop.HasAuthoredDisplayName());
+                self.assertFalse(prop.HasAuthoredDisplayName())
                 self.assertEqual(prop.GetMetadata("displayName"), None)
 
     def test_DisplayGroup(self):
@@ -287,17 +287,17 @@ def test_DisplayGroup(self):
 
             for prop in [attr, rel]:
                 self.assertEqual(prop.GetDisplayGroup(), "")
-                self.assertFalse(prop.HasAuthoredDisplayGroup());
+                self.assertFalse(prop.HasAuthoredDisplayGroup())
                 self.assertEqual(prop.GetMetadata("displayGroup"), None)
 
                 self.assertEqual(prop.SetDisplayGroup("foo"), True)
                 self.assertEqual(prop.GetDisplayGroup(), "foo")
-                self.assertTrue(prop.HasAuthoredDisplayGroup());
+                self.assertTrue(prop.HasAuthoredDisplayGroup())
                 self.assertEqual(prop.GetMetadata("displayGroup"), "foo")
 
                 self.assertEqual(prop.SetDisplayGroup(""), True)
                 self.assertEqual(prop.GetDisplayGroup(), "")
-                self.assertTrue(prop.HasAuthoredDisplayGroup());
+                self.assertTrue(prop.HasAuthoredDisplayGroup())
                 self.assertEqual(prop.GetMetadata("displayGroup"), "")
 
                 self.assertEqual(prop.SetNestedDisplayGroups(
@@ -309,7 +309,7 @@ def test_DisplayGroup(self):
 
                 self.assertEqual(prop.ClearDisplayGroup(), True)
                 self.assertEqual(prop.GetDisplayGroup(), "")
-                self.assertFalse(prop.HasAuthoredDisplayGroup());
+                self.assertFalse(prop.HasAuthoredDisplayGroup())
                 self.assertEqual(prop.GetMetadata("displayGroup"), None)
 
     def test_BasicCustomData(self):

pxr/usd/lib/usd/testenv/testUsdNotices.py

@@ -149,7 +149,7 @@ def ObjectsChangedNoticeForAttributes(self):
         for fmt in allFormats:
             self._ResetCounters()
             s = Usd.Stage.CreateInMemory('ObjectsChangedNoticeForProps.'+fmt)
-            prim = s.DefinePrim("/Foo");
+            prim = s.DefinePrim("/Foo")
 
             def OnAttributeCreation(notice, stage):
                 self.assertEqual(notice.GetStage(), stage)
@@ -185,7 +185,7 @@ def ObjectsChangedNoticeForRelationships(self):
         for fmt in allFormats:
             self._ResetCounters()
             s = Usd.Stage.CreateInMemory('ObjectsChangedNoticeForRels.'+fmt)
-            prim = s.DefinePrim("/Foo");
+            prim = s.DefinePrim("/Foo")
 
             def OnRelationshipCreation(notice, stage):
                 self.assertEqual(notice.GetStage(), stage)

pxr/usd/lib/usd/testenv/testUsdPayloads.py

@@ -127,7 +127,7 @@ def __init__(self, fmt):
 
         super(InstancedAndPayloadedScene, self).__init__(fmt)
 
-        sad = self.stage.GetPrimAtPath("/Sad");
+        sad = self.stage.GetPrimAtPath("/Sad")
 
         sad1 = self.stage.DefinePrim("/Sad_1", "Scope")
         sad1.SetPayload(Sdf.Payload(self.payload1.GetRootLayer().identifier, 

pxr/usd/lib/usdGeom/testenv/testUsdGeomBBoxCache.py

@@ -35,7 +35,7 @@ def AssertBBoxesClose(cachedBox, directBox, msg):
     assert Gf.IsClose(cachedRange.max, directRange.max, 1e-5), msg
 
 def TestAtCurTime(stage, bboxCache):
-    p = stage.GetPrimAtPath("/parent/primWithLocalXform");
+    p = stage.GetPrimAtPath("/parent/primWithLocalXform")
     assert bboxCache.ComputeWorldBound(p) == bboxCache.ComputeWorldBound(p)
     bboxCache.SetIncludedPurposes([UsdGeom.Tokens.default_])
     print

pxr/usd/lib/usdGeom/testenv/testUsdGeomCamera.py

@@ -94,7 +94,7 @@ def test_SetFromCamera(self):
         # test fall-back values
         self._CheckValues(camera, usdCamera, 1.0)
         self.assertEqual(usdCameraProj.GetResolveInfo().GetSource(),
-                         Usd.ResolveInfoSourceFallback);
+                         Usd.ResolveInfoSourceFallback)
 
         camera.transform = (
             Gf.Matrix4d().SetRotate(Gf.Rotation(Gf.Vec3d(1.0,2.0,3.0),10.0)) *

pxr/usd/lib/usdGeom/testenv/testUsdGeomSchemata.py

@@ -594,7 +594,7 @@ def test_ComputeExtent(self):
     def test_TypeUsage(self):
         # Perform Type-Ness Checking for ComputeExtent
         pointsAsList = [(0, 0, 0), (1, 1, 1), (2, 2, 2)]
-        pointsAsVec3fArr = Vt.Vec3fArray(pointsAsList);
+        pointsAsVec3fArr = Vt.Vec3fArray(pointsAsList)
 
         comp = UsdGeom.PointBased.ComputeExtent
         expectedExtent = comp(pointsAsVec3fArr)

pxr/usd/lib/usdGeom/testenv/testUsdGeomXformable.py

@@ -43,7 +43,7 @@ def test_TranslateOp(self):
     def test_ScaleOp(self):
         s = Usd.Stage.CreateInMemory()
         x = UsdGeom.Xform.Define(s, '/World')
-        scaleVec = Gf.Vec3f(1., 2., 3.);
+        scaleVec = Gf.Vec3f(1., 2., 3.)
         x.AddScaleOp().Set(scaleVec)
         xform = x.GetLocalTransformation(Usd.TimeCode.Default())
         self._AssertCloseXf(xform, Gf.Matrix4d(1.0).SetScale(Gf.Vec3d(scaleVec)))
@@ -133,9 +133,9 @@ def test_VectorRotateOps(self):
                     Vt.TokenArray(('xformOp:rotateXYZ', )))
 
         xyz2 = UsdGeom.Xform.Define(s, '/XYZ2')
-        xyz2.AddRotateZOp().Set(rot[2]);
-        xyz2.AddRotateYOp().Set(rot[1]);
-        xyz2.AddRotateXOp().Set(rot[0]);
+        xyz2.AddRotateZOp().Set(rot[2])
+        xyz2.AddRotateYOp().Set(rot[1])
+        xyz2.AddRotateXOp().Set(rot[0])
         xformXYZ2 = xyz2.GetLocalTransformation(Usd.TimeCode.Default())
         self.assertEqual(xyz2.GetXformOpOrderAttr().Get(), 
                     Vt.TokenArray(('xformOp:rotateZ', 'xformOp:rotateY', 
@@ -150,9 +150,9 @@ def test_VectorRotateOps(self):
                     Vt.TokenArray(('xformOp:rotateXZY', )))
 
         xzy2 = UsdGeom.Xform.Define(s, '/XZY2')
-        xzy2.AddRotateYOp().Set(rot[1]);
-        xzy2.AddRotateZOp().Set(rot[2]);
-        xzy2.AddRotateXOp().Set(rot[0]);
+        xzy2.AddRotateYOp().Set(rot[1])
+        xzy2.AddRotateZOp().Set(rot[2])
+        xzy2.AddRotateXOp().Set(rot[0])
         xformXZY2 = xzy2.GetLocalTransformation(Usd.TimeCode.Default())
         self.assertEqual(xzy2.GetXformOpOrderAttr().Get(), 
                     Vt.TokenArray(('xformOp:rotateY', 'xformOp:rotateZ', 
@@ -167,9 +167,9 @@ def test_VectorRotateOps(self):
                     Vt.TokenArray(('xformOp:rotateYXZ', )))
 
         yxz2 = UsdGeom.Xform.Define(s, '/YXZ2')
-        yxz2.AddRotateZOp().Set(rot[2]);
-        yxz2.AddRotateXOp().Set(rot[0]);
-        yxz2.AddRotateYOp().Set(rot[1]);
+        yxz2.AddRotateZOp().Set(rot[2])
+        yxz2.AddRotateXOp().Set(rot[0])
+        yxz2.AddRotateYOp().Set(rot[1])
         xformYXZ2 = yxz2.GetLocalTransformation(Usd.TimeCode.Default())
         self.assertEqual(yxz2.GetXformOpOrderAttr().Get(), 
                     Vt.TokenArray(('xformOp:rotateZ', 'xformOp:rotateX', 
@@ -185,9 +185,9 @@ def test_VectorRotateOps(self):
                     Vt.TokenArray(('xformOp:rotateYZX', )))
 
         yzx2 = UsdGeom.Xform.Define(s, '/YZX2')
-        yzx2.AddRotateXOp().Set(rot[0]);
-        yzx2.AddRotateZOp().Set(rot[2]);
-        yzx2.AddRotateYOp().Set(rot[1]);
+        yzx2.AddRotateXOp().Set(rot[0])
+        yzx2.AddRotateZOp().Set(rot[2])
+        yzx2.AddRotateYOp().Set(rot[1])
         xformYZX2 = yzx2.GetLocalTransformation(Usd.TimeCode.Default())
         self.assertEqual(yzx2.GetXformOpOrderAttr().Get(), 
                     Vt.TokenArray(('xformOp:rotateX', 'xformOp:rotateZ', 
@@ -203,9 +203,9 @@ def test_VectorRotateOps(self):
                     Vt.TokenArray(('xformOp:rotateZXY', )))
 
         zxy2 = UsdGeom.Xform.Define(s, '/ZXY2')
-        zxy2.AddRotateYOp().Set(rot[1]);
-        zxy2.AddRotateXOp().Set(rot[0]);
-        zxy2.AddRotateZOp().Set(rot[2]);
+        zxy2.AddRotateYOp().Set(rot[1])
+        zxy2.AddRotateXOp().Set(rot[0])
+        zxy2.AddRotateZOp().Set(rot[2])
         xformZXY2 = zxy2.GetLocalTransformation(Usd.TimeCode.Default())
         self.assertEqual(zxy2.GetXformOpOrderAttr().Get(), 
                     Vt.TokenArray(('xformOp:rotateY', 'xformOp:rotateX', 
@@ -221,9 +221,9 @@ def test_VectorRotateOps(self):
                     Vt.TokenArray(('xformOp:rotateZYX', )))
 
         zyx2 = UsdGeom.Xform.Define(s, '/ZYX2')
-        zyx2.AddRotateXOp().Set(rot[0]);
-        zyx2.AddRotateYOp().Set(rot[1]);
-        zyx2.AddRotateZOp().Set(rot[2]);
+        zyx2.AddRotateXOp().Set(rot[0])
+        zyx2.AddRotateYOp().Set(rot[1])
+        zyx2.AddRotateZOp().Set(rot[2])
         xformZYX2 = zyx2.GetLocalTransformation(Usd.TimeCode.Default())
         self.assertEqual(zyx2.GetXformOpOrderAttr().Get(), 
                     Vt.TokenArray(('xformOp:rotateX', 'xformOp:rotateY', 
@@ -488,16 +488,16 @@ def test_VaryingPrecisionOps(self):
 
         halfRotOp = x1.AddRotateXYZOp(precision=UsdGeom.XformOp.PrecisionHalf,
                                         opSuffix='Half')
-        self.assertEqual(halfRotOp.GetPrecision(), UsdGeom.XformOp.PrecisionHalf);
+        self.assertEqual(halfRotOp.GetPrecision(), UsdGeom.XformOp.PrecisionHalf)
         halfRotOp.Set(Gf.Vec3h(0.0, 0.0, 60.0))
 
         doubleRotOp = x1.AddRotateXYZOp(precision=UsdGeom.XformOp.PrecisionDouble,
                                         opSuffix='Double')
-        self.assertEqual(doubleRotOp.GetPrecision(), UsdGeom.XformOp.PrecisionDouble);
+        self.assertEqual(doubleRotOp.GetPrecision(), UsdGeom.XformOp.PrecisionDouble)
         doubleRotOp.Set(Gf.Vec3d(0.0, 45.123456789, 0.0))
 
         floatRotOp = x1.AddRotateXYZOp(opSuffix='Float')
-        self.assertEqual(floatRotOp.GetPrecision(), UsdGeom.XformOp.PrecisionFloat);
+        self.assertEqual(floatRotOp.GetPrecision(), UsdGeom.XformOp.PrecisionFloat)
         floatRotOp.Set(Gf.Vec3f(30.0, 0.0, 0.0))
 
         self.assertEqual(x1.GetXformOpOrderAttr().Get(),
@@ -609,10 +609,10 @@ def test_GetTimeSamples(self):
         self.assertEqual([], scaleOp.GetTimeSamples())
 
         xlate1 = Gf.Vec3d(10., 20., 30.)
-        scale2 = Gf.Vec3f(1., 2., 3.);
+        scale2 = Gf.Vec3f(1., 2., 3.)
 
         xlate3 = Gf.Vec3d(10., 20., 30.)
-        scale4 = Gf.Vec3f(1., 2., 3.);
+        scale4 = Gf.Vec3f(1., 2., 3.)
 
         self.assertEqual(x.GetTimeSamples(), [])
 

pxr/usd/lib/usdShade/testenv/testUsdShadeShaders.py

@@ -143,7 +143,7 @@ def test_InputOutputConnections(self):
         # Test boundaries of parameter type-testing when connecting
         print "Test Typed Input Connections"
 
-        colInput = pale.CreateInput("col1", Sdf.ValueTypeNames.Color3f);
+        colInput = pale.CreateInput("col1", Sdf.ValueTypeNames.Color3f)
         self.assertTrue(colInput)
         self.assertTrue(colInput.ConnectToSource(whiterPale, "colorOut"))
         outputAttr = whiterPale.GetPrim().GetAttribute("outputs:colorOut")