[Bf-blender-cvs] [dd5acaa] master: Correct Python exceptions

[Campbell Barton]

Commit: dd5acaaa6c3fde6d7a0b161faa54696045780e7b
Author: Campbell Barton
Date:   Thu Aug 7 00:42:49 2014 +1000
Branches: master
https://developer.blender.org/rBdd5acaaa6c3fde6d7a0b161faa54696045780e7b

Correct Python exceptions

T35358 by Codemanx

===================================================================

M	release/scripts/modules/bpy_extras/mesh_utils.py
M	release/scripts/startup/bl_operators/uvcalc_lightmap.py
M	release/scripts/startup/bl_operators/uvcalc_smart_project.py

===================================================================

diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index 1e3e4c8..4293930 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -421,7 +421,6 @@ def ngon_tessellate(from_data, indices, fix_loops=True):
                     loop_segments.append(context_loop)
                 else:
                     if context_loop and context_loop[-1][1] == v[1]:
-                        #raise "as"
                         pass
                     else:
                         context_loop.append(v)
diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
index 6f54c05..8f618e0 100644
--- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py
+++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
@@ -470,9 +470,7 @@ def lightmap_uvpack(meshes,
                         pretty_faces.append(pf_parent)
 
                         w, h = pf_parent.width, pf_parent.height
-
-                        if w > h:
-                            raise "error"
+                        assert(w <= h)
 
                         if w == h:
                             even_dict.setdefault(w, []).append(pf_parent)
diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
index bf8b10a..aa8a174 100644
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@ -634,7 +634,7 @@ def packIslands(islandList):
     # print 'Box Packing Time:', time.time() - time1
 
     #if len(pa	ckedLs) != len(islandList):
-    #	raise "Error packed boxes differs from original length"
+    #    raise ValueError("Packed boxes differs from original length")
 
     #print '\tWriting Packed Data to faces'
 #XXX	Window.DrawProgressBar(0.8, "Writing Packed Data to faces")