Merge lp:~dneelyep/gtg/gtgchanges into lp:~gtg/gtg/old-trunk

[Daniel Neel]

Fixed a few typos and explained the info.py modules' functionality more fully.

Also fixed 37 pylint errors.

[lp:~dneelyep/gtg/gtgchanges]

927. By Luca Falavigna on 2011-01-28

Replace gnome2 url_show() method with gtk's show_uri

928. By Luca Invernizzi on 2011-04-04

Fixing Bug #604293: Right click on a task doesn't change the selection

929. By Luca Invernizzi on 2011-04-04

New backends window should have close button not quit

930. By Luca Invernizzi on 2011-04-04

Fixes 673745: Tomboy referenced before assigment

[Luca Invernizzi (invernizzi)]

Thanks a lot!

review: Approve

[lp:~dneelyep/gtg/gtgchanges]

931. By Luca Invernizzi on 2011-04-04

Fixed a few typos and explained the info.py modules' functionality more fully.

Also fixed 37 pylint errors.

------------- This line and the following will be ignored --------------

modified:
  AUTHORS
  GTG/core/datastore.py
  GTG/gtg.py
  GTG/gtk/backends_dialog/parameters_ui/__init__.py
  GTG/gtk/backends_dialog/parameters_ui/checkboxui.py
  GTG/gtk/backends_dialog/parameters_ui/textui.py
  GTG/gtk/crashhandler.py
  GTG/info.py
  GTG/tests/test_backend_tomboy.py
  gtg_new_task
pending merges:
  Daniel Neel 2011-01-02 Various pyflakes fixes
    Daniel Neel 2010-12-30 Updated the description of the info.py module.
    Daniel Neel 2010-12-30 Fixed a couple typos in comments.

=== modified file 'GTG/core/datastore.py'
--- GTG/core/datastore.py	2010-10-05 07:49:00 +0000
+++ GTG/core/datastore.py	2011-01-03 03:06:45 +0000
@@ -810,4 +810,3 @@
             return self.datastore.requester.get_all_tags
         else:
             raise AttributeError("No attribute %s" %attr)
-

=== modified file 'GTG/gtg.py'
--- GTG/gtg.py	2010-10-05 07:49:00 +0000
+++ GTG/gtg.py	2011-01-03 03:06:45 +0000
@@ -37,7 +37,7 @@
 #
 #   Each id are *strings*
 #   tid are the form "X@Y" where Y is the pid.
-#   For example : 21@2 is the 21th task of the 2nd project
+#   For example : 21@2 is the 21st task of the 2nd project
 #   This way, we are sure that a tid is unique accross multiple projects
 #
 #==============================================================================
@@ -51,7 +51,7 @@
 import dbus
 
 #our own imports
-from GTG.backends              import BackendFactory
+from GTG.backends       import BackendFactory
 from GTG                import _
 from GTG.core           import CoreConfig
 from GTG.core.datastore import DataStore
@@ -90,7 +90,7 @@
                 if uri.startswith("gtg://"):
                     d.open_task_editor(uri[6:])
             raise SystemExit
-            
+
     #write the pid file
     with open(pidfile, "w") as f:
         f.write(`os.getpid()`)
@@ -113,10 +113,10 @@
             manager.main(once_thru=options.boot_test, uri_list = args)
     else:
         manager.main(once_thru=options.boot_test, uri_list = args)
-    core_main_quit(req,ds)
+    core_main_quit(req, ds)
 
 def core_main_init(options = None, args = None):
-    ''' 
+    '''
     Part of the main function prior to the UI initialization.
     '''
     # Debugging subsystem initialization
@@ -131,19 +131,19 @@
     backends_list = BackendFactory().get_saved_backends_list()
     # Load data store
     ds = DataStore(config)
-    # Register backends 
+    # Register backends
     for backend_dic in backends_list:
         ds.register_backend(backend_dic)
     #save the backends directly to be sure projects.xml is written
     ds.save(quit = False)
-    
+
     # Launch task browser
     req = ds.get_requester()
     return ds, req
 
-def core_main_quit(req,ds):
+def core_main_quit(req, ds):
     '''
