Menu
▾
▴
E SVN: glima trunk/editje/editje
|
From: Enlightenment S. <no-...@en...> - 2010-04-20 18:54:46
|
Log: Periodical pyflakes + pep9 run and fixes. Author: glima Date: 2010-04-20 11:54:38 -0700 (Tue, 20 Apr 2010) New Revision: 48171 Modified: trunk/editje/editje/about.py trunk/editje/editje/actions_box.py trunk/editje/editje/animations.py trunk/editje/editje/controller.py trunk/editje/editje/desktop_part_listener.py trunk/editje/editje/desktop_parts_manager.py trunk/editje/editje/details_widget_entry_button.py trunk/editje/editje/details_widget_entry_button_list.py trunk/editje/editje/details_widget_font.py trunk/editje/editje/details_widget_partlist.py trunk/editje/editje/details_widget_states.py trunk/editje/editje/editable.py trunk/editje/editje/editable_part.py trunk/editje/editje/editable_program.py trunk/editje/editje/editje.py trunk/editje/editje/error_notify.py trunk/editje/editje/fileselector.py trunk/editje/editje/filewizard.py trunk/editje/editje/floater.py trunk/editje/editje/floater_opener.py trunk/editje/editje/groupselector.py trunk/editje/editje/misc.py trunk/editje/editje/objects_data.py trunk/editje/editje/openfile.py trunk/editje/editje/parts.py trunk/editje/editje/popup_win.py trunk/editje/editje/popups.py trunk/editje/editje/prop.py trunk/editje/editje/signals.py trunk/editje/editje/swapfile.py Modified: trunk/editje/editje/about.py =================================================================== --- trunk/editje/editje/about.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/about.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -13,8 +13,7 @@ # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. import evas import elementary @@ -22,6 +21,7 @@ import sysconfig from floater import Wizard + class About(Wizard): def __init__(self, parent): Wizard.__init__(self, parent) @@ -38,7 +38,7 @@ self.content_add("default", ico) name = elementary.Label(self) - name.label_set("<b>Editje " + str(sysconfig.VERSION)+"</b>") + name.label_set("<b>Editje " + str(sysconfig.VERSION) + "</b>") name.show() self.content_add("default", name) @@ -66,7 +66,6 @@ sc.bounce_set(False, False) sc.show() self.content_add("default", sc) - copyright = elementary.Label(self) copyright.label_set( @@ -86,6 +85,4 @@ copyright.show() sc.content_set(copyright) - self.action_add("default", "Close", self.close) - Modified: trunk/editje/editje/actions_box.py =================================================================== --- trunk/editje/editje/actions_box.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/actions_box.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,16 +9,16 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. import evas import elementary + class ActionsBox(elementary.Box): def __init__(self, parent): elementary.Box.__init__(self, parent) Modified: trunk/editje/editje/animations.py =================================================================== --- trunk/editje/editje/animations.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/animations.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -135,7 +135,6 @@ self._operation_stack_cb(op) - class AnimationsPartsList(PartsList): def __init__(self, parent, editable_grp, operation_stack_cb): PartsList.__init__(self, parent, editable_grp, operation_stack_cb) @@ -377,7 +376,8 @@ def _removed(self, emissor, data): self.open_disable = True self._header_table["name"].value = "Unselected" - self._header_table["name"].value_obj._values_dict["n"].disabled_set(True) + self._header_table["name"].value_obj._values_dict["n"].disabled_set( + True) self._header_table["length"].value = None self["main"]["current"].hide_value() self["main"]["previous"].hide_value() @@ -390,7 +390,8 @@ def _update(self, emissor, data): self.open_disable = False self._header_table["name"].value = data - self._header_table["name"].value_obj._values_dict["n"].disabled_set(False) + self._header_table["name"].value_obj._values_dict["n"].disabled_set( + False) self._header_table["length"].value = "%.1gs" % self.e.animation.length self._last_timestamp = 0.0 self._timeline_update() Modified: trunk/editje/editje/controller.py =================================================================== --- trunk/editje/editje/controller.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/controller.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,14 +9,14 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. -class Controller(object): +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + +class Controller(object): def __init__(self, parent): self.parent = parent self._view_load() @@ -42,7 +41,6 @@ class View(object): - def __init__(self, controller, parent_view): self.controller = controller self.parent_view = parent_view Modified: trunk/editje/editje/desktop_part_listener.py =================================================================== --- trunk/editje/editje/desktop_part_listener.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/desktop_part_listener.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,13 +9,13 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + class PartListener(object): def __init__(self): self._part = None Modified: trunk/editje/editje/desktop_parts_manager.py =================================================================== --- trunk/editje/editje/desktop_parts_manager.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/desktop_parts_manager.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,18 +9,18 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + import evas class PartViewport(evas.Rectangle): def __init__(self, canvas, manager, part): - evas.Rectangle.__init__(self, canvas, color=(0,0,0,0)) + evas.Rectangle.__init__(self, canvas, color=(0, 0, 0, 0)) self._manager = manager self._part = part self._part.on_resize_add(self._resize) Modified: trunk/editje/editje/details_widget_entry_button.py =================================================================== --- trunk/editje/editje/details_widget_entry_button.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/details_widget_entry_button.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,12 +9,12 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + import elementary from details_widget import Widget @@ -56,7 +55,7 @@ self.rect = elementary.Button(parent) self.rect.label_set("...") self.rect.size_hint_align_set(-1.0, -1.0) - self.rect.size_hint_min_set(30,16) + self.rect.size_hint_min_set(30, 16) self.rect.callback_clicked_add(self._open) self.rect.style_set("editje.details") self.rect.show() Modified: trunk/editje/editje/details_widget_entry_button_list.py =================================================================== --- trunk/editje/editje/details_widget_entry_button_list.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/details_widget_entry_button_list.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -31,4 +31,3 @@ def _open(self, obj): self._floater_open(obj) - Modified: trunk/editje/editje/details_widget_font.py =================================================================== --- trunk/editje/editje/details_widget_font.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/details_widget_font.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2010 Samsung Electronics. # # This file is part of Editje. @@ -10,17 +9,17 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + from details_widget_entry_button import WidgetEntryButton from filewizard import FontSelectionWizard -class WidgetFont(WidgetEntryButton): +class WidgetFont(WidgetEntryButton): def __init__(self, parent, fnt_new_fnt_cb=None, fnt_list_get_cb=None, fnt_id_get_cb=None, workfile_name_get_cb=None): WidgetEntryButton.__init__(self, parent) Modified: trunk/editje/editje/details_widget_partlist.py =================================================================== --- trunk/editje/editje/details_widget_partlist.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/details_widget_partlist.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -87,4 +87,3 @@ self._value = value self._update() self._callback_call("changed") - Modified: trunk/editje/editje/details_widget_states.py =================================================================== --- trunk/editje/editje/details_widget_states.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/details_widget_states.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -215,7 +215,8 @@ self._part_state_copy_from(part_name, st_from, curr_state) - op = Operation("state copying (%s into %s)" % (st_from[0], curr_state[0])) + op = Operation( + "state copying (%s into %s)" % (st_from[0], curr_state[0])) op.redo_callback_add( self._part_state_copy_from, part_name, st_from, curr_state) op.undo_callback_add(self._state_restore, part_name, state_save) Modified: trunk/editje/editje/editable.py =================================================================== --- trunk/editje/editje/editable.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/editable.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -24,7 +24,6 @@ from editable_part import EditablePart from editable_program import EditableProgram from event_manager import Manager -from operation import Operation class Editable(Manager): @@ -388,7 +387,7 @@ self.event_emit("part.added", name) return True - def part_add_bydata(self, name, part_data, relatives = None): + def part_add_bydata(self, name, part_data, relatives=None): source = part_data["source"] if source is None: source = '' @@ -413,7 +412,6 @@ if rels[3]: state.rel2_to_y_set(name) - def _part_init(self, name): part = self._edje.part_get(name) type = part.type @@ -433,9 +431,9 @@ part.mouse_events = False elif type == edje.EDJE_PART_TYPE_IMAGE: - images = self._edje.images - if images: - state.image = images[0] + images = self._edje.images + if images: + state.image = images[0] elif type == edje.EDJE_PART_TYPE_TEXT: part.mouse_events = False @@ -532,7 +530,7 @@ prog.source = name prog.after_add("@%s@end" % name) - prevstatename = "default" + prevstatename = "default" statename = startname if not parts: parts = self.parts @@ -633,4 +631,3 @@ if saved_states: relatives[p] = saved_states return relatives - Modified: trunk/editje/editje/editable_part.py =================================================================== --- trunk/editje/editje/editable_part.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/editable_part.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -114,7 +114,8 @@ def _states_reload_cb(self, emissor, data): if data and self._part: self.states = [] - for s in filter(lambda x: not x.startswith("@"), self._part.states): + for s in filter(lambda x: not x.startswith("@"), + self._part.states): n, v = s.split(None) self.states.append((n, float(v))) else: Modified: trunk/editje/editje/editable_program.py =================================================================== --- trunk/editje/editje/editable_program.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/editable_program.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -112,7 +112,7 @@ self._program.action_set(edje.EDJE_ACTION_TYPE_STATE_SET) self._program.state_set(state) - def signal_emit(self, signal, source = ""): + def signal_emit(self, signal, source=""): self._program.action_set(edje.EDJE_ACTION_TYPE_SIGNAL_EMIT) self._program.state_set(signal) self._program.state2_set(source) Modified: trunk/editje/editje/editje.py =================================================================== --- trunk/editje/editje/editje.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/editje.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -664,7 +664,6 @@ self._mainbar_pager.content_push(mainbar) self._sidebar_pager.content_push(sidebar) - def _mode_get(self): return self._mode Modified: trunk/editje/editje/error_notify.py =================================================================== --- trunk/editje/editje/error_notify.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/error_notify.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,17 +9,18 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + import evas import elementary from actions_box import ActionsBox + class ErrorNotify(elementary.Notify): def __init__(self, parent, orient=elementary.ELM_NOTIFY_ORIENT_BOTTOM): elementary.Notify.__init__(self, parent) Modified: trunk/editje/editje/fileselector.py =================================================================== --- trunk/editje/editje/fileselector.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/fileselector.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -147,7 +147,8 @@ elementary.ELM_SCROLLER_POLICY_OFF) self._file_sc.bounce_set(False, False) self._file_sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - self._file_sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) + self._file_sc.size_hint_align_set(evas.EVAS_HINT_FILL, + evas.EVAS_HINT_FILL) self._file_entry = elementary.Entry(self) self._file_entry.single_line_set(True) @@ -263,7 +264,8 @@ ic = elementary.Icon(self) ic.standard_set("folder") ic.scale_set(0, 0) - it = self._directories.item_append(file, ic, None, None, full) + it = self._directories.item_append( + file, ic, None, None, full) self._ls_dir[file] = it elif os.path.isfile(full): if not filter or self._filter_call(full): Modified: trunk/editje/editje/filewizard.py =================================================================== --- trunk/editje/editje/filewizard.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/filewizard.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -94,7 +94,7 @@ if not self._file_preview_page_created: self._create_file_preview_page() else: - self._get_preview_file(self._selection) + self._get_preview_file(self._selection) self.goto("file_preview", alt_bg_style=False) self._get_title_text() @@ -150,7 +150,7 @@ for i in self._files: self._file_list.item_append( - i.split(',',1)[0], None, None, None, None) + i.split(',', 1)[0], None, None, None, None) self._file_list.go() def _fs_file_selected_cb(self, obj, data): @@ -293,4 +293,3 @@ self.action_add("file_list", "Close", self.close) self._file_list.callback_selected_add(self._goto_preview) - Modified: trunk/editje/editje/floater.py =================================================================== --- trunk/editje/editje/floater.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/floater.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -32,8 +32,8 @@ def __init__(self, parent, rel_to_obj=None): if not rel_to_obj: - raise TypeError("You must pass an object whose geometry the Floater" - " will use to move itself in the canvas.") + raise TypeError("You must pass an object whose geometry the" + " Floater will use to move itself in the canvas.") Layout.__init__(self, parent) self.on_changed_size_hints_add(self._move_and_resize) @@ -93,7 +93,7 @@ if oy < py: oy = py - elif oy + oh + py>= ch: + elif oy + oh + py >= ch: oy = ch - oh - py self.resize(ow, oh) @@ -124,7 +124,7 @@ content.size_hint_align_set(-1.0, -1.0) Layout.content_set(self, "content", content) - def action_add(self, label, func_cb, data = None): + def action_add(self, label, func_cb, data=None): btn = Button(self._parent) self._action_btns.append(btn) btn.label_set(label) @@ -148,7 +148,6 @@ action.delete() del self._action_btns[:] - def show(self): self._move_and_resize(self) global _instance @@ -193,7 +192,7 @@ InnerWindow.__init__(self, parent) self._parent = parent - self.style_set("minimal") # size fallbacks to __layout's min/max + self.style_set("minimal") # size fallbacks to __layout's min/max self.__layout = edje.Edje(self.evas) self.__theme_file = sysconfig.theme_file_get("default") Modified: trunk/editje/editje/floater_opener.py =================================================================== --- trunk/editje/editje/floater_opener.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/floater_opener.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -40,7 +40,8 @@ def _floater_open(self, parent, *args): if not self._floater: self._floater = Floater(parent, parent) - self._floater.size_min_set(self._floater_min_w, self._floater_min_h) + self._floater.size_min_set( + self._floater_min_w, self._floater_min_h) self._floater_title_init() self._floater_actions_init() Modified: trunk/editje/editje/groupselector.py =================================================================== --- trunk/editje/editje/groupselector.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/groupselector.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -312,7 +312,8 @@ self._preview.group_set(self._groups_list.file, self._groups_list.selection) self.goto("group_preview") - self.title_text = "Group preview - \"%s\"" % self._groups_list.selection + self.title_text = "Group preview - \"%s\"" % \ + self._groups_list.selection def _goto_group_list(self): self._groups_list.selection_clear() Modified: trunk/editje/editje/misc.py =================================================================== --- trunk/editje/editje/misc.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/misc.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -17,6 +17,7 @@ import re + def name_generate(suggest, list=[]): # Split the name and the number in end spliter = re.compile("((?:(?:\d+\D)*|\D)*)(\d*$)") @@ -30,7 +31,7 @@ has = False for item in list: - iname, inumber = spliter.match(item).groups() + iname, inumber = spliter.match(item).groups() if iname != name: continue @@ -56,4 +57,3 @@ return name accepted_filetype = re.compile("(.*\.(?:edc|edj))").match - Modified: trunk/editje/editje/objects_data.py =================================================================== --- trunk/editje/editje/objects_data.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/objects_data.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -502,7 +502,7 @@ ret += indent + ' action: SIGNAL_EMIT "%s" "%s";\n' % \ (self["state"], self["state2"]) - trans["NONE", "LINEAR", "SINUSOIDAL", "ACCELERATE", "DECELERATE"] + trans = ["NONE", "LINEAR", "SINUSOIDAL", "ACCELERATE", "DECELERATE"] ret += indent + ' transition: %s %.5f;\n' % \ (trans[self["transition"]], self["transition_time"]) ret += indent + ' in: %.5f %.5f;\n' % self["in"] @@ -538,7 +538,7 @@ def __init__(self, obj): prog = re_anim_program_stop.match(obj.name) if not prog: - raise TypeError("Not an animation's stop program") + raise TypeError("Not an animation's stop program") name = re_anim_program.match(obj.name).group(1) Object.__init__(self, name) Modified: trunk/editje/editje/openfile.py =================================================================== --- trunk/editje/editje/openfile.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/openfile.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -16,7 +16,6 @@ # License along with Editje. If not, see <http://www.gnu.org/licenses/>. import os -import shutil import string import evas Modified: trunk/editje/editje/parts.py =================================================================== --- trunk/editje/editje/parts.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/parts.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -188,7 +188,6 @@ self._edit_grp.part_add_bydata(name, part_save, saved_relatives) - for to_del in self.selected: part_name = to_del[0] part_save = objects_data.Part(self._edit_grp.part_get(part_name)) @@ -205,7 +204,6 @@ op.undo_callback_add(part_restore, part_save, relatives) self._operation_stack_cb(op) - def remove(self, item): i = self._items.get(item) if i: Modified: trunk/editje/editje/popup_win.py =================================================================== --- trunk/editje/editje/popup_win.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/popup_win.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2010 Samsung Electronics. # # This file is part of Editje. @@ -10,17 +9,18 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + import evas import elementary from actions_box import ActionsBox + class PopupWindow(elementary.Window): def __init__(self, name="popup", type=elementary.ELM_WIN_BASIC): elementary.Window.__init__(self, name, type) Modified: trunk/editje/editje/popups.py =================================================================== --- trunk/editje/editje/popups.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/popups.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -9,12 +9,11 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. import evas from elementary import InnerWindow, Layout, Button, Box @@ -66,8 +65,8 @@ self._set_controls() - def set_message(self,message): - self.label_set("filename",message) + def set_message(self, message): + self.label_set("filename", message) def action_add(self, label, func_cb, data=None): btn = Button(self) Modified: trunk/editje/editje/prop.py =================================================================== --- trunk/editje/editje/prop.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/prop.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -205,7 +205,7 @@ def property_del(self, key): if not key in self._props: - raise KeyError(prop.name) + raise KeyError(key) prop = self._props[key] self.unpack(prop.label_obj) @@ -224,7 +224,7 @@ return self._props.get(key) def has_key(self, key): - return self._props.has_key(key) + return key in self._props def __getitem__(self, key): if key in self._props: Modified: trunk/editje/editje/signals.py =================================================================== --- trunk/editje/editje/signals.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/signals.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -9,12 +9,11 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. import evas import ecore @@ -296,7 +295,8 @@ def _removed(self, emissor, data): self._header_table["name"].value = "Unselected" - self._header_table["name"].value_obj._values_dict["n"].disabled_set(True) + self._header_table["name"].value_obj._values_dict["n"].disabled_set( + True) self["main"]["signal"].value = "" self["main"]["signal"].hide_value() @@ -323,7 +323,8 @@ def _update(self, emissor, data): self._header_table["name"].value = data self._header_table["name"].show_value() - self._header_table["name"].value_obj._values_dict["n"].disabled_set(False) + self._header_table["name"].value_obj._values_dict["n"].disabled_set( + False) signal = self.e.signal.signal self["main"]["signal"].show_value() Modified: trunk/editje/editje/swapfile.py =================================================================== --- trunk/editje/editje/swapfile.py 2010-04-20 18:49:42 UTC (rev 48170) +++ trunk/editje/editje/swapfile.py 2010-04-20 18:54:38 UTC (rev 48171) @@ -1,4 +1,3 @@ -# # Copyright (C) 2009 Samsung Electronics. # # This file is part of Editje. @@ -10,14 +9,14 @@ # # Editje is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with Editje. If not, see -# <http://www.gnu.org/licenses/>. +# License along with Editje. If not, see <http://www.gnu.org/licenses/>. + from os import system, remove, path, getcwd, chdir, listdir -from shutil import copyfile, move, rmtree +from shutil import copyfile, rmtree from tempfile import mkstemp, mkdtemp from subprocess import Popen, PIPE import re @@ -27,13 +26,14 @@ RESTORE = 1 REPLACE = 2 + class SwapFile(object): __opened_files = {} def is_opened(self, filename=None): if not filename: filename = self.__filepath - return self.__opened_files.has_key(filename) + return filename in self.__opened_files def __init__(self): self.__new = False @@ -53,14 +53,14 @@ self.__opened = True return - if self.__opened_files.has_key(self.__filepath): + if self.__filepath in self.__opened_files: raise FileOpened(self) if not self.__filepath: raise FileNotSet(self) if path.exists(self.__swapfile): - if mode == RESTORE: # or filecmp.cmp(self.__filepath, self.__swapfile): + if mode == RESTORE: self.__opened = True self.__opened_files[self.__filepath] = self return @@ -104,7 +104,7 @@ opened = self.__opened_files.get(filepath) if opened and opened != self: raise FileOpened(self) - if self.__opened_files.has_key(self.__filepath): + if self.__filepath in self.__opened_files: del self.__opened_files[self.__filepath] if path.exists(filepath) and mode != REPLACE: raise FileAlreadyExists(self) @@ -119,7 +119,8 @@ orig_dir = getcwd() temp_dir = mkdtemp(prefix="editje_") chdir(temp_dir) - system('edje_decc ' + self.__swapfile + ' -no-build-sh -current-dir') + system('edje_decc ' + self.__swapfile + + ' -no-build-sh -current-dir') copyfile("./generated_source.edc", self.__filepath) remove("./generated_source.edc") dir, file = path.split(self.__filepath) @@ -186,33 +187,42 @@ def __init__(self, swapfile): self.swapfile = swapfile + class FileNotSet(SwapFileError): def __str__(self): return "File not set." + class UnknownFileType(SwapFileError): def __str__(self): return "Unknown File type." + class CacheAlreadyExists(SwapFileError): def __str__(self): - return self.swapfile.file + " : Swap file (" + self.swapfile.workfile + ") exists." + return self.swapfile.file + " : Swap file (" + \ + self.swapfile.workfile + ") exists." + class CompileError(SwapFileError): def __init__(self, swapfile, message): SwapFileError.__init__(self, swapfile) self.message = message + def __str__(self): return self.swapfile.file + " : Compile Error\n" + self.message + class FileAlreadyExists(SwapFileError): def __str__(self): return self.swapfile.file + " : File exists." + class FileNotFound(SwapFileError): def __str__(self): return self.swapfile.file + " : File not found." + class FileOpened(SwapFileError): def __str__(self): return self.swapfile.file + " : File opened." |