[Epydoc-commits] SF.net SVN: epydoc: [1577] trunk/epydoc/src/epydoc

[<dva...@us...>]

Revision: 1577
          http://svn.sourceforge.net/epydoc/?rev=1577&view=rev
Author:   dvarrazzo
Date:     2007-03-09 15:26:21 -0800 (Fri, 09 Mar 2007)

Log Message:
-----------
- Small optimization trick: ``in`` is way faster than ``has_key()``. The 
  former is a single opcode while the latter involves a lookup and the call 
  to a bound method.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docparser.py
    trunk/epydoc/src/epydoc/docwriter/html.py
    trunk/epydoc/src/epydoc/markup/__init__.py
    trunk/epydoc/src/epydoc/markup/epytext.py
    trunk/epydoc/src/epydoc/markup/restructuredtext.py

Modified: trunk/epydoc/src/epydoc/docparser.py
===================================================================
--- trunk/epydoc/src/epydoc/docparser.py	2007-03-09 23:08:24 UTC (rev 1576)
+++ trunk/epydoc/src/epydoc/docparser.py	2007-03-09 23:26:21 UTC (rev 1577)
@@ -230,7 +230,7 @@
             except ValueError, e: raise ImportError('%s' % e)
 
         # Check the cache, first.
-        if _moduledoc_cache.has_key(filename):
+        if filename in _moduledoc_cache:
             return _moduledoc_cache[filename]
         
         log.info("Parsing %s" % filename)
@@ -1871,18 +1871,18 @@
 
     # Locals
     if isinstance(parent_docs[-1], NamespaceDoc):
-        if parent_docs[-1].variables.has_key(identifier):
+        if identifier in parent_docs[-1].variables:
             return parent_docs[-1].variables[identifier]
 
     # Globals (aka the containing module)
     if isinstance(parent_docs[0], NamespaceDoc):
-        if parent_docs[0].variables.has_key(identifier):
+        if identifier in parent_docs[0].variables:
             return parent_docs[0].variables[identifier]
 
     # Builtins
     builtins = epydoc.docintrospecter.introspect_docs(__builtin__)
     if isinstance(builtins, NamespaceDoc):
-        if builtins.variables.has_key(identifier):
+        if identifier in builtins.variables:
             return builtins.variables[identifier]
 
     # We didn't find it; return None.

Modified: trunk/epydoc/src/epydoc/docwriter/html.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/html.py	2007-03-09 23:08:24 UTC (rev 1576)
+++ trunk/epydoc/src/epydoc/docwriter/html.py	2007-03-09 23:26:21 UTC (rev 1577)
@@ -1389,7 +1389,7 @@
             if os.path.exists(cssname):
                 try: css = open(cssname).read()
                 except: raise IOError("Can't open CSS file: %r" % cssname)
-            elif STYLESHEETS.has_key(cssname):
+            elif cssname in STYLESHEETS:
                 css = STYLESHEETS[cssname][0]
             else:
                 raise IOError("Can't find CSS file: %r" % cssname)

Modified: trunk/epydoc/src/epydoc/markup/__init__.py
===================================================================
--- trunk/epydoc/src/epydoc/markup/__init__.py	2007-03-09 23:08:24 UTC (rev 1576)
+++ trunk/epydoc/src/epydoc/markup/__init__.py	2007-03-09 23:26:21 UTC (rev 1577)
@@ -200,7 +200,7 @@
     printed, then do nothing.
     """
     global _parse_warnings
-    if _parse_warnings.has_key(estr): return
+    if estr in _parse_warnings: return
     _parse_warnings[estr] = 1
     log.warning(estr)
 

Modified: trunk/epydoc/src/epydoc/markup/epytext.py
===================================================================
--- trunk/epydoc/src/epydoc/markup/epytext.py	2007-03-09 23:08:24 UTC (rev 1576)
+++ trunk/epydoc/src/epydoc/markup/epytext.py	2007-03-09 23:26:21 UTC (rev 1577)
@@ -1021,7 +1021,7 @@
             if (end>0) and 'A' <= str[end-1] <= 'Z':
                 if (end-1) > start:
                     stack[-1].children.append(str[start:end-1])
-                if not _COLORIZING_TAGS.has_key(str[end-1]):
+                if str[end-1] not in _COLORIZING_TAGS:
                     estr = "Unknown inline markup tag."
                     errors.append(ColorizingError(estr, token, end-1))
                     stack.append(Element('unknown'))
@@ -1056,7 +1056,7 @@
                     errors.append(ColorizingError(estr, token, end))
                 else:
                     symb = stack[-1].children[0]
-                    if _SYMBOLS.has_key(symb):
+                    if symb in _SYMBOLS:
                         # It's a symbol
                         stack[-2].children[-1] = Element('symbol', symb)
                     else:
@@ -1071,7 +1071,7 @@
                     errors.append(ColorizingError(estr, token, end))
                 else:
                     escp = stack[-1].children[0]
-                    if _ESCAPES.has_key(escp):
+                    if escp in _ESCAPES:
                         # It's an escape from _ESCPAES
                         stack[-2].children[-1] = _ESCAPES[escp]
                     elif len(escp) == 1:

Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py
===================================================================
--- trunk/epydoc/src/epydoc/markup/restructuredtext.py	2007-03-09 23:08:24 UTC (rev 1576)
+++ trunk/epydoc/src/epydoc/markup/restructuredtext.py	2007-03-09 23:26:21 UTC (rev 1577)
@@ -413,7 +413,7 @@
                                                        is_fatal=0))
                         
                         # Use a @newfield to let it be displayed as-is.
-                        if not self._newfields.has_key(tagname.lower()):
+                        if tagname.lower() not in self._newfields:
                             newfield = Field('newfield', tagname.lower(),
                                              parse(tagname, 'plaintext'))
                             self.fields.append(newfield)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.