-    Last bits of code executed in GTG, after the UI has been shut off. 
+    Last bits of code executed in GTG, after the UI has been shut off.
     Currently, it's just saving everything.
     '''
     # Ideally we should load window geometry configuration from a config

=== modified file 'GTG/gtk/backends_dialog/parameters_ui/__init__.py'
--- GTG/gtk/backends_dialog/parameters_ui/__init__.py	2010-09-04 17:52:42 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/__init__.py	2011-01-03 03:06:45 +0000
@@ -17,7 +17,7 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 '''
-This modules reads a bakcn configuration and generates a series of widgets to
+This module reads a bakcn configuration and generates a series of widgets to
 let the user see the configuration and modify it.
 In this manner, backends do not need to know anything about their UI since it's
 built for them: it should play along the lines of the separation between GTG
@@ -146,4 +146,3 @@
         def _commit_changes(child):
             child.commit_changes()
         self.foreach(_commit_changes)
-

=== modified file 'GTG/gtk/backends_dialog/parameters_ui/checkboxui.py'
--- GTG/gtk/backends_dialog/parameters_ui/checkboxui.py	2010-08-05 21:33:37 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/checkboxui.py	2011-01-03 03:06:45 +0000
@@ -69,4 +69,3 @@
         '''
         if self.backend.is_enabled() and not self.backend.is_default():
             self.req.set_backend_enabled(self.backend.get_id(), False)
-

=== modified file 'GTG/gtk/backends_dialog/parameters_ui/textui.py'
--- GTG/gtk/backends_dialog/parameters_ui/textui.py	2010-09-04 17:52:42 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/textui.py	2011-01-03 03:06:45 +0000
@@ -75,4 +75,3 @@
         '''
         if self.backend.is_enabled() and not self.backend.is_default():
             self.req.set_backend_enabled(self.backend.get_id(), False)
-

=== modified file 'GTG/gtk/crashhandler.py'
--- GTG/gtk/crashhandler.py	2010-06-22 19:55:15 +0000
+++ GTG/gtk/crashhandler.py	2011-01-03 03:06:45 +0000
@@ -55,11 +55,11 @@
 
 APP_NAME = None
 MESSAGE = _("We're terribly sorry. Could you help us fix the problem by " \
-		  "reporting the crash?")
+          "reporting the crash?")
 USE_APPORT = False
 
 _old_sys_excepthook = None # None means that initialize() has not been called
-						   # yet.
+                           # yet.
 
 dialog = None
 
