Thread: [Epydoc-commits] SF.net SVN: epydoc: [1166] trunk/epydoc/src/epydoc/util.py
Brought to you by:
edloper
From: <ed...@us...> - 2006-04-05 16:49:45
|
Revision: 1166 Author: edloper Date: 2006-04-05 09:49:40 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1166&view=rev Log Message: ----------- - Removed unused function Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2006-04-05 02:35:07 UTC (rev 1165) +++ trunk/epydoc/src/epydoc/util.py 2006-04-05 16:49:40 UTC (rev 1166) @@ -80,30 +80,6 @@ return 'script-'+name ###################################################################### -## Backwards compatibility -###################################################################### - -def py_sorted(iterable, cmp=None, key=None, reverse=False): - """ - A python drop-in replacement for the builtin C{sorted}, which was - introduced in Python 2.4. This is used for backwards - compatibility. - """ - if key is None: - elts = list(iterable) - else: - elts = [(key(v), v) for v in iterable] - - if reverse: elts.reverse() - if cmp is None: elts.sort() - else: elts.sort(cmp) - - if key is None: - return elts - else: - return [v for (k,v) in elts] - -###################################################################### ## Text Processing ###################################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2006-08-21 10:15:11
|
Revision: 1264 Author: edloper Date: 2006-08-21 03:15:08 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1264&view=rev Log Message: ----------- - Use absolute paths when checking if a directory is a package. (otherwise, we would get the wrong answer when checking the directory '.'). Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2006-08-21 10:14:18 UTC (rev 1263) +++ trunk/epydoc/src/epydoc/util.py 2006-08-21 10:15:08 UTC (rev 1264) @@ -45,6 +45,7 @@ # Make sure it's a directory. if not os.path.isdir(dirname): return False + dirname = os.path.abspath(dirname) # Make sure it's a valid identifier. (Special case for # "foo/", where os.path.split -> ("foo", "").) (parent, dir) = os.path.split(dirname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2006-08-21 11:34:41
|
Revision: 1271 Author: edloper Date: 2006-08-21 04:34:36 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1271&view=rev Log Message: ----------- - Made py_src_filename's ValueError a little more verbose. Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2006-08-21 11:34:12 UTC (rev 1270) +++ trunk/epydoc/src/epydoc/util.py 2006-08-21 11:34:36 UTC (rev 1271) @@ -73,7 +73,7 @@ return '%s%s' % (basefile, ext) else: raise ValueError('Could not find a corresponding ' - 'Python source file.') + 'Python source file for %r.' % filename) def munge_script_name(filename): name = os.path.split(filename)[1] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2006-08-23 16:17:24
|
Revision: 1310 Author: edloper Date: 2006-08-23 09:17:18 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/epydoc/?rev=1310&view=rev Log Message: ----------- - changed is_module_file() and is_package_dir() to return false when given a non-string object (rather than raising an exception) Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2006-08-23 15:58:06 UTC (rev 1309) +++ trunk/epydoc/src/epydoc/util.py 2006-08-23 16:17:18 UTC (rev 1310) @@ -26,6 +26,9 @@ PY_BIN_EXTENSIONS = ['.pyc', '.so', '.pyd'] def is_module_file(path): + # Make sure it's a file name. + if not isinstance(path, basestring): + return False (dir, filename) = os.path.split(path) (basename, extension) = os.path.splitext(filename) return (os.path.isfile(path) and @@ -42,7 +45,9 @@ (i.e., it names a directory that contsains a valid __init__ file, and its name is a valid identifier). """ - # Make sure it's a directory. + # Make sure it's a directory name. + if not isinstance(dirname, basestring): + return False if not os.path.isdir(dirname): return False dirname = os.path.abspath(dirname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-02-04 02:57:24
|
Revision: 1431 http://svn.sourceforge.net/epydoc/?rev=1431&view=rev Author: dvarrazzo Date: 2007-02-03 18:57:23 -0800 (Sat, 03 Feb 2007) Log Message: ----------- - In case of a IOError, raise OSError instead, to respect the function signature enforced by many callers. IOError may happen e.g. when the program is not found. Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2007-02-04 02:45:37 UTC (rev 1430) +++ trunk/epydoc/src/epydoc/util.py 2007-02-04 02:57:23 UTC (rev 1431) @@ -269,7 +269,11 @@ else: to_child, from_child, child_err = os.popen3(' '.join(cmd), 'b') if data: - to_child.write(data) + try: + to_child.write(data) + # Guard for a broken pipe error + except IOError, e: + raise OSError(e) to_child.close() err = child_err.read() out = from_child.read() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2007-09-24 21:39:49
|
Revision: 1639 http://epydoc.svn.sourceforge.net/epydoc/?rev=1639&view=rev Author: edloper Date: 2007-09-24 14:39:48 -0700 (Mon, 24 Sep 2007) Log Message: ----------- - Fixed typo Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2007-09-24 18:45:54 UTC (rev 1638) +++ trunk/epydoc/src/epydoc/util.py 2007-09-24 21:39:48 UTC (rev 1639) @@ -42,7 +42,7 @@ def is_package_dir(dirname): """ Return true if the given directory is a valid package directory - (i.e., it names a directory that contsains a valid __init__ file, + (i.e., it names a directory that contains a valid __init__ file, and its name is a valid identifier). """ # Make sure it's a directory name. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dva...@us...> - 2007-09-24 22:55:22
|
Revision: 1641 http://epydoc.svn.sourceforge.net/epydoc/?rev=1641&view=rev Author: dvarrazzo Date: 2007-09-24 15:55:21 -0700 (Mon, 24 Sep 2007) Log Message: ----------- - Don't assume Python sources really exist in the file system: with some import hooks (e.g. compressed .egg) this is not the case. Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2007-09-24 22:46:11 UTC (rev 1640) +++ trunk/epydoc/src/epydoc/util.py 2007-09-24 22:55:21 UTC (rev 1641) @@ -37,6 +37,7 @@ def is_src_filename(filename): if not isinstance(filename, basestring): return False + if not os.path.exists(filename): return False return os.path.splitext(filename)[1] in PY_SRC_EXTENSIONS def is_package_dir(dirname): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-01-29 02:21:43
|
Revision: 1669 http://epydoc.svn.sourceforge.net/epydoc/?rev=1669&view=rev Author: edloper Date: 2008-01-28 18:21:41 -0800 (Mon, 28 Jan 2008) Log Message: ----------- Removed constraint in is_package_dir requiring package directory names to be valid identifiers, persuant to sourceforge bug #1787028. Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2008-01-29 01:54:56 UTC (rev 1668) +++ trunk/epydoc/src/epydoc/util.py 2008-01-29 02:21:41 UTC (rev 1669) @@ -56,9 +56,12 @@ # "foo/", where os.path.split -> ("foo", "").) (parent, dir) = os.path.split(dirname) if dir == '': (parent, dir) = os.path.split(parent) - if not re.match('\w+$', dir): - return False + # The following constraint was removed because of sourceforge + # bug #1787028 -- in some cases (eg eggs), it's too strict. + #if not re.match('\w+$', dir): + # return False + for name in os.listdir(dirname): filename = os.path.join(dirname, name) if name.startswith('__init__.') and is_module_file(filename): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-01-29 02:55:51
|
Revision: 1671 http://epydoc.svn.sourceforge.net/epydoc/?rev=1671&view=rev Author: edloper Date: 2008-01-28 18:55:49 -0800 (Mon, 28 Jan 2008) Log Message: ----------- - For run_subprocess() on py <2.3 non-unix systems, read stdout before reading stderr, as suggested by sourceforge bug #1838649. Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2008-01-29 02:43:32 UTC (rev 1670) +++ trunk/epydoc/src/epydoc/util.py 2008-01-29 02:55:49 UTC (rev 1671) @@ -279,8 +279,8 @@ except IOError, e: raise OSError(e) to_child.close() + out = from_child.read() err = child_err.read() - out = from_child.read() # Assume that there was an error iff anything was written # to the child's stderr. if err == '': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-15 01:02:31
|
Revision: 1721 http://epydoc.svn.sourceforge.net/epydoc/?rev=1721&view=rev Author: edloper Date: 2008-02-14 17:02:30 -0800 (Thu, 14 Feb 2008) Log Message: ----------- - Minor changes to TerminalController class Modified Paths: -------------- trunk/epydoc/src/epydoc/util.py Modified: trunk/epydoc/src/epydoc/util.py =================================================================== --- trunk/epydoc/src/epydoc/util.py 2008-02-15 01:01:08 UTC (rev 1720) +++ trunk/epydoc/src/epydoc/util.py 2008-02-15 01:02:30 UTC (rev 1721) @@ -309,10 +309,12 @@ BOLD = '' #: Turn on bold mode NORMAL = '' #: Turn off all modes COLS = 75 #: Width of the terminal (default to 75) + UNDERLINE = '' #: Underline the text + REVERSE = '' #: Reverse the foreground & background BLACK = BLUE = GREEN = CYAN = RED = MAGENTA = YELLOW = WHITE = '' _STRING_CAPABILITIES = """ - BOL=cr UP=cuu1 DOWN=cud1 LEFT=cub1 RIGHT=cuf1 + BOL=cr UP=cuu1 DOWN=cud1 LEFT=cub1 RIGHT=cuf1 REVERSE=rev CLEAR_EOL=el BOLD=bold UNDERLINE=smul NORMAL=sgr0""".split() _COLORS = """BLACK BLUE GREEN CYAN RED MAGENTA YELLOW WHITE""".split() _ANSICOLORS = "BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE".split() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |