[pypy-commit] pypy default: Merged in krono/pypy (pull request #109)
arigo
noreply at buildbot.pypy.org
Mon Feb 11 10:29:38 CET 2013
Author: arigo <armin.rigo at gmail.com>
Branch:
Changeset: r61074:e268a994c86f
Date: 2013-02-11 10:28 +0100
http://bitbucket.org/pypy/pypy/changeset/e268a994c86f/
Log: Merged in krono/pypy (pull request #109)
Enhance the dotviewer: change the fonts and add support for unicode.
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -270,3 +270,24 @@
LineBreak-*.txt
UnicodeData-*.txt
UnihanNumeric-*.txt
+
+License for 'dotviewer/font/'
+=============================
+
+Copyright (C) 2008 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Detailled license information is contained in the NOTICE file in the
+directory.
+
diff --git a/dotviewer/VeraMoBd.ttf b/dotviewer/VeraMoBd.ttf
deleted file mode 100644
Binary file dotviewer/VeraMoBd.ttf has changed
diff --git a/dotviewer/cyrvetic.ttf b/dotviewer/cyrvetic.ttf
deleted file mode 100644
Binary file dotviewer/cyrvetic.ttf has changed
diff --git a/dotviewer/drawgraph.py b/dotviewer/drawgraph.py
--- a/dotviewer/drawgraph.py
+++ b/dotviewer/drawgraph.py
@@ -9,9 +9,10 @@
from pygame.locals import *
+RAW_ENCODING = "utf-8"
this_dir = os.path.dirname(os.path.abspath(__file__))
-FONT = os.path.join(this_dir, 'cyrvetic.ttf')
-FIXEDFONT = os.path.join(this_dir, 'VeraMoBd.ttf')
+FONT = os.path.join(this_dir, 'font', 'DroidSans.ttf')
+FIXEDFONT = os.path.join(this_dir, 'font', 'DroidSansMono.ttf')
COLOR = {
'black': (0,0,0),
'white': (255,255,255),
@@ -51,6 +52,12 @@
else:
return default
+def forceunicode(name):
+ return name if isinstance(name, unicode) else name.decode(RAW_ENCODING)
+
+def forcestr(name):
+ return name if isinstance(name, str) else name.encode(RAW_ENCODING)
+
class GraphLayout:
fixedfont = False
@@ -106,12 +113,12 @@
class Node:
def __init__(self, name, x, y, w, h, label, style, shape, color, fillcolor):
- self.name = name
+ self.name = forceunicode(name)
self.x = float(x)
self.y = float(y)
self.w = float(w)
self.h = float(h)
- self.label = label
+ self.label = forceunicode(label)
self.style = style
self.shape = shape
self.color = color
@@ -125,8 +132,8 @@
label = None
def __init__(self, nodes, tail, head, cnt, *rest):
- self.tail = nodes[tail]
- self.head = nodes[head]
+ self.tail = nodes[forceunicode(tail)]
+ self.head = nodes[forceunicode(head)]
cnt = int(cnt)
self.points = [(float(rest[i]), float(rest[i+1]))
for i in range(0, cnt*2, 2)]
@@ -655,11 +662,7 @@
part = parts[i]
word = part[0]
try:
- try:
- img = font.render(word, False, *part[1:])
- except pygame.error, e:
- # Try *with* anti-aliasing to work around a bug in SDL
- img = font.render(word, True, *part[1:])
+ img = font.render(word, True, *part[1:])
except pygame.error:
del parts[i] # Text has zero width
else:
diff --git a/dotviewer/font/DroidSans-Bold.ttf b/dotviewer/font/DroidSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d065b64eb1863f83c2c982264f9442f2313a44a9
GIT binary patch
[cut]
diff --git a/dotviewer/font/DroidSans.ttf b/dotviewer/font/DroidSans.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ad1efca88aed8d9e2d179f27dd713e2a1562fe5f
GIT binary patch
[cut]
diff --git a/dotviewer/font/DroidSansMono.ttf b/dotviewer/font/DroidSansMono.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a007071944f7c90020e798eea53b10065e2b45a5
GIT binary patch
[cut]
diff --git a/dotviewer/font/NOTICE b/dotviewer/font/NOTICE
new file mode 100644
--- /dev/null
+++ b/dotviewer/font/NOTICE
@@ -0,0 +1,190 @@
+
+ Copyright (c) 2005-2008, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
diff --git a/dotviewer/font/README.txt b/dotviewer/font/README.txt
new file mode 100644
--- /dev/null
+++ b/dotviewer/font/README.txt
@@ -0,0 +1,18 @@
+Copyright (C) 2008 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+##########
+
+This directory contains the fonts for the platform. They are licensed
+under the Apache 2 license.
diff --git a/dotviewer/graphclient.py b/dotviewer/graphclient.py
--- a/dotviewer/graphclient.py
+++ b/dotviewer/graphclient.py
@@ -33,8 +33,9 @@
def reload(graph_id):
page = getpage(graph_id)
if save_tmp_file:
+ from drawgraph import forcestr
f = open(save_tmp_file, 'w')
- f.write(page.source)
+ f.write(forcestr(page.source))
f.close()
messages.extend(page_messages(page, graph_id))
send_graph_messages(io, messages)
@@ -75,7 +76,8 @@
def page_messages(page, graph_id):
import graphparse
- return graphparse.parse_dot(graph_id, page.source, page.links,
+ from drawgraph import forcestr
+ return graphparse.parse_dot(graph_id, forcestr(page.source), page.links,
getattr(page, 'fixedfont', False))
def send_graph_messages(io, messages):
diff --git a/dotviewer/graphdisplay.py b/dotviewer/graphdisplay.py
--- a/dotviewer/graphdisplay.py
+++ b/dotviewer/graphdisplay.py
@@ -4,7 +4,7 @@
from pygame.locals import *
from drawgraph import GraphRenderer, FIXEDFONT
from drawgraph import Node, Edge
-from drawgraph import EventQueue, wait_for_events
+from drawgraph import EventQueue, wait_for_events, forceunicode, forcestr
METAKEYS = dict([
@@ -285,7 +285,7 @@
if e.key == K_ESCAPE:
return None
elif e.key == K_RETURN:
- return text.encode('latin-1') # XXX do better
+ return forcestr(text) # return encoded unicode
elif e.key == K_BACKSPACE:
text = text[:-1]
elif e.unicode and ord(e.unicode) >= ord(' '):
@@ -423,7 +423,7 @@
self.layout.request_reload()
def setstatusbar(self, text, fgcolor=None, bgcolor=None):
- info = (text, fgcolor or self.STATUSBAR_FGCOLOR, bgcolor or self.STATUSBAR_BGCOLOR)
+ info = (forceunicode(text), fgcolor or self.STATUSBAR_FGCOLOR, bgcolor or self.STATUSBAR_BGCOLOR)
if info != self.statusbarinfo:
self.statusbarinfo = info
self.must_redraw = True
@@ -711,7 +711,7 @@
lines = []
while words:
line = words.pop(0)
- img = font.render(line or ' ', 1, fgcolor)
+ img = font.render(line or ' ', True, fgcolor)
while words:
longerline = line + ' ' + words[0]
longerimg = font.render(longerline, 1, fgcolor)
@@ -723,7 +723,7 @@
img = longerimg
w, h = img.get_size()
if h > maxheight:
- img = font.render('...', 1, overflowcolor)
+ img = font.render('...', True, overflowcolor)
w, h = img.get_size()
while lines and h > maxheight:
maxheight += lines.pop().get_size()[1]
diff --git a/dotviewer/graphpage.py b/dotviewer/graphpage.py
--- a/dotviewer/graphpage.py
+++ b/dotviewer/graphpage.py
@@ -44,6 +44,8 @@
class DotFileGraphPage(GraphPage):
def compute(self, dotfile):
- f = open(dotfile, 'r')
+ import codecs
+ from drawgraph import RAW_ENCODING
+ f = codecs.open(dotfile, 'r', RAW_ENCODING)
self.source = f.read()
f.close()
diff --git a/dotviewer/test/test_interactive_unicode.py b/dotviewer/test/test_interactive_unicode.py
new file mode 100755
--- /dev/null
+++ b/dotviewer/test/test_interactive_unicode.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+import py
+import sys, os, signal, thread, time, codecs
+from dotviewer.conftest import option
+from dotviewer.drawgraph import RAW_ENCODING
+
+SOURCE1 = u"""digraph G{
+λ -> b
+b -> μ
+}
+"""
+
+FILENAME = 'graph1.dot'
+
+def setup_module(mod):
+ if not option.pygame:
+ py.test.skip("--pygame not enabled")
+ udir = py.path.local.make_numbered_dir(prefix='usession-dot-', keep=3)
+ f = codecs.open(str(udir.join(FILENAME)), 'wb', RAW_ENCODING)
+ f.write(SOURCE1)
+ f.close()
+
+ from dotviewer import graphclient
+ mod.pkgdir = py.path.local(graphclient.this_dir)
+ mod.udir = udir
+
+ try:
+ del os.environ['GRAPHSERVER']
+ except KeyError:
+ pass
+
+
+def test_dotviewer():
+ print "=== dotviewer.py %s" % FILENAME
+ err = os.system('"%s" "%s"' % (pkgdir.join('dotviewer.py'),
+ udir.join(FILENAME)))
+ assert err == 0
+
+ plain_name = FILENAME.replace('.dot','.plain')
+
+ os.system('dot -Tplain "%s" > "%s"' % (udir.join(FILENAME),
+ udir.join(plain_name)))
+ print "=== dotviewer.py %s" % plain_name
+ err = os.system('"%s" "%s"' % (pkgdir.join('dotviewer.py'),
+ udir.join(plain_name)))
+ assert err == 0
+
+def test_display_dot_file():
+ from dotviewer.graphclient import display_dot_file
+ print "=== display_dot_file(%s) with GRAPHSERVER=%s" % (
+ FILENAME, os.environ.get('GRAPHSERVER', ''),)
+ display_dot_file(udir.join(FILENAME))
+ print "=== display_dot_file finished"
+
+
+def test_graphserver():
+ import socket
+ s = socket.socket()
+ s.listen(1)
+ host, port = s.getsockname() # pick a random free port
+ s.close()
+
+ if hasattr(sys, 'pypy_objspaceclass'):
+ python = 'python'
+ else:
+ python = sys.executable
+
+ cmdargs = [python, str(pkgdir.join('graphserver.py')),
+ str(port)]
+ print '* starting:', ' '.join(cmdargs)
+ pid = os.spawnv(os.P_NOWAIT, cmdargs[0], cmdargs)
+ try:
+ time.sleep(1) # hack - wait a bit to make sure the server is up
+ os.environ['GRAPHSERVER'] = '%s:%d' % (host, port)
+ try:
+ test_display_dot_file()
+ finally:
+ del os.environ['GRAPHSERVER']
+ finally:
+ os.kill(pid, signal.SIGTERM)
+
+def test_colors():
+ from dotviewer import graphpage, graphclient
+ class MyPage(graphpage.DotFileGraphPage):
+ def compute(self, dotfile):
+ super(MyPage, self).compute(dotfile)
+ self.links = {'v2721': 'Hello world',
+ 'v2720': ('Something green', (0, 192, 0)),
+ }
+ dotfile = str(udir.join(FILENAME))
+ page = MyPage(dotfile)
+ graphclient.display_page(page)
+
+def test_fixedfont():
+ from dotviewer import graphpage, graphclient
+ class MyPage(graphpage.DotFileGraphPage):
+ fixedfont = True
+ dotfile = str(udir.join(FILENAME))
+ page = MyPage(dotfile)
+ page.fixedfont = True
+ graphclient.display_page(page)
diff --git a/dotviewer/test/test_translator.py b/dotviewer/test/test_translator.py
--- a/dotviewer/test/test_translator.py
+++ b/dotviewer/test/test_translator.py
@@ -22,6 +22,6 @@
def test_annotated():
from rpython.translator.interactive import Translation
- t = Translation(is_prime)
- t.annotate([int])
+ t = Translation(is_prime, [int])
+ t.annotate()
t.viewcg()
diff --git a/dotviewer/test/test_unicode_util.py b/dotviewer/test/test_unicode_util.py
new file mode 100755
--- /dev/null
+++ b/dotviewer/test/test_unicode_util.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+import py
+import codecs
+from dotviewer.drawgraph import RAW_ENCODING, forcestr, forceunicode
+
+SOURCE1 = u"""digraph G{
+λ -> b
+b -> μ
+}
+"""
+
+FILENAME = 'test.dot'
+
+class TestUnicodeUtil(object):
+
+ def test_idempotent(self):
+ x = u"a"
+ assert forceunicode(forcestr(x)) == x
+
+ x = u"λ"
+ assert forceunicode(forcestr(x)) == x
+
+ assert forceunicode(forcestr(SOURCE1)) == SOURCE1
+
+ x = "a"
+ assert forcestr(forceunicode(x)) == x
+
+ # utf-8 encoded.
+ # fragile, does not consider RAW_ENCODING
+ # x = "\xef\xbb\xbf\xce\xbb"
+ # assert forcestr(forceunicode(x)) == x
+
+ def test_does_not_double_encode(self):
+ x = u"λ"
+ x_e = forcestr(x)
+ assert forcestr(x_e) == x_e
+
+ x_u = forceunicode(x_e)
+ assert forceunicode(x_u) == x_u
+
+ def test_file(self):
+ udir = py.path.local.make_numbered_dir(prefix='usession-dot-', keep=3)
+ full_filename = str(udir.join(FILENAME))
+ f = codecs.open(full_filename, 'wb', RAW_ENCODING)
+ f.write(SOURCE1)
+ f.close()
+
+ with open(full_filename) as f1:
+ assert forceunicode(f1.read()) == SOURCE1
+
+ f3 = codecs.open(full_filename, 'r', RAW_ENCODING)
+ c = f3.read()
+ f3.close()
+ result = (c == SOURCE1)
+ assert result
More information about the pypy-commit
mailing list