@@ -81,11 +81,11 @@
     """
     global APP_NAME, MESSAGE, USE_APPORT, _gtk_initialized, _old_sys_excepthook
     if app_name:
-    	APP_NAME = _(app_name)
+        APP_NAME = _(app_name)
     if not message is None:
-    	MESSAGE = _(message)
+        MESSAGE = _(message)
     if use_apport:
-    	USE_APPORT = use_apport
+        USE_APPORT = use_apport
     if _gtk_initialized == True and _old_sys_excepthook is None:
         # save sys.excepthook first, as it may not be sys.__excepthook__
         # (for example, it might be Apport's python hook)
@@ -107,12 +107,12 @@
     add_apport_button = False
     global USE_APPORT
     if USE_APPORT:
-    	# see if this file is from a properly installed distribution package
+        # see if this file is from a properly installed distribution package
         try:
             from apport.fileutils import likely_packaged
             try:
                 filename = os.path.realpath(os.path.join(os.getcwdu(),
-                	sys.argv[0]))
+                    sys.argv[0]))
             except:
                 filename = os.path.realpath("/proc/%i/exe" % os.getpid())
             if not os.path.isfile(filename) or not os.access(filename, os.X_OK):
@@ -130,7 +130,7 @@
             import re
             from apport.packaging_impl import impl as apport_packaging
             newconfiguration = "# temporary apport configuration file " \
-                        	   "by gtkcrashhandler.py\n\n"
+                               "by gtkcrashhandler.py\n\n"
             try:
                 for line in open(apport_packaging.configuration):
                     if re.search('^\s*enabled\s*=\s*0\s*$', line) is None:
@@ -186,7 +186,6 @@
     text_label = gtk.Label()
     text_label.set_markup(MESSAGE)
     text_label.set_alignment(0, 0.5)
-    
     text_label.set_line_wrap(True)
     def text_label_size_allocate(widget, rect):
         """Lets label resize correctly while wrapping text."""
@@ -242,11 +241,11 @@
 
 def on_expanded(widget):
     global dialog
-    dialog.set_size_request(600,600)
+    dialog.set_size_request(600, 600)
 
 
 def gtkcrashhandler_thread(run):
-    """gtkcrashhandler_thread is a decorator for the run() method of 
+    """gtkcrashhandler_thread is a decorator for the run() method of
     threading.Thread.
 
     If you forget to use this decorator, exceptions in threads will be
@@ -273,7 +272,7 @@
             if gtk.main_level() > 0:
                 gobject.idle_add(
                     lambda ee=ee, tb=tb, thread=threading.currentThread():
-                    _replacement_excepthook(ee.__class__,ee,tb,thread=thread))
+                    _replacement_excepthook(ee.__class__, ee, tb, thread=thread))
             else:
                 time.sleep(0.1) # ugly hack, seems like threads that are
                                 # started before running gtk.main() cause
@@ -295,9 +294,9 @@
 if __name__ == "__main__":
     # throw test exception
     initialize(app_name="gtkcrashhandler", message="Don't worry, though. This "
-    	"is just a test. To use the code properly, call "
-    	"gtkcrashhandler.initialize() in your PyGTK app to automatically catch "
-    	" any Python exceptions like this.")
+        "is just a test. To use the code properly, call "
+        "gtkcrashhandler.initialize() in your PyGTK app to automatically catch "
+        " any Python exceptions like this.")
     class DoNotRunException(Exception):
         def __str__(self):
             return "gtkcrashhandler.py should imported, not run"
@@ -312,7 +311,7 @@
 def signal_catcher(callback):
     #if TERM or ABORT are caught, we execute the callback function
     for s in [signal.SIGABRT, signal.SIGTERM]:
-        signal.signal(s, lambda a,b: callback())
+        signal.signal(s, lambda a, b: callback())
     yield
 
 initialize(app_name = "Getting Things GNOME!",

=== modified file 'GTG/info.py'
--- GTG/info.py	2010-08-21 03:41:50 +0000
+++ GTG/info.py	2011-01-03 03:06:45 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Various information about GTG. Should be updated for every release."""
+"""Various information about GTG. Should be updated for every release. Contains the information displayed in GTG's Credits."""
 
 NAME            = "Getting Things GNOME!"
 URL             = "http://gtg.fritalk.com"

=== modified file 'GTG/tests/test_backend_tomboy.py'
--- GTG/tests/test_backend_tomboy.py	2010-09-08 14:06:32 +0000
+++ GTG/tests/test_backend_tomboy.py	2011-01-03 03:06:45 +0000
@@ -393,4 +393,3 @@
     def _fake_quit(self):
         self.main_loop.quit()
         sys.exit(0)
-

=== modified file 'gtg_new_task'
--- gtg_new_task	2010-08-04 00:43:25 +0000
+++ gtg_new_task	2011-01-03 03:06:45 +0000
@@ -20,7 +20,7 @@
 # -----------------------------------------------------------------------------
 
 """
-This script create a new task and launch the editor to display it. GTG should be running
+This script creates a new task and launches the editor to display it. GTG should be running
 """
 
 import re