Changeset 1486

Timestamp:

07/10/08 22:43:06 (7 weeks ago)

Author:

rob

Message:

Removed some debug printing

Location:

trunk/peppy

Files:

• lib/userparams.py (modified) (3 diffs)
• plugins/project.py (modified) (19 diffs)

trunk/peppy/lib/userparams.py

@@ -1432 +1432 @@
         hier = cls.__mro__
         for cls in hier:
-            dprint("checking %s" % cls)
+            #dprint("checking %s" % cls)
             if 'default_prefs' not in dir(cls):
                 continue
@@ -1443 +1443 @@
         hier = self.__class__.__mro__
         for cls in hier:
-            dprint("checking %s" % cls)
+            #dprint("checking %s" % cls)
             if 'default_prefs' not in dir(cls):
                 continue
@@ -1483 +1483 @@
         hier = self.__class__.__mro__
         for cls in hier:
-            dprint("checking %s" % cls)
+            #dprint("checking %s" % cls)
             if 'default_prefs' not in dir(cls):
                 continue

trunk/peppy/plugins/project.py

@@ -65 +65 @@
     def regenerateTags(self):
         # need to operate on the local filesystem
-        dprint(self.project_top_dir)
+        self.dprint(self.project_top_dir)
         if self.project_top_dir.scheme != "file":
             raise TypeError("Can only process ctags on local filesystem")
@@ -78 +78 @@
         args = "%s %s %s -o %s" % (ProjectPlugin.classprefs.ctags_args, self.ctags_extra_args, excludes, ctags_file)
         cmd = "%s %s" % (ProjectPlugin.classprefs.ctags_command, args)
-        dprint(cmd)
+        self.dprint(cmd)
         
         output = JobOutputSaver(self.regenerateFinished)
@@ -84 +84 @@
     
     def regenerateFinished(self, output):
-        dprint(output)
+        self.dprint(output)
         if output.exit_code == 0:
             self.loadTags()
@@ -114 +114 @@
                     self.dprint(line)
         except LookupError, e:
-            dprint("Tag file %s not found" % filename)
+            self.dprint("Tag file %s not found" % filename)
             pass
     
@@ -187 +187 @@
                 self.readConfig(fh)
             for param in self.iterPrefs():
-                dprint("%s = %s" % (param.keyword, getattr(self, param.keyword)))
-            dprint(self.configToText())
+                self.dprint("%s = %s" % (param.keyword, getattr(self, param.keyword)))
+            self.dprint(self.configToText())
         except LookupError:
-            dprint("Project file not found -- using defaults.")
+            self.dprint("Project file not found -- using defaults.")
             self.setDefaultPrefs()
     
@@ -199 +199 @@
             fh.write(text)
         except:
-            dprint("Failed writing project config file")
+            self.dprint("Failed writing project config file")
     
     def registerProcess(self, job):
@@ -211 +211 @@
     
     def build(self, frame):
-        dprint("Compiling %s in %s" % (self.build_command, self.build_dir))
+        self.dprint("Compiling %s in %s" % (self.build_command, self.build_dir))
         output = JobOutputSidebarController(frame, self.registerProcess, self.deregisterProcess)
         ProcessManager().run(self.build_command, self.build_dir, output)
     
     def run(self, frame):
-        dprint("Running %s in %s" % (self.run_command, self.run_dir))
+        self.dprint("Running %s in %s" % (self.run_command, self.run_dir))
         output = JobOutputSidebarController(frame, self.registerProcess, self.deregisterProcess)
         ProcessManager().run(self.run_command, self.run_dir, output)
@@ -237 +237 @@
     def getNonInlineName(self):
         lookup = self.mode.check_spelling[0]
-        dprint(lookup)
+        self.dprint(lookup)
         return lookup or "ctags unavailable"
 
@@ -245 +245 @@
         if self.mode.project_info:
             lookup = self.mode.check_spelling[0]
-            dprint(lookup)
+            self.dprint(lookup)
             self.tags = self.mode.project_info.getTag(lookup)
             if self.tags:
@@ -265 +265 @@
         file = self.tags[index][0]
         addr = self.tags[index][1]
-        dprint("opening %s at line %s" % (file, addr))
+        self.dprint("opening %s at line %s" % (file, addr))
         try:
             line = int(addr)
@@ -315 +315 @@
     def action(self, index=-1, multiplier=1):
         pathname = ProjectPlugin.getFilename(self.mode.keyword)
-        dprint(pathname)
+        self.dprint(pathname)
         self.mode.save(pathname)
 
@@ -396 +396 @@
         pm = wx.GetApp().plugin_manager
         plugins = pm.getPluginInfo(ProjectPlugin)
-        dprint(plugins)
+        self.dprint(plugins)
         
         self.plugin = PluginPanel(self.notebook, plugins[0])
@@ -429 +429 @@
         if retval == wx.ID_OK:
             path = dlg.GetPath()
-            dprint(path)
+            self.dprint(path)
             info = ProjectPlugin.createProject(path)
         else:
@@ -530 +530 @@
         for configname in names:
             try:
-                dprint("Trying to load template %s" % configname)
+                cls.dprint("Trying to load template %s" % configname)
                 fh = vfs.open(configname)
                 template = fh.read()
@@ -551 +551 @@
     @classmethod
     def findProjectTemplate(cls, mode):
-        dprint(mode)
+        cls.dprint(mode)
         if mode.project_info:
             url = mode.project_info.getSettingsRelativeURL(cls.classprefs.template_directory)
-            dprint(url)
+            cls.dprint(url)
             if vfs.is_folder(url):
                 template = cls.findTemplate(url, mode, mode.buffer.url)
@@ -573 +573 @@
         # Look for a new project path
         last = vfs.normalize(vfs.get_dirname(url))
-        dprint(str(last.path))
+        cls.dprint(str(last.path))
         while not last.path.is_relative() and True:
             path = last.resolve2("%s" % (cls.classprefs.project_directory))
-            dprint(path.path)
+            cls.dprint(path.path)
             if vfs.is_folder(path):
                 cls.known_project_dirs[url] = path
@@ -582 +582 @@
             path = vfs.get_dirname(path.resolve2('..'))
             if path == last:
-                dprint("Done!")
+                cls.dprint("Done!")
                 break
             last = path
@@ -599 +599 @@
             if mode:
                 mode.project_info = info
-            dprint("found project %s" % info)
+            cls.dprint("found project %s" % info)
             return info
         elif mode:
@@ -620 +620 @@
         info = cls.registerProject(None, proj_dir)
         info.savePrefs()
-        dprint(info)
+        cls.dprint(info)
         buffers = BufferList.getBuffers()
         for buffer in buffers:
             if buffer.url.scheme != "file":
                 continue
-            dprint("prefix=%s topdir=%s" % (buffer.url.path.get_prefix(url.path), url.path))
+            cls.dprint("prefix=%s topdir=%s" % (buffer.url.path.get_prefix(url.path), url.path))
             if buffer.url.path.get_prefix(url.path) == url.path:
-                dprint("belongs in project! %s" % buffer.url.path)
+                cls.dprint("belongs in project! %s" % buffer.url.path)
                 for mode in buffer.iterViewers():
                     mode.project_info = info
             else:
-                dprint("not in project: %s" % buffer.url.path)
+                cls.dprint("not in project: %s" % buffer.url.path)
         return info