Deleted unnecessary 'returns' and 'passes'

diff --git a/src/mvc/controllers/about.py b/src/mvc/controllers/about.py
index 9082cf2..2800ba3 100755 (executable)
--- a/src/mvc/controllers/about.py
+++ b/src/mvc/controllers/about.py
@@ -8,7 +8,6 @@ class AboutCtrl(Controller):
 
     def __init__(self, model):
         Controller.__init__(self, model)
-        return
 
     def register_view(self, view):
         """Loads the text taking it from the model."""
@@ -19,7 +18,6 @@ class AboutCtrl(Controller):
 #        self.view.set_authors(self.model.authors)
         self.view.set_comments(self.model.comments)
         self.view.set_license(self.model.license)
-        return
 
     # -----------------------------------------------------
     #                  user callbacks
@@ -32,5 +30,3 @@ class AboutCtrl(Controller):
     # -----------------------------------------------------
     #                observable properties
     # -----------------------------------------------------
-
-    pass # end of class

diff --git a/src/mvc/controllers/application.py b/src/mvc/controllers/application.py
index 3f883bb..6b492a5 100755 (executable)
--- a/src/mvc/controllers/application.py
+++ b/src/mvc/controllers/application.py
@@ -12,9 +12,7 @@ class ApplicationCtrl(Controller):
 
     def __init__(self, model):
         Controller.__init__(self, model)
-
         self.filesearch = FilesearchCtrl(model.filesearch)
-        return
 
     def register_view(self, view):
         """Creates subviews and connect signals"""
@@ -26,7 +24,6 @@ class ApplicationCtrl(Controller):
         self.view['main_window'].connect('destroy', gtk.main_quit)
         self.view['about_btn'].connect('clicked', self.on_about_btn_clicked)
         self.view['quit_btn'].connect('clicked', self.on_quit_btn_clicked)
-        return
 
     # -----------------------------------------------------
     #                  user callbacks
@@ -34,7 +31,6 @@ class ApplicationCtrl(Controller):
 
     def quit(self):
         gtk.main_quit()
-        return
 
     # -----------------------------------------------------
     #                    gtk signals
@@ -44,7 +40,6 @@ class ApplicationCtrl(Controller):
         c = AboutCtrl(self.model.about)
         v = AboutView(c)
         v.run() # this runs in modal mode
-        return
 
     def on_quit_btn_clicked(self, bt):
         self.quit()
@@ -52,5 +47,3 @@ class ApplicationCtrl(Controller):
     # -----------------------------------------------------
     #                observable properties
     # -----------------------------------------------------
-
-    pass # end of class

diff --git a/src/mvc/controllers/filesearch.py b/src/mvc/controllers/filesearch.py
index 6e6ff69..250d532 100755 (executable)
--- a/src/mvc/controllers/filesearch.py
+++ b/src/mvc/controllers/filesearch.py
@@ -19,7 +19,6 @@ class FilesearchCtrl(Controller):
 
     def __init__(self, model):
         Controller.__init__(self, model)
-        return
 
     def register_view(self, view):
         Controller.register_view(self, view)
@@ -33,8 +32,6 @@ class FilesearchCtrl(Controller):
         self.view.set_quantity_value(self.model.quantity)
         self.view.set_start_path_value(self.model.start_path)
 
-        return
-
     # -----------------------------------------------------
     #                  user callbacks
     # -----------------------------------------------------
@@ -84,7 +81,6 @@ class FilesearchCtrl(Controller):
     def on_qty_spin_value_changed(self, sb):
         # Получаем значение количества файлов из SpinButton
         self.model.quantity = sb.get_value_as_int()
-        return
 
     def start_btn_released_cb(self, btn):
         """Start file search. Button "Go" activate callback."""         
@@ -124,16 +120,12 @@ class FilesearchCtrl(Controller):
     # -----------------------------------------------------
 
     def property_quantity_value_change(self, model, old, new):
+        pass
         #self.view.set_quantity_value(new)
-        return
 
     def property_start_path_value_change(self, model, old, new):
         print model, old, new
         self.view.set_start_path_value(new)
-        return
 
     def property_stopit_value_change(self, model, old, new):
         self.view.set_stopit_value(new)
