python/console/console_editor.py

@@ -345,18 +345,13 @@ def objectListEditor(self):
         else:
             listObj.show()
             self.parent.pc.objectListButton.setChecked(True)
-    
+
     def codepad(self):
         import urllib2, urllib
         listText = self.selectedText().split('\n')
         getCmd = []
         for strLine in listText:
-            if strLine != "":
-            #if s[0:3] in (">>>", "..."):
-                # filter for special command (_save,_clear) and comment
-                if strLine[4] != "_" and strLine[:2] != "##":
-                    strLine.replace(">>> ", "").replace("... ", "")
-                    getCmd.append(unicode(strLine))
+            getCmd.append(unicode(strLine))
         pasteText= u"\n".join(getCmd)
         url = 'http://codepad.org'
         values = {'lang' : 'Python',
@@ -389,32 +384,24 @@ def commentEditorCode(self, commentCheck):
         if self.hasSelectedText():
             startLine, _, endLine, _ = self.getSelection()
             for line in range(startLine, endLine + 1):
-                selCmd = self.text(line)
-                self.setSelection(line, 0, line, selCmd.length())
-                self.removeSelectedText()
                 if commentCheck:
-                    self.insert('#' + selCmd)
-                    self.setCursorPosition(endLine, selCmd.length())
+                    self.insertAt('#', line, 0)
                 else:
-                    if selCmd.startsWith('#'):
-                        self.insert(selCmd[1:])
-                    else:
-                        self.insert(selCmd)
-                    self.setCursorPosition(endLine, self.text(line).length() - 1)
+                    if not self.text(line).trimmed().startsWith('#'):
+                        continue
+                    self.setSelection(line, self.indentation(line), 
+                                      line, self.indentation(line) + 1)
+                    self.removeSelectedText()
         else:
             line, pos = self.getCursorPosition()
-            selCmd = self.text(line)
-            self.setSelection(line, 0, line, selCmd.length())
-            self.removeSelectedText()
             if commentCheck:
-                self.insert('#' + selCmd)
-                self.setCursorPosition(line, selCmd.length())
+                self.insertAt('#', line, 0)
             else:
-                if selCmd.startsWith('#'):
-                    self.insert(selCmd[1:])
-                else:
-                    self.insert(selCmd)
-                self.setCursorPosition(line, self.text(line).length() - 1)
+                if not self.text(line).trimmed().startsWith('#'):
+                    return
+                self.setSelection(line, self.indentation(line), 
+                                  line, self.indentation(line) + 1)
+                self.removeSelectedText()
         self.endUndoAction()
 
     def createTempFile(self):