From f77e8943cbbfd1aef0956f562ad0bc6a6e6abb17 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 31 Dec 2011 06:10:22 +0000
Subject: [PATCH] remove redundant newline escaping
---
render_copy_settings/__init__.py | 58 +++++++-------------------------
render_copy_settings/operator.py | 10 +++---
render_copy_settings/panel.py | 2 +-
3 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/render_copy_settings/__init__.py b/render_copy_settings/__init__.py
index bf433b35d..c0aebc858 100644
--- a/render_copy_settings/__init__.py
+++ b/render_copy_settings/__init__.py
@@ -18,41 +18,6 @@
# <pep8 compliant>
-# ##### CHANGELOG #####
-#
-# 0.0.1
-# Initial release.
-#
-# 0.0.2
-# Updates to follow Blender API:
-# * bl_addon_info renamed in bl_info!
-# * adding bpy.utils.(un)register_module calls.
-# Also, in standard import, using “from . import …” now.
-#
-# 0.1.0
-# Renamed in “Render Copy Settings”.
-# Huge changes:
-# * It is now possible to individually copy each render setting.
-# * It is now possible to individually select each affected scene, and
-# then filter them out even further with a regex.
-#
-# 0.1.1
-# Minor changes:
-# * PEP8 compliant.
-# * Moved to contrib…
-#
-# 0.1.2
-# Minor changes:
-# * Updated accordingly to the changes in enhanced ui_template_list
-# proposal.
-#
-# 0.1.3
-# Minor changes:
-# * Fixed a small bug that was disabling the whole UI when entering a
-# filtering regex matching no scene.
-#
-# ##### END OF CHANGELOG #####
-
bl_info = {
"name": "Copy Settings",
"author": "Bastien Montagne",
@@ -60,11 +25,11 @@ bl_info = {
"blender": (2, 6, 1),
"api": 42648,
"location": "Render buttons (Properties window)",
- "description": "Allows to copy a selection of render settings from " \
+ "description": "Allows to copy a selection of render settings from "
"current scene to others.",
- "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/" \
+ "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"
"Scripts/Render/Copy Settings",
- "tracker_url": "http://projects.blender.org/tracker/index.php?" \
+ "tracker_url": "http://projects.blender.org/tracker/index.php?"
"func=detail&aid=25832",
"category": "Render"}
@@ -79,8 +44,11 @@ else:
import bpy
-from bpy.props import StringProperty, BoolProperty, \
- IntProperty, CollectionProperty
+from bpy.props import (StringProperty,
+ BoolProperty,
+ IntProperty,
+ CollectionProperty,
+ PointerProperty)
###############################################################################
@@ -112,8 +80,8 @@ class RenderCopySettings(bpy.types.PropertyGroup):
# It should only contain one element for each render setting.
affected_settings = CollectionProperty(type=RenderCopySettingsSetting,
name="Affected Settings",
- description="The list of all " \
- "available render " \
+ description="The list of all "
+ "available render "
"settings")
# XXX Unused, but needed for template_list…
aff_sett_idx = IntProperty()
@@ -122,13 +90,13 @@ class RenderCopySettings(bpy.types.PropertyGroup):
# It should only contain one element for each scene.
allowed_scenes = CollectionProperty(type=RenderCopySettingsScene,
name="Allowed Scenes",
- description="The list all scenes " \
+ description="The list all scenes "
"in the file")
# XXX Unused, but needed for template_list…
allw_scenes_idx = IntProperty()
filter_scene = StringProperty(name="Filter Scene",
- description="Regex to only affect scenes " \
+ description="Regex to only affect scenes "
"which name matches it",
default="")
@@ -139,7 +107,7 @@ def register():
bpy.utils.register_class(RenderCopySettingsSetting)
bpy.utils.register_class(RenderCopySettings)
bpy.types.Scene.render_copy_settings = \
- bpy.props.PointerProperty(type=RenderCopySettings)
+ PointerProperty(type=RenderCopySettings)
bpy.utils.register_module(__name__)
diff --git a/render_copy_settings/operator.py b/render_copy_settings/operator.py
index 1d13fbbef..d503fffce 100644
--- a/render_copy_settings/operator.py
+++ b/render_copy_settings/operator.py
@@ -94,12 +94,12 @@ class RenderCopySettingsPrepare(bpy.types.Operator):
try:
regex = re.compile(cp_sett.filter_scene)
except Exception as e:
- self.report('ERROR_INVALID_INPUT', "The filter-scene " \
+ self.report('ERROR_INVALID_INPUT', "The filter-scene "
"regex did not compile:\n (%s)." % str(e))
return {'CANCELLED'}
except:
regex = None
- self.report('WARNING', "Unable to import the re module. " \
+ self.report('WARNING', "Unable to import the re module. "
"Regex scene filtering will be disabled!")
scenes = set()
for scene in bpy.data.scenes:
@@ -166,7 +166,7 @@ class RenderCopySettingsPreset(bpy.types.Operator):
def do_copy(context, affected_settings, allowed_scenes):
# Stores render settings from current scene.
- p = {sett: getattr(context.scene.render, sett) \
+ p = {sett: getattr(context.scene.render, sett)
for sett in affected_settings}
# put it in all other (valid) scenes’ render settings!
for scene in bpy.data.scenes:
@@ -192,9 +192,9 @@ class RenderCopySettings(bpy.types.Operator):
def execute(self, context):
regex = None
cp_sett = context.scene.render_copy_settings
- affected_settings = {sett.strid for sett in cp_sett.affected_settings \
+ affected_settings = {sett.strid for sett in cp_sett.affected_settings
if sett.copy}
- allowed_scenes = {sce.name for sce in cp_sett.allowed_scenes \
+ allowed_scenes = {sce.name for sce in cp_sett.allowed_scenes
if sce.allowed}
do_copy(context, affected_settings=affected_settings,
allowed_scenes=allowed_scenes)
diff --git a/render_copy_settings/panel.py b/render_copy_settings/panel.py
index d187fe07b..3c9701700 100644
--- a/render_copy_settings/panel.py
+++ b/render_copy_settings/panel.py
@@ -48,7 +48,7 @@ class RENDER_PT_copy_settings(bpy.types.Panel):
prop_list="template_list_controls", rows=6)
col = split.column()
- all_set = {sett.strid for sett in cp_sett.affected_settings \
+ all_set = {sett.strid for sett in cp_sett.affected_settings
if sett.copy}
for p in presets.presets:
label = ""
--
GitLab