diff options
-rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 2 | ||||
-rw-r--r-- | source/tests/batch_import.py | 2 | ||||
-rw-r--r-- | source/tests/bl_load_addons.py | 2 | ||||
-rw-r--r-- | source/tests/bl_load_py_modules.py | 2 | ||||
-rw-r--r-- | source/tests/bl_mesh_modifiers.py | 6 | ||||
-rw-r--r-- | source/tests/bl_mesh_validate.py | 4 | ||||
-rw-r--r-- | source/tests/pep8.py | 8 | ||||
-rw-r--r-- | source/tests/rna_info_dump.py | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 9ce3b313c37..c70dc285b20 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -848,7 +848,7 @@ static void rna_def_histogram(BlenderRNA *brna) prop = RNA_def_property(srna, "show_line", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", HISTO_FLAG_LINE); - RNA_def_property_ui_text(prop, "Show Line", "Display lines rather then filled shapes"); + RNA_def_property_ui_text(prop, "Show Line", "Display lines rather than filled shapes"); RNA_def_property_ui_icon(prop, ICON_IPO, 0); } diff --git a/source/tests/batch_import.py b/source/tests/batch_import.py index 177ab8ea0b0..77595bd091f 100644 --- a/source/tests/batch_import.py +++ b/source/tests/batch_import.py @@ -112,7 +112,7 @@ def batch_import(operator="", for i, f in enumerate(files): print(" %s(filepath=%r) # %d of %d" % (operator, f, i + start, len(files))) - # hack so loading the new file doesnt undo our loaded addons + # hack so loading the new file doesn't undo our loaded addons addon_utils.reset_all = lambda: None # XXX, hack bpy.ops.wm.read_factory_settings() diff --git a/source/tests/bl_load_addons.py b/source/tests/bl_load_addons.py index 1ed76a1bc02..83bdfb42c95 100644 --- a/source/tests/bl_load_addons.py +++ b/source/tests/bl_load_addons.py @@ -87,7 +87,7 @@ def reload_addons(do_reload=True, do_reverse=True): imp.reload(sys.modules[mod_name]) if do_reverse: - # in case order matters when it shouldnt + # in case order matters when it shouldn't modules.reverse() diff --git a/source/tests/bl_load_py_modules.py b/source/tests/bl_load_py_modules.py index b634b4c4385..d65b9605d36 100644 --- a/source/tests/bl_load_py_modules.py +++ b/source/tests/bl_load_py_modules.py @@ -107,7 +107,7 @@ def load_modules(): modules.append(mod_imp) # - # check which filepaths we didnt load + # check which filepaths we didn't load source_files = [] for mod_dir in module_paths: source_files.extend(source_list(mod_dir, filename_check=lambda f: f.endswith(".py"))) diff --git a/source/tests/bl_mesh_modifiers.py b/source/tests/bl_mesh_modifiers.py index 92fae25df16..2f342f2c65e 100644 --- a/source/tests/bl_mesh_modifiers.py +++ b/source/tests/bl_mesh_modifiers.py @@ -34,7 +34,7 @@ USE_QUICK_RENDER = False IS_BMESH = hasattr(__import__("bpy").types, "LoopColors") # ----------------------------------------------------------------------------- -# utility funcs +# utility functions def render_gl(context, filepath, shade): @@ -147,7 +147,7 @@ def ctx_viewport_camera(context): def ctx_camera_setup(context, location=(0.0, 0.0, 0.0), lookat=(0.0, 0.0, 0.0), - # most likely the followuing vars can be left as defaults + # most likely the following vars can be left as defaults up=(0.0, 0.0, 1.0), lookat_axis='-Z', up_axis='Y', @@ -258,7 +258,7 @@ def mesh_uv_add(obj): uv_lay = obj.data.uv_textures.new() if IS_BMESH: - # XXX, odd that we need to do this. until uvs and texface + # XXX, odd that we need to do this. until UV's and texface # are separated we will need to keep it uv_loops = obj.data.uv_layers[-1] uv_list = uv_loops.data[:] diff --git a/source/tests/bl_mesh_validate.py b/source/tests/bl_mesh_validate.py index a57a06d65e3..ac5be7d08d7 100644 --- a/source/tests/bl_mesh_validate.py +++ b/source/tests/bl_mesh_validate.py @@ -98,7 +98,7 @@ def test_meshes(): data.loops.add(len(m[2])) for idx, v in enumerate(m[2]): data.loops[idx].vertex_index = v - # Polys. + # Polygons. data.polygons.add(len(m[3])) for idx, l in enumerate(m[3]): data.polygons[idx].loop_start = l[0] @@ -131,7 +131,7 @@ def test_builtins(): data.loops[l].edge_index = \ random.randrange(0, len(data.edges) * 2) elif rnd == 3: - # Make fun with some poly. + # Make fun with some polygons. p = random.randrange(0, len(data.polygons)) if random.randint(0, 1): data.polygons[p].loop_start = \ diff --git a/source/tests/pep8.py b/source/tests/pep8.py index ccaaeb7c0cd..cb86953e00e 100644 --- a/source/tests/pep8.py +++ b/source/tests/pep8.py @@ -21,20 +21,20 @@ import os # depends on pep8, pyflakes, pylint -# for ubuntu +# for Ubuntu # # sudo apt-get install pylint pyflakes # # sudo apt-get install python-setuptools python-pip # sudo pip install pep8 # -# in debian install pylint pyflakes pep8 with apt-get/aptitude/etc +# in Debian install pylint pyflakes pep8 with apt-get/aptitude/etc # # on *nix run # python source/tests/pep8.py > test_pep8.log 2>&1 # how many lines to read into the file, pep8 comment -# should be directly after the licence header, ~20 in most cases +# should be directly after the license header, ~20 in most cases PEP8_SEEK_COMMENT = 40 SKIP_PREFIX = "./tools", "./config", "./scons", "./extern" FORCE_PEP8_ALL = False @@ -115,7 +115,7 @@ def main(): # let pep8 complain about line length os.system("pylint " "--disable=" - "C0111," # missing docstring + "C0111," # missing doc string "C0103," # invalid name "W0613," # unused argument, may add this back # but happens a lot for 'context' for eg. diff --git a/source/tests/rna_info_dump.py b/source/tests/rna_info_dump.py index 615c3b035ce..40d7b7c38a6 100644 --- a/source/tests/rna_info_dump.py +++ b/source/tests/rna_info_dump.py @@ -18,7 +18,7 @@ # <pep8 compliant> -# Used for generating API diff's between releases +# Used for generating API diffs between releases # ./blender.bin --background -noaudio --python source/tests/rna_info_dump.py import bpy |