Re: [Tutor] Diff for Python
I like ExamDiff, and find the free version sufficient for my purposes. < http://www.prestosoft.com/edp_examdiff.asp> "ExamDiff is a freeware Windows 95/98/Me/NT/2000/XP/2003/Vista tool for visual file comparison. It has a number of simple and convenient features that many users have been asking for a long time from a file comparison tool." from < http://www.prestosoft.com/edp_edfeatures.asp>: == ExamDiff offers the following features: There is no need to specify both filenames -- just enter a directory name for one of the files to be compared. ExamDiff will try to use an entered filename with a specified directory name. Remembers a user specified number of last compared first and second files. This allows quick selection of the two files the user wishes to compare. Automatically detects file changes and prompts the user to re-compare files. One push re-compare function which attempts to leave the viewer's focus in the same place as before the re-compare. Drag and drop support for dropping one or two files into the program's window (e.g. from Windows Explorer). Easy editing of the first and second files. ExamDiff will spawn any editor (configurable by the user) with the first or second file, and line number option (available for editors that support this, through ExamDiff variables: $FILE (first or second file name), $CURFIFF (number of line at which the current difference starts), and $CARET (number of line where the caret is located). Saves the file differences in a standard UNIX DIFF file. Easy navigation through the differences via "Previous Difference"/ "Current difference"/ "Next Difference" buttons and hot keys or via a drop-down list box of all the differences Allows the copying of text from the comparison panes via drag and drop, a hot key, or a right button pop up. Simple "Search" command to search for strings in the comparison panes. It also remembers a user specified number of most recent searches. Customizable text and background colors, font, tab size, and "Show Differences Only" option as well as options to "Ignore white spaces in lines", "Ignore changes in amount of white spaces in lines", "Ignore case", "Treat files as text files", "Ignore leading white space in lines" and "Ignore trailing white space in lines" for comparison. Fully customizable file extension filter. For example, the user can choose only .c and .cpp files or any other files he/she chooses to be displayed. Tooltips which include file properties (when the mouse cursor is placed over the pane title bars), difference number (when the cursor is over the yellow triangle marking the current difference), and etc. Adjustable pane splitter with smooth synchronized scrolling. Allows easy toggling between horizontal and vertical splitter orientation as well as splitter centering and panes hiding. Command line options include: Usage: ExamDiff [Filename1] [Filename2] [Options] Filename1, Filename2 are names of files to be compared Options are any of: /i ignore case /w ignore all white space in lines /b ignore changes in amount of white space in lines /l ignore leading white space in lines /e ignore trailing white space in lines /t treat both files as text files /d show differences only /n don't show initial "Compare Files" dialog /aN scroll trough all differences with N second delay and exit after the last difference /?,/h print this screen NOTE: if options /i, /w, /b, /l, /e, /t, or /d are not set, the last used options remain in effect. from < http://www.prestosoft.com/edp_examdiff.asp#3> What ExamDiff Cannot Do (But ExamDiff Pro Can) Compare directories and binary files. Highlight file differences down to the level of words or characters in changed lines. Ignore lines and part of lines matching regular expressions. Print (and print preview) the diff report. Word wrap long lines. Edit files inside comparison panes. Use named comparison sessions. Support Unicode. === The price of ExamDiff Pro is $35. Dick Moores ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
Re: [Tutor] Diff for Python
Sorry - forgot to reply to the list the first time... On Sat, Apr 5, 2008 at 3:04 PM, Alan Gauld <[EMAIL PROTECTED]> wrote: > On Windows you can use FC - File Compare. > Its not as powerful as diff but it will highlight differences. > On Windows, I've tried a bunch of diff tools - it's probably the way my brain is wired, but I generally find it harder to understand what the diff tool is telling me than it would have been to print out the damn files and compare them on paper. I feel like I'm being given clues so I can work out the puzzle myself... if I wanted that, I would do a crossword, not use a software tool. So my tool of choice (since I discovered it about three months ago) is the Compare plugin in Notepad++. It simply displays the files in separate child windows, forcibly aligns them with "soft" newlines, and synchronizes the windows' scrollbars to keep them lined up side by side. It also shades the lines in different colors depending on whether the lines are the same in both files, or one file has a line that the other doesn't, or both files have the line but different versions. None of this is new, of course, but I've never used a tool before that got it all so _right_ and made it so simple to use and to read. (Open two or more files in the editor, hit Alt-D, read. If necessary, cut and paste between the windows - hit Alt-D again to resync - read.) I'm sure there are more sophisticated choices. Honestly, I sometimes feel a little guilty using it, 'cause I think I ought to be working harder... I'm sure that both vi and emacs do this in a way that mere mortals such as I cannot appreciate, but I think you must have had to start using either vi or emacs at a very early age to be able to enjoy the experience. I'm putting on my flame-retardant Nomex suit as I type this. (Tying this thread in with one from last week...) As a general-purpose Windows editor, I definitely recommend Notepad++. (It's free, but I moved to it from TextPad, in which I had invested $50. If you knew me, you'd know what high praise this is for Notepad++.) For Python / wxPython development, though, I love me some SPE. -- www.fsrtechnologies.com ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
Re: [Tutor] Diff for Python
On Windows you can use FC - File Compare. Its not as powerful as diff but it will highlight differences. Help FC will get you the switch options. Or just use cygwin - any Unix user on Windows should get cygwin as a matter of course IMHO! :-) Alan G. "Eric Walstad" <[EMAIL PROTECTED]> wrote in message news:[EMAIL PROTECTED] > And my whoops, I should have sent my first one to the list, too. > > I don't run Windows very often. I think 'WinDiff' is what I used > there. Have you tried that? > > There's always cygwin, too. > > Eric. > On Sat, Apr 5, 2008 at 12:28 PM, Wayne Watson > <[EMAIL PROTECTED]> wrote: >> >> Whoop, I should have specified I'm on Win XP. >> >> >> Eric Walstad wrote: >> Hi Wayne, >> >> On Fri, Apr 4, 2008 at 8:37 PM, Wayne Watson >> <[EMAIL PROTECTED]> wrote: >> >> >> Is there a Linux diff-like command for Python code? I'd like to >> see the >> difference between two py files. >> >> Why don't you just use diff? >> What OS are you on? >> >> diff -Bu fileone.py filezero.py > ___ > Tutor maillist - Tutor@python.org > http://mail.python.org/mailman/listinfo/tutor > ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
Re: [Tutor] Diff for Python
And my whoops, I should have sent my first one to the list, too. I don't run Windows very often. I think 'WinDiff' is what I used there. Have you tried that? There's always cygwin, too. Eric. On Sat, Apr 5, 2008 at 12:28 PM, Wayne Watson <[EMAIL PROTECTED]> wrote: > > Whoop, I should have specified I'm on Win XP. > > > Eric Walstad wrote: > Hi Wayne, > > On Fri, Apr 4, 2008 at 8:37 PM, Wayne Watson > <[EMAIL PROTECTED]> wrote: > > > Is there a Linux diff-like command for Python code? I'd like to see the > difference between two py files. > > Why don't you just use diff? > What OS are you on? > > diff -Bu fileone.py filezero.py ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
Re: [Tutor] Diff for Python
Vim also has a similar command On Sat, Apr 5, 2008 at 12:59 AM, Terry Carroll <[EMAIL PROTECTED]> wrote: > On Fri, 4 Apr 2008, Wayne Watson wrote: > > > Is there a Linux diff-like command for Python code? I'd like to see the > > difference between two py files. > > You could just use diff. > > Python itself also has difflib: > > http://python.org/doc/2.5/lib/module-difflib.html > > > > ___ > Tutor maillist - Tutor@python.org > http://mail.python.org/mailman/listinfo/tutor > -- To be considered stupid and to be told so is more painful than being called gluttonous, mendacious, violent, lascivious, lazy, cowardly: every weakness, every vice, has found its defenders, its rhetoric, its ennoblement and exaltation, but stupidity hasn't. - Primo Levi ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
Re: [Tutor] Diff for Python
On Fri, 4 Apr 2008, Wayne Watson wrote: > Is there a Linux diff-like command for Python code? I'd like to see the > difference between two py files. You could just use diff. Python itself also has difflib: http://python.org/doc/2.5/lib/module-difflib.html ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
[Tutor] Diff for Python
Is there a Linux diff-like command for Python code? I'd like to see the difference between two py files. -- Wayne Watson (Watson Adventures, Prop., Nevada City, CA) (121.015 Deg. W, 39.262 Deg. N) GMT-8 hr std. time) Obz Site: 39° 15' 7" N, 121° 2' 32" W, 2700 feet "Philosophy is questions that may never be answered. Religion is answers that may never be questioned" -- Anon Web Page: ___ Tutor maillist - Tutor@python.org http://mail.python.org/mailman/listinfo/tutor
