Index: addons/add_mesh_extra_objects/add_mesh_teapot.py
===================================================================
--- addons/add_mesh_extra_objects/add_mesh_teapot.py	(revision 3384)
+++ addons/add_mesh_extra_objects/add_mesh_teapot.py	(working copy)
@@ -55,7 +55,7 @@
 								   self.resolution)
         # Actually create the mesh object from this geometry data.
 		obj = create_mesh_object(context, verts, [], faces, "Teapot")
-		return {"FINISHED"}
+		return {'FINISHED'}
 
 def menu_func(self, context):
 	self.layout.operator(AddTeapot.bl_idname, text="Teapot+", icon="MESH_CUBE")
Index: addons/add_mesh_extra_objects/add_mesh_torusknot.py
===================================================================
--- addons/add_mesh_extra_objects/add_mesh_torusknot.py	(revision 3384)
+++ addons/add_mesh_extra_objects/add_mesh_torusknot.py	(working copy)
@@ -132,7 +132,7 @@
 		verts, faces = make_knot(self.objecttype,
 								 self.resolution)
 		obj = create_mesh_object(context, verts, [], faces, "Torus Knot")
-		return {"FINISHED"}
+		return {'FINISHED'}
 '''
 def menu_func(self, context):
 	self.layout.operator(AddTorusKnot.bl_idname, text="Torus Knot", icon="MESH_CUBE")
Index: addons/io_coat3D/tex.py
===================================================================
--- addons/io_coat3D/tex.py	(revision 3384)
+++ addons/io_coat3D/tex.py	(working copy)
@@ -332,4 +332,4 @@
                     objekti.modifiers['Displace'].texture_coords = 'UV'
                     objekti.modifiers['Displace'].uv_layer = objekti.data.uv_textures.active.name
 
-    return('FINISHED')
+    return {'FINISHED'}
Index: addons/io_convert_image_to_mesh_img/import_img.py
===================================================================
--- addons/io_convert_image_to_mesh_img/import_img.py	(revision 3384)
+++ addons/io_convert_image_to_mesh_img/import_img.py	(working copy)
@@ -697,7 +697,7 @@
       # Select the new mesh
       ob_new.select = True
 
-      return ('FINISHED',)
+      return {'FINISHED'}
 
 def load(operator, context, filepath, scale, bin_mode, cropVars):
     print("Bin Mode: %s" % bin_mode)
Index: addons/io_export_directx_x.py
===================================================================
--- addons/io_export_directx_x.py	(revision 3384)
+++ addons/io_export_directx_x.py	(working copy)
@@ -1269,14 +1269,14 @@
                                          Verbose=self.Verbose)
 
         ExportDirectX(Config)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     def invoke(self, context, event):
         if not self.filepath:
             self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".x")
         WindowManager = context.window_manager
         WindowManager.fileselect_add(self)
-        return {"RUNNING_MODAL"}
+        return {'RUNNING_MODAL'}
 
 
 def menu_func(self, context):
Index: addons/light_field_tools/light_field_tools.py
===================================================================
--- addons/light_field_tools/light_field_tools.py	(revision 3384)
+++ addons/light_field_tools/light_field_tools.py	(working copy)
@@ -273,7 +273,7 @@
         obj = self.baseObject = context.active_object
         if not obj or obj.type != 'MESH':
             self.report({'ERROR'}, "No selected mesh object!")
-            return 'CANCELLED'
+            return {'CANCELLED'}
 
         self.verts = self.arrangeVerts()
         self.numSamples = len(self.verts)
@@ -295,7 +295,7 @@
             else:
                 self.createLightfieldEmitter(textured=False)
 
-        return 'FINISHED'
+        return {'FINISHED'}
    
 
 
@@ -346,12 +346,12 @@
         # check if active object is a mesh object
         if not obj or obj.type != 'MESH':
             self.report({'ERROR'}, "No selected mesh object!")
-            return 'CANCELLED'
+            return {'CANCELLED'}
 
         # check if it has one single face
         if len(obj.data.faces) != 1:
             self.report({'ERROR'}, "The selected mesh object has to have exactly one quad!")
-            return 'CANCELLED'
+            return {'CANCELLED'}
 
         rl = scene.lightfield.row_length
         # use a degree angle here
@@ -389,7 +389,7 @@
         mesh.from_pydata(verts, [], [])
         self.addMeshObj(mesh)
 
-        return 'FINISHED'
+        return {'FINISHED'}
         
 
 
Index: addons/mesh_bsurfaces.py
===================================================================
--- addons/mesh_bsurfaces.py	(revision 3384)
+++ addons/mesh_bsurfaces.py	(working copy)
@@ -755,7 +755,7 @@
         bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
         
         
-        return {"FINISHED"}
+        return {'FINISHED'}
         
     def invoke (self, context, event):
         bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
@@ -764,7 +764,7 @@
         
         self.execute(context)
         
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 
@@ -822,7 +822,7 @@
         
         self.execute(context)
         
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 def register():
Index: addons/mocap/__init__.py
===================================================================
--- addons/mocap/__init__.py	(revision 3384)
+++ addons/mocap/__init__.py	(working copy)
@@ -454,7 +454,7 @@
             enduser_obj.data.advancedRetarget = True
         else:
             retarget.totalRetarget(performer_obj, enduser_obj, scene, s_frame, e_frame)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -477,7 +477,7 @@
         enduser_obj = bpy.context.active_object
         performer_obj = [obj for obj in bpy.context.selected_objects if obj != enduser_obj][0]
         retarget.createDictionary(performer_obj.data, enduser_obj.data)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -500,7 +500,7 @@
         enduser_obj = bpy.context.active_object
         performer_obj = [obj for obj in bpy.context.selected_objects if obj != enduser_obj][0]
         retarget.loadMapping(performer_obj.data, enduser_obj.data)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -532,7 +532,7 @@
                         selectedBone = bone.name
                         break
         performer_obj.data.bones[self.perf_bone].map = selectedBone
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -553,7 +553,7 @@
 
     def execute(self, context):
         mocap_tools.fcurves_simplify(context, context.active_object)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -568,7 +568,7 @@
 
     def execute(self, context):
         mocap_tools.autoloop_anim()
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -583,7 +583,7 @@
 
     def execute(self, context):
         mocap_tools.denoise_median()
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -599,7 +599,7 @@
     def execute(self, context):
         performer_obj = [obj for obj in context.selected_objects if obj != context.active_object][0]
         mocap_tools.limit_dof(context, performer_obj, context.active_object)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -620,7 +620,7 @@
 
     def execute(self, context):
         mocap_tools.limit_dof_toggle_off(context, context.active_object)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -638,7 +638,7 @@
 
     def execute(self, context):
         mocap_tools.rotate_fix_armature(context.active_object.data)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -656,7 +656,7 @@
         enduser_obj = bpy.context.active_object
         performer_obj = [obj for obj in bpy.context.selected_objects if obj != enduser_obj][0]
         mocap_tools.scale_fix_armature(performer_obj, enduser_obj)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -686,7 +686,7 @@
         enduser_arm = enduser_obj.data
         new_mcon = enduser_arm.mocap_constraints.add()
         new_mcon.type = self.type
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -711,7 +711,7 @@
             cons_obj = mocap_constraints.getConsObj(bone)
             mocap_constraints.removeConstraint(m_constraint, cons_obj)
         m_constraints.remove(self.constraint)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -727,7 +727,7 @@
 
     def execute(self, context):
         mocap_constraints.bakeConstraints(context)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -743,7 +743,7 @@
 
     def execute(self, context):
         mocap_constraints.unbakeConstraints(context)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -760,7 +760,7 @@
 
     def execute(self, context):
         mocap_constraints.updateConstraints(context.active_object, context)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -778,7 +778,7 @@
         enduser_obj = bpy.context.active_object
         performer_obj = [obj for obj in bpy.context.selected_objects if obj != enduser_obj][0]
         mocap_tools.guessMapping(performer_obj, enduser_obj)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -800,7 +800,7 @@
     def execute(self, context):
         path = [obj for obj in context.selected_objects if obj != context.active_object][0]
         mocap_tools.path_editing(context, context.active_object, path)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -819,7 +819,7 @@
 
     def execute(self, context):
         mocap_tools.anim_stitch(context, context.active_object)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
@@ -840,7 +840,7 @@
 
     def execute(self, context):
         mocap_tools.guess_anim_stitch(context, context.active_object)
-        return {"FINISHED"}
+        return {'FINISHED'}
 
     @classmethod
     def poll(cls, context):
Index: addons/paint_palette.py
===================================================================
--- addons/paint_palette.py	(revision 3384)
+++ addons/paint_palette.py	(working copy)
@@ -328,7 +328,7 @@
         pp.current_color_index = new_index
         sample()
         update_panels()
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 class PALETTE_OT_remove_color(bpy.types.Operator):
@@ -349,7 +349,7 @@
 
         if pp.current_color_index >= pp.colors.__len__():
             pp.index = pp.current_color_index = pp.colors.__len__() - 1
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 class PALETTE_OT_sample_tool_color(bpy.types.Operator):
@@ -361,7 +361,7 @@
         pp = bpy.context.scene.palette_props
         brush = current_brush()
         pp.colors[pp.current_color_index].color = brush.color
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 class IMAGE_OT_select_color(bpy.types.Operator):
@@ -377,7 +377,7 @@
         palette_props.current_color_index = self.color_index
 
         update_panels()
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 def color_palette_draw(self, context):
@@ -543,7 +543,7 @@
             weight = palette_props.weight_10
         palette_props.weight = weight
         #bpy.context.tool_settings.vertex_group_weight = weight
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 
 class VIEW3D_OT_reset_weight_palette(bpy.types.Operator):
@@ -597,7 +597,7 @@
         if palette_props.current_weight_index == 10:
             palette_props.weight = 1.0
         palette_props.weight_10 = 1.0
-        return {"FINISHED"}
+        return {'FINISHED'}
 
 class VIEW3D_PT_weight_palette(PaintPanel, bpy.types.Panel):
     bl_label = "Weight Palette"
Index: addons/render_copy_settings/__init__.py
===================================================================
--- addons/render_copy_settings/__init__.py	(revision 3384)
+++ addons/render_copy_settings/__init__.py	(working copy)
@@ -61,7 +61,7 @@
     # A string of identifiers (colon delimited) which property’s controls
     # should be displayed in a template_list.
     template_list_controls = StringProperty(default="allowed",
-                                            options={"HIDDEN"})
+                                            options={'HIDDEN'})
 
 
 class RenderCopySettingsSetting(bpy.types.PropertyGroup):
@@ -71,7 +71,7 @@
     # A string of identifiers (colon delimited) which property’s controls
     # should be displayed in a template_list.
     template_list_controls = StringProperty(default="copy",
-                                            options={"HIDDEN"})
+                                            options={'HIDDEN'})
 
 
 class RenderCopySettings(bpy.types.PropertyGroup):
Index: addons/render_copy_settings/operator.py
===================================================================
--- addons/render_copy_settings/operator.py	(revision 3384)
+++ addons/render_copy_settings/operator.py	(working copy)
@@ -94,12 +94,12 @@
                 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:
@@ -137,7 +137,7 @@
 
     presets = EnumProperty(items=(p.rna_enum for p in presets.presets),
                            default=set(),
-                           options={"ENUM_FLAG"})
+                           options={'ENUM_FLAG'})
 
     @staticmethod
     def process_elements(settings, elts):
Index: addons/render_renderfarmfi.py
===================================================================
--- addons/render_renderfarmfi.py	(revision 3384)
+++ addons/render_renderfarmfi.py	(working copy)
@@ -759,7 +759,7 @@
     ore = sce.ore_render
     
     if not bpy.ready:
-        op.report(set(['ERROR']), 'Your user or scene information is not complete')
+        op.report({'ERROR'}, 'Your user or scene information is not complete')
         bpy.infoError = True
         bpy.errorStartTime = time.time()
         bpy.context.scene.render.engine = 'RENDERFARMFI_RENDER'
@@ -812,15 +812,15 @@
         print("Submitting session")
         res = proxy.session.submit(userid, res['key'], sessionid)
         print("Session submitted")
-        op.report(set(['INFO']), 'Submission sent to Renderfarm.fi')
+        op.report({'INFO'}, 'Submission sent to Renderfarm.fi')
     except xmlrpc.client.Error as v:
         bpy.context.scene.render.engine = 'RENDERFARMFI_RENDER'
         print('ERROR:', v)
-        op.report(set(['ERROR']), 'An XMLRPC error occurred while sending submission to Renderfarm.fi')
+        op.report({'ERROR'}, 'An XMLRPC error occurred while sending submission to Renderfarm.fi')
     except Exception as e:
         bpy.context.scene.render.engine = 'RENDERFARMFI_RENDER'
         print('Unhandled error:', e)
-        op.report(set(['ERROR']), 'A generic error occurred while sending submission to Renderfarm.fi')
+        op.report({'ERROR'}, 'A generic error occurred while sending submission to Renderfarm.fi')
     
     bpy.context.scene.render.engine = 'RENDERFARMFI_RENDER'
     doRefresh(op)
@@ -999,9 +999,9 @@
                 userid = res['userId']
                 res = proxy.session.cancelSession(userid, key, s.id)
                 doRefresh(self)
-                self.report(set(['INFO']), 'Session ' + s.title + ' with id ' + str(s.id) + ' cancelled')
+                self.report({'INFO'}, 'Session ' + s.title + ' with id ' + str(s.id) + ' cancelled')
             except xmlrpc.client.Error as v:
-                self.report(set(['ERROR']), 'Could not cancel session ' + s.title + ' with id ' + str(s.id))
+                self.report({'ERROR'}, 'Could not cancel session ' + s.title + ' with id ' + str(s.id))
                 print(v)
                 bpy.cancelError = True
                 bpy.errorStartTime = time.time()
@@ -1067,21 +1067,21 @@
     def execute(self, context):
         blenderproxy = xmlrpc.client.ServerProxy(r'http://xmlrpc.renderfarm.fi/renderfarmfi/blender', verbose=DEV)
         try:
-            self.report(set(['INFO']), 'Checking for newer version on Renderfarm.fi')
+            self.report({'INFO'}, 'Checking for newer version on Renderfarm.fi')
             dl_url = blenderproxy.blender.getCurrentVersion(bpy.CURRENT_VERSION)
             if len(dl_url['url']) > 0:
-                self.report(set(['INFO']), 'Found a newer version on Renderfarm.fi ' + dl_url['url'])
+                self.report({'INFO'}, 'Found a newer version on Renderfarm.fi ' + dl_url['url'])
                 bpy.download_location = dl_url['url']
                 bpy.found_newer_version = True
             else:
                 bpy.up_to_date = True
-            self.report(set(['INFO']), 'Done checking for newer version on Renderfarm.fi')
+            self.report({'INFO'}, 'Done checking for newer version on Renderfarm.fi')
         except xmlrpc.client.Fault as f:
             print('ERROR:', f)
-            self.report(set(['ERROR']), 'An error occurred while checking for newer version on Renderfarm.fi: ' + f.faultString)
+            self.report({'ERROR'}, 'An error occurred while checking for newer version on Renderfarm.fi: ' + f.faultString)
         except xmlrpc.client.ProtocolError as e:
             print('ERROR:', e)
-            self.report(set(['ERROR']), 'An HTTP error occurred while checking for newer version on Renderfarm.fi: ' + str(e.errcode) + ' ' + e.errmsg)
+            self.report({'ERROR'}, 'An HTTP error occurred while checking for newer version on Renderfarm.fi: ' + str(e.errcode) + ' ' + e.errmsg)
         
         return {'FINISHED'}
 
Index: addons/rigify/ui.py
===================================================================
--- addons/rigify/ui.py	(revision 3384)
+++ addons/rigify/ui.py	(working copy)
@@ -226,7 +226,7 @@
 
     message.reverse()  # XXX - stupid! menu's are upside down!
 
-    operator.report(set(['INFO']), '\n'.join(message))
+    operator.report({'INFO'}, '\n'.join(message))
 
 
 class Generate(bpy.types.Operator):
Index: bl_operators/wm.py
===================================================================
--- bl_operators/wm.py	(revision 46861)
+++ bl_operators/wm.py	(working copy)
@@ -1803,7 +1803,7 @@
 
         path, isdir = WM_OT_addon_remove.path_from_addon(self.module)
         if path is None:
-            self.report('WARNING', "Addon path %r could not be found" % path)
+            self.report({'WARNING'}, "Addon path %r could not be found" % path)
             return {'CANCELLED'}
 
         # in case its enabled