[py-svn] r37042 - in py/dist/py/apigen: . rest rest/testing source testing tracer tracer/testing
cfbolz at codespeak.net
cfbolz at codespeak.net
Fri Jan 19 23:30:44 CET 2007
Author: cfbolz
Date: Fri Jan 19 23:30:40 2007
New Revision: 37042
Modified:
py/dist/py/apigen/htmlgen.py
py/dist/py/apigen/rest/genrest.py
py/dist/py/apigen/rest/testing/test_rest.py
py/dist/py/apigen/source/browser.py
py/dist/py/apigen/testing/test_htmlgen.py
py/dist/py/apigen/tracer/description.py
py/dist/py/apigen/tracer/docstorage.py
py/dist/py/apigen/tracer/model.py
py/dist/py/apigen/tracer/testing/test_docgen.py
py/dist/py/apigen/tracer/testing/test_model.py
py/dist/py/apigen/tracer/testing/test_package.py
Log:
clear apigen of 2.4isms. works now on 2.3!
Modified: py/dist/py/apigen/htmlgen.py
==============================================================================
--- py/dist/py/apigen/htmlgen.py (original)
+++ py/dist/py/apigen/htmlgen.py Fri Jan 19 23:30:40 2007
@@ -4,10 +4,13 @@
from py.__.apigen.source import browser as source_browser
from py.__.apigen.source import html as source_html
from py.__.apigen.tracer.description import is_private
+from py.__.apigen.rest.genrest import split_of_last_part
+sorted = py.builtin.sorted
html = py.xml.html
raw = py.xml.raw
+
class H(html):
class Description(html.div):
style = html.Style(margin_left='10em')
@@ -201,7 +204,7 @@
indent += 1
# build sub items of dotted_name item
- for item_dotted_name in sorted(item_dotted_names):
+ for item_dotted_name in py.builtin.sorted(item_dotted_names):
itemname = item_dotted_name.split('.')[-1]
if is_private(itemname):
continue
@@ -357,7 +360,7 @@
passed = []
methodsdata = []
for dotted_name in classes_dotted_names:
- parent_dotted_name = dotted_name.rsplit('.', 1)[0]
+ parent_dotted_name, _ = split_of_last_part(dotted_name)
try:
sibling_dotted_names = namespace_tree[parent_dotted_name]
except KeyError:
@@ -391,8 +394,8 @@
# pointing to them anymore...
passed = []
for dotted_name in method_dotted_names:
- parent_dotted_name = dotted_name.rsplit('.', 1)[0]
- module_dotted_name = dotted_name.rsplit('.', 2)[0]
+ parent_dotted_name, _ = split_of_last_part(dotted_name)
+ module_dotted_name, _ = split_of_last_part(parent_dotted_name)
sibling_dotted_names = namespace_tree[module_dotted_name]
tag = build_full_method_view(base, linker, dsa, dotted_name)
nav = build_api_navigation(linker, dsa, parent_dotted_name,
@@ -416,7 +419,7 @@
passed = []
for dotted_name in method_dotted_names:
# XXX should we create a build_full_function_view instead?
- parent_dotted_name = dotted_name.rsplit('.', 1)[0]
+ parent_dotted_name, _ = split_of_last_part(dotted_name)
sibling_dotted_names = namespace_tree[parent_dotted_name]
tag = build_full_method_view(base, linker, dsa, dotted_name)
nav = build_api_navigation(linker, dsa, parent_dotted_name,
Modified: py/dist/py/apigen/rest/genrest.py
==============================================================================
--- py/dist/py/apigen/rest/genrest.py (original)
+++ py/dist/py/apigen/rest/genrest.py Fri Jan 19 23:30:40 2007
@@ -12,6 +12,10 @@
from py.__.apigen.tracer import model
from py.__.rest.transform import RestTransformer
+def split_of_last_part(name):
+ name = name.split(".")
+ return ".".join(name[:-1]), name[-1]
+
class AbstractLinkWriter(object):
""" Class implementing writing links to source code.
There should exist various classes for that, different for Trac,
@@ -324,7 +328,7 @@
ret = []
for name in self.dsa.get_class_names():
if '.' in name:
- module, classname = name.rsplit('.', 1)
+ module, classname = split_of_last_part(name)
if module in visited:
continue
visited.append(module)
@@ -337,7 +341,7 @@
for name in self.dsa.get_class_names():
classname = name
if '.' in name:
- classmodule, classname = name.rsplit('.', 1)
+ classmodule, classname = split_of_last_part(name)
if classmodule != module:
continue
elif module != '':
@@ -351,7 +355,7 @@
for name in self.dsa.get_function_names():
funcname = name
if '.' in name:
- funcpath, funcname = name.rsplit('.', 1)
+ funcpath, funcname = split_of_last_part(name)
if funcpath != module:
continue
elif module != '':
Modified: py/dist/py/apigen/rest/testing/test_rest.py
==============================================================================
--- py/dist/py/apigen/rest/testing/test_rest.py (original)
+++ py/dist/py/apigen/rest/testing/test_rest.py Fri Jan 19 23:30:40 2007
@@ -20,6 +20,8 @@
from py.__.rest.transform import HTMLHandler
# XXX: UUuuuuuuuuuuuuuuuuuuuuuuu, dangerous import
+sorted = py.builtin.sorted
+
def _nl(s):
"""normalize newlines (converting to \n)"""
s = s.replace('\r\n', '\n')
Modified: py/dist/py/apigen/source/browser.py
==============================================================================
--- py/dist/py/apigen/source/browser.py (original)
+++ py/dist/py/apigen/source/browser.py Fri Jan 19 23:30:40 2007
@@ -39,7 +39,7 @@
return all
def get_endline(start, lst):
- l = reversed(lst)
+ l = lst[::-1]
for i in l:
if i.lineno:
return i.lineno
Modified: py/dist/py/apigen/testing/test_htmlgen.py
==============================================================================
--- py/dist/py/apigen/testing/test_htmlgen.py (original)
+++ py/dist/py/apigen/testing/test_htmlgen.py Fri Jan 19 23:30:40 2007
@@ -31,8 +31,8 @@
temp.join('dir/sub').ensure(dir=True)
temp.join('dir/.hidden_dir').ensure(dir=True)
dirs, files = htmlgen.source_dirs_files(temp.join('dir'))
- dirnames = sorted([d.basename for d in dirs])
- filenames = sorted([f.basename for f in files])
+ dirnames = py.builtin.sorted([d.basename for d in dirs])
+ filenames = py.builtin.sorted([f.basename for f in files])
assert dirnames == ['sub']
assert filenames == ['file1.py', 'file3.c']
Modified: py/dist/py/apigen/tracer/description.py
==============================================================================
--- py/dist/py/apigen/tracer/description.py (original)
+++ py/dist/py/apigen/tracer/description.py Fri Jan 19 23:30:40 2007
@@ -8,6 +8,12 @@
MAX_CALL_SITES = 20
+try:
+ set
+except NameError:
+ from sets import Set as set
+
+
def is_private(name):
return name.startswith('_') and not name.startswith('__')
Modified: py/dist/py/apigen/tracer/docstorage.py
==============================================================================
--- py/dist/py/apigen/tracer/docstorage.py (original)
+++ py/dist/py/apigen/tracer/docstorage.py Fri Jan 19 23:30:40 2007
@@ -12,6 +12,8 @@
from py.__.apigen.tracer import model
+sorted = py.builtin.sorted
+
class DocStorage(object):
""" Class storing info about API
"""
Modified: py/dist/py/apigen/tracer/model.py
==============================================================================
--- py/dist/py/apigen/tracer/model.py (original)
+++ py/dist/py/apigen/tracer/model.py Fri Jan 19 23:30:40 2007
@@ -7,6 +7,12 @@
import types
+try:
+ set
+except NameError:
+ from sets import Set as set
+
+
# __extend__ and pairtype?
class SomeObject(object):
typedef = types.ObjectType
Modified: py/dist/py/apigen/tracer/testing/test_docgen.py
==============================================================================
--- py/dist/py/apigen/tracer/testing/test_docgen.py (original)
+++ py/dist/py/apigen/tracer/testing/test_docgen.py Fri Jan 19 23:30:40 2007
@@ -21,6 +21,12 @@
# sys.path.insert(0, str(data_path))
# XXX: Perma doc storage disabled a bit
+try:
+ set
+except NameError:
+ from sets import Set as set
+
+sorted = py.builtin.sorted
def fun(a, b, c):
"Some docstring"
Modified: py/dist/py/apigen/tracer/testing/test_model.py
==============================================================================
--- py/dist/py/apigen/tracer/testing/test_model.py (original)
+++ py/dist/py/apigen/tracer/testing/test_model.py Fri Jan 19 23:30:40 2007
@@ -105,7 +105,7 @@
pass
g = guess_type(A).unionof(guess_type(A()))
- l = sorted(list(g.striter()))
+ l = py.builtin.sorted(list(g.striter()))
assert l[4] == "AnyOf("
assert isinstance(l[0], SomeClass)
assert l[3] == ", "
Modified: py/dist/py/apigen/tracer/testing/test_package.py
==============================================================================
--- py/dist/py/apigen/tracer/testing/test_package.py (original)
+++ py/dist/py/apigen/tracer/testing/test_package.py Fri Jan 19 23:30:40 2007
@@ -24,8 +24,9 @@
def test_init(self):
ds = self.ds
assert len(ds.descs) == 4
- assert sorted(ds.descs.keys()) == ["notpak.notmod.notclass", "notpak.notmod.notclass.__init__", \
- "pak.mod.one", "pak.mod.two"]
+ assert py.builtin.sorted(ds.descs.keys()) == [
+ "notpak.notmod.notclass", "notpak.notmod.notclass.__init__",
+ "pak.mod.one", "pak.mod.two"]
def test_simple_call(self):
ds = self.ds
More information about the py-svn
mailing list