-        return
-
-    pass # end of class

diff --git a/src/mvc/models/about.py b/src/mvc/models/about.py
index 7fc8e25..a2edff0 100755 (executable)
--- a/src/mvc/models/about.py
+++ b/src/mvc/models/about.py
@@ -22,7 +22,3 @@ class AboutModel(Model):
 under the terms of the GNU General Public License\nas published by the Free \
 Software Foundation; either version 3\nof the License, or (at your option) \
 any later version.'
-
-        return
-
-    pass # end of class

diff --git a/src/mvc/models/application.py b/src/mvc/models/application.py
index 9f6cd24..92266ad 100755 (executable)
--- a/src/mvc/models/application.py
+++ b/src/mvc/models/application.py
@@ -11,6 +11,3 @@ class ApplicationModel(Model):
 
         self.filesearch = FilesearchModel()
         self.about = AboutModel()
-        return
-
-    pass # end of class

diff --git a/src/mvc/models/filesearch.py b/src/mvc/models/filesearch.py
index facb61a..3bacab7 100755 (executable)
--- a/src/mvc/models/filesearch.py
+++ b/src/mvc/models/filesearch.py
@@ -17,6 +17,3 @@ class FilesearchModel(Model):
 
     def __init__(self):
         Model.__init__(self)
-        return
-
-    pass # end of class

diff --git a/src/mvc/views/about.py b/src/mvc/views/about.py
index d9e47bd..da87ccf 100755 (executable)
--- a/src/mvc/views/about.py
+++ b/src/mvc/views/about.py
@@ -11,31 +11,22 @@ class AboutView(View):
         self['dialog_about'] = gtk.AboutDialog()
         ctrl.register_view(self)
 
-        return
-
     def set_progname(self, text):
         self['dialog_about'].set_name(text)
-        return
 
     def set_version(self, text):
         self['dialog_about'].set_version(text)
-        return
 
     def set_authors(self, text):
         self['dialog_about'].set_authors(text)
-        return
 
     def set_comments(self, text):
         self['dialog_about'].set_comments(text)
-        return
 
     def set_license(self, text):
         self['dialog_about'].set_license(text)
-        return
 
     def run(self):
         res = self['dialog_about'].run()
         self['dialog_about'].destroy()
         return res
-
-    pass # end of class

diff --git a/src/mvc/views/application.py b/src/mvc/views/application.py
index 25c524b..df53d75 100755 (executable)
--- a/src/mvc/views/application.py
+++ b/src/mvc/views/application.py
@@ -12,7 +12,6 @@ class ApplicationView(View):
         self.filesearch = None
         self.__build_widgets()
         ctrl.register_view(self)
-        return
 
     def __build_widgets(self):
         self['main_window'] = gtk.Window()
@@ -35,12 +34,7 @@ class ApplicationView(View):
         self['main_window'].add(self['vbox'])
         self['main_window'].show_all()
 
-        return
-
     def create_sub_views(self, filesearch_ctrl):
         """Creates and connects sub views"""
         self.filesearch = FilesearchView(filesearch_ctrl) # not a top level
         self['vbox'].pack_start(self.filesearch['vbox'])
-        return
-
-    pass # end of class

diff --git a/src/mvc/views/filesearch.py b/src/mvc/views/filesearch.py
index e516989..0e83bcc 100755 (executable)
--- a/src/mvc/views/filesearch.py
+++ b/src/mvc/views/filesearch.py
@@ -15,7 +15,6 @@ class FilesearchView(View):
         View.__init__(self, ctrl, register=False)
         self.__build_widgets()
         ctrl.register_view(self)
-        return
 
     def __build_widgets(self):
 
@@ -90,17 +89,11 @@ class FilesearchView(View):
         self['vbox'].pack_start(currfile_frm, False, False, 0)
         self['vbox'].show_all()
 
-        return
-
     def set_quantity_value(self, val):
         self['qty_spin'].set_value(val)
-        return
 
     def set_start_path_value(self, val):
         self['path_entry'].set_text(val)
-        return
 
     def set_stopit_value(self, val):
-        return
-
-    pass # end of class
+        pass