← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to wxPython/wx/py/parse.py

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wxPython/wx/py/parse.py
56
56
                while currentIndentation<indentNumber[-1]:
57
57
                    indentNumber.pop() # This is the end of an indentation block
58
58
            elif not ignoreErrors:
59
 
                print 'Invalid Indentation!!'
 
59
                #print 'Invalid Indentation!!'
60
60
                return ['Invalid Indentation Error',i]
61
61
        
62
62
        firstWord = re.match(' *\w*',l).group().lstrip()
87
87
                        if paraMarkDict[paraList[-1]]==j:
88
88
                            paraList.pop()
89
89
                        elif not ignoreErrors:
90
 
                            print 'Invalid Syntax!!'
 
90
                            #print 'Invalid Syntax!!'
91
91
                            return ['Invalid Syntax Error',i]
92
92
                    if j in openMarks:
93
93
                        paraList.append(j)
116
116
    if (stringContinuationList[-1] or indentationBlockList[-1] or \
117
117
       lineContinuationList[-1] or parentheticalContinuationList[-1]) \
118
118
       and not ignoreErrors:
119
 
        print 'Incomplete Syntax!!'
 
119
        #print 'Incomplete Syntax!!'
120
120
        return ['Incomplete Syntax Error',i]
121
121
    
122
122
    if newIndent and not ignoreErrors:
123
 
        print 'Incomplete Indentation!'
 
123
        #print 'Incomplete Indentation!'
124
124
        return ['Incomplete Indentation Error',i]
125
125
    
126
126
    # Note that if one of these errors above gets thrown, the best solution is to pass the resulting block