Changeset 4397

Timestamp:

10/06/08 12:15:29 (2 months ago)

Author:

cboos

Message:

GraphvizPlugin: PEP:0008 clean-ups, truncate long lines

Files:

• graphvizplugin/0.11/graphviz/graphviz.py (modified) (22 diffs)

graphvizplugin/0.11/graphviz/graphviz.py

@@ -139 +139 @@
-        """
-
-        #self.log.debug('dir(self): %s' % str(dir(self)))
-        self.formatter = formatter
-        self.env = formatter.env
@@ -150 +149 @@
-
-        buf = StringIO()
-
-
-        ## Extract processor and format from name
@@ -193 +191 @@
-        encoded_content = content.encode(self.encoding)
-        sha_key  = sha.new(encoded_cmd + encoded_content).hexdigest()
-
+
+
-        img_path = os.path.join(self.cache_dir, img_name)
-
+
+
-        map_path = os.path.join(self.cache_dir, map_name)
-
@@ -207 +207 @@
-            #self.log.debug('render_macro.URL_in_graph: %s' % str(URL_in_graph))
-            if URL_in_graph: # translate wiki TracLinks in URL
-                #self.log.debug('content: %s' % content)
-                content = self.expand_wiki_links(content)
-
@@ -215 +214 @@
-                cmd = [proc_cmd] + self.processor_options + \
-                        ['-Tsvg', '-o%s.svg' % img_path]
-                #self.log.debug('render_macro: svg output - running command %s' % cmd)
-                out, err = self.launch(cmd, encoded_content)
-                if len(out) or len(err):
@@ -223 +221 @@
-                # 2. SVG to PNG rasterization
-                cmd = [self.rsvg_path, '--dpi-x=%d' % self.dpi, '--dpi-y=%d' % self.dpi, '%s.svg' % img_path, img_path]
-                #self.log.debug('render_macro: svg to png - running command %s' % cmd)
-                out, err = self.launch(cmd, None)
-                if len(out) or len(err):
@@ -232 +229 @@
-                cmd = [proc_cmd] + self.processor_options + \
-                        ['-T%s' % self.out_format, '-o%s' % img_path]
-                #self.log.debug('render_macro: render other image formats - running command %s' % cmd)
-                out, err = self.launch(cmd, encoded_content)
-                if len(out) or len(err):
@@ -245 +241 @@
-                    cmd = [proc_cmd] + self.processor_options + \
-                            ['-Tcmap', '-o%s' % map_path]
-                    #self.log.debug('render_macro: create map if not in cache - running command %s' % cmd)
-                    out, err = self.launch(cmd, encoded_content)
-                    if len(out) or len(err):
@@ -265 +260 @@
-                (h_val, h_unit) = h.group(1,2)
-                # Graphviz seems to underestimate height/width for SVG images,
-
+
+
-                [w_val, h_val] = [ 1.35 * x for x in (int(w_val), int(h_val))]
-
+
+
-
-            except:
@@ -273 +270 @@
-
-            # insert SVG, IE compatibility
-            #buf.write('<!--[if IE]><embed src="%s/graphviz/%s" type="image/svg+xml" %s></embed><![endif]--> ' % (req.base_url, img_name, dimensions))
-            #buf.write('<![if !IE]><object data="%s/graphviz/%s" type="image/svg+xml" %s>SVG Object</object><![endif]>' % (req.base_url, img_name, dimensions))
-
-            buf.write('<object data="%s/graphviz/%s" type="image/svg+xml" %s><embed src="%s/graphviz/%s" type="image/svg+xml" %s></embed></object>' % (req.base_url, img_name, dimensions, req.base_url, img_name, dimensions))
-
@@ -290 +284 @@
-            buf.write('<img src="%s/graphviz/%s"/>' % (req.base_url, img_name))
-
-        #self.log.debug('buf.getvalue(): "%s"' % buf.getvalue())
-        return buf.getvalue()
-
@@ -300 +293 @@
-    def _expand_wiki_links(self, match):
-        wiki_url = match.groups()[0] # TracLink ([1], source:file/, ...)
-
-
-
-
-
-
+
+
+
-        href     = re.search('href="(.*?)"', html_url)   # http://someurl
-        #self.log.debug('href: %s' % href)
-        url      = href and href.groups()[0] or html_url
-        #self.log.debug('url: %s' % url)
-        if self.out_format == 'svg':
-            format = 'URL="javascript:window.parent.location.href=\'%s\'"'
-        else:
-            format = 'URL="%s"'
-        #self.log.debug('expand_wiki_links url: %s' % str(format % url))
-        return format % url
-
-
-    def load_config(self):
@@ -339 +325 @@
-                    self.cache_dir
-            return True, self.show_err(msg)
-
-
-
-
-
+
+
-
-        # check for the default processor - processor
-        self.processor = self.config.get('graphviz', 'processor', Graphviz.Processors[0])
-        #self.log.debug('self.processor: %s' % self.processor)
-
-
-        # check for the cmd_path entry and setup the various program command paths
@@ -366 +347 @@
-
-        self.cmds = {}
-
+_
-        if not pname:
-            msg = 'The default processor, %s, was not found in %s.' % (self.processor, str(cmd_paths))
@@ -372 +353 @@
-
-        for name in Graphviz.Processors:
-
+_
-
-            if not pname:
@@ -381 +362 @@
-
-        # check for the default output format - out_format
-Graphviz.Formats[0])
-#self.log.debug('self.out_format: %s' % self.out_format
+
+                                  Graphviz.Formats[0]
-
-        # check if png anti aliasing should be done - png_antialias
-
-
-
-
-
+
+
+
+
+
+
-
-            if not os.path.exists(self.rsvg_path):
-                err = 'The rsvg program is set to "%s" but that path does not exist.' % self.rsvg_path
-                return True, self.show_err(err)
-            #self.log.debug('self.rsvg_path: %s' % self.rsvg_path)
-
-        # get default graph/node/edge attributes
@@ -412 +393 @@
-        self.cache_manager = self.boolean(self.config.get('graphviz', 'cache_manager', False))
-        if self.cache_manager:
+            # use IntOption
-            self.cache_max_size  = int(self.config.get('graphviz', 'cache_max_size',  10000000))
-            self.cache_min_size  = int(self.config.get('graphviz', 'cache_min_size',  5000000))
-            self.cache_max_count = int(self.config.get('graphviz', 'cache_max_count', 2000))
-            self.cache_min_count = int(self.config.get('graphviz', 'cache_min_count', 1500))
-
-            #self.log.debug('self.cache_max_count: %d' % self.cache_max_count)
-            #self.log.debug('self.cache_min_count: %d' % self.cache_min_count)
-            #self.log.debug('self.cache_max_size: %d'  % self.cache_max_size)
-            #self.log.debug('self.cache_min_size: %d'  % self.cache_min_size)
-
-        # is there a graphviz default DPI setting?
@@ -449 +426 @@
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-
-        if input:
-            p.stdin.write(encoded_input)
@@ -519 +495 @@
-            # time. Same for cache_min_size.
-            if count > self.cache_max_count or size > self.cache_max_size:
-
+
+
-                    key = atime_keys.pop(0)
-                    for file in atime_list[key]:
-                        #self.log.debug('clean_cache.unlink: %s' % file)
-                        os.unlink(os.path.join(self.cache_dir, file))
-                        count = count - 1
-                        size = size - entry_list[file][6]
-        else:
-            #self.log.debug('clean_cache: cache_manager not set')
-            pass
-
-
-    # Extra helper functions
@@ -557 +529 @@
-
-    # IRequestHandler methods
+
-    def match_request(self, req):
-        return req.path_info.startswith('/graphviz')
@@ -567 +540 @@
-            return msg.getvalue()
-
-len(item)
-
-len(pieces)
-len(item)
-
-len(pieces)
+item
+
+pieces
+item
+
+pieces
-                name = pieces[0]
-                img_path = os.path.join(self.cache_dir, name)
@@ -578 +551 @@
-        return
-
-
-
+
+
+
-        exe_suffix = ''
-        if sys.platform == 'win32':