From cf3881371a5c64d56f352cf09395f93072889a7c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 22 Aug 2011 09:29:33 +0000
Subject: [PATCH] pep8 edits
---
add_curve_ivygen.py | 3 +--
io_export_unreal_psk_psa.py | 2 +-
io_scene_x3d/export_x3d.py | 30 +++++++++++++-------------
light_field_tools/light_field_tools.py | 2 +-
modules/geometry_utils.py | 6 +++---
object_grease_scatter.py | 2 +-
6 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/add_curve_ivygen.py b/add_curve_ivygen.py
index 5d09d1109..3113fd8b7 100644
--- a/add_curve_ivygen.py
+++ b/add_curve_ivygen.py
@@ -605,7 +605,6 @@ class IvyGen(bpy.types.Operator):
return {'FINISHED'}
-
def draw(self, context):
layout = self.layout
row = layout.row()
@@ -695,4 +694,4 @@ def unregister():
if __name__ == "__main__":
- register()
\ No newline at end of file
+ register()
diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index 4363fc853..a49565ae5 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -1658,7 +1658,7 @@ def fs_callback(filename, context):
bmesh = False
bArmatureScale = True
bArmatureCenter = True
- if blender_armature[0] !=None:
+ if blender_armature[0] is not None:
if blender_armature[0].scale.x == 1 and blender_armature[0].scale.y == 1 and blender_armature[0].scale.z == 1:
#print("Okay")
bArmatureScale = True
diff --git a/io_scene_x3d/export_x3d.py b/io_scene_x3d/export_x3d.py
index 6f528ebb3..1b8863a34 100644
--- a/io_scene_x3d/export_x3d.py
+++ b/io_scene_x3d/export_x3d.py
@@ -96,8 +96,8 @@ def clean_def(str):
# no digit start
if str[0] in "1234567890+-":
str = "_" + str
- return str.translate({# control characters 0x0-0x1f
- # 0x00: "_",
+ return str.translate({ # control characters 0x0-0x1f
+ # 0x00: "_",
0x01: "_",
0x02: "_",
0x03: "_",
@@ -130,19 +130,19 @@ def clean_def(str):
0x1e: "_",
0x1f: "_",
- 0x7f: "_", # 127
-
- 0x20: "_", # space
- 0x22: "_", # "
- 0x27: "_", # '
- 0x23: "_", # #
- 0x2c: "_", # ,
- 0x2e: "_", # .
- 0x5b: "_", # [
- 0x5d: "_", # ]
- 0x5c: "_", # \
- 0x7b: "_", # {
- 0x7d: "_", # }
+ 0x7f: "_", # 127
+
+ 0x20: "_", # space
+ 0x22: "_", # "
+ 0x27: "_", # '
+ 0x23: "_", # #
+ 0x2c: "_", # ,
+ 0x2e: "_", # .
+ 0x5b: "_", # [
+ 0x5d: "_", # ]
+ 0x5c: "_", # \
+ 0x7b: "_", # {
+ 0x7d: "_", # }
})
diff --git a/light_field_tools/light_field_tools.py b/light_field_tools/light_field_tools.py
index 85b102988..2251591bd 100644
--- a/light_field_tools/light_field_tools.py
+++ b/light_field_tools/light_field_tools.py
@@ -336,7 +336,7 @@ class OBJECT_OT_create_lightfield_basemesh(bpy.types.Operator):
scene.objects.link(nobj)
nobj.select = True
- if scene.objects.active == None or scene.objects.active.mode == 'OBJECT':
+ if scene.objects.active is None or scene.objects.active.mode == 'OBJECT':
scene.objects.active = nobj
diff --git a/modules/geometry_utils.py b/modules/geometry_utils.py
index 8fd0e00ea..413c24b80 100644
--- a/modules/geometry_utils.py
+++ b/modules/geometry_utils.py
@@ -136,7 +136,7 @@ class G3:
def closestP2CylinderAxis(cls, p, fv):
n = G3.ThreePnormal(fv)
c = G3.circumCenter(fv)
- if(c==None):
+ if c is None:
return None
return G3.closestP2L(p, c, c+n)
@@ -163,7 +163,7 @@ class G3:
#print ("G3.closestP2Sphere")
try:
c = G3.centerOfSphere(fv)
- if c==None:
+ if c is None:
return None
pc = p-c
if pc.length == 0:
@@ -178,7 +178,7 @@ class G3:
def closestP2Cylinder(cls, p, fv):
#print ("G3.closestP2Sphere")
c = G3.closestP2CylinderAxis(p, fv)
- if c==None:
+ if c is None:
return None
r = (fv[0] - G3.centerOfSphere(fv)).length
pc = p-c
diff --git a/object_grease_scatter.py b/object_grease_scatter.py
index 01a2afd35..7bacbefd1 100644
--- a/object_grease_scatter.py
+++ b/object_grease_scatter.py
@@ -375,7 +375,7 @@ class Scatter(bpy.types.Operator):
)
# XXX, should not be a string - TODO, add a way for scritps to select ID's
group = StringProperty(
- name="Group",
+ name="Group",
description=("Group name to use for object placement, "
"defaults to object name when that matches a group"))
--
GitLab