Show
Ignore:
Timestamp:
01/21/07 12:30:37 (2 years ago)
Author:
eblot
Message:

TracFrenchTranslation:

Update to Trac 0.10.3 (4446)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • tracfrenchtranslation/0.10/ChangeLog

    r1435 r1888  
     1Trac 0.10.3 (Dec 12, 2006) 
     2http://svn.edgewall.org/repos/trac/tags/trac-0.10.3 
     3 
     4 Trac 0.10.3 is a bug fix release. The following list contains only a  
     5 few highlights: 
     6 
     7 * Timeline fail to load with a "NoSuchChangeset" error message (#4132). 
     8 * Timed out MySQL connections not handled properly (#3645). 
     9 * Subversion repository resync broken. (#4204). 
     10 
     11 The complete list of closed tickets can be found here: 
     12   http://trac.edgewall.org/query?status=closed&milestone=0.10.2 
     13 
     14Trac 0.10.3rc1 (Dec 7, 2006) 
     15http://svn.edgewall.org/repos/trac/tags/trac-0.10.3rc1 
     16 
     17 Trac 0.10.3 is a bug fix release. The following list contains only a  
     18 few highlights: 
     19 
     20 * Timeline fail to load with a "NoSuchChangeset" error message (#4132). 
     21 * Timed out MySQL connections not handled properly (#3645). 
     22 * Subversion repository resync broken. (#4204). 
     23 
     24 The complete list of closed tickets can be found here: 
     25   http://trac.edgewall.org/query?status=closed&milestone=0.10.2 
     26 
     27Trac 0.10.2 (Nov 13, 2006) 
     28http://svn.edgewall.org/repos/trac/tags/trac-0.10.2 
     29 
     30 Trac 0.10.2 is a bug fix release. The following list contains only a  
     31 few highlights: 
     32 
     33 * Fixes deadlock when using authz_file config option (#3996). 
     34 * Makes the CSRF code play nice with the XmlRpcPlugin (#4122). 
     35 * Fixes Timeline breakage after svn commit when using sqlite (#4120). 
     36 
     37 The complete list of closed tickets can be found here: 
     38   http://trac.edgewall.org/query?status=closed&milestone=0.10.2 
     39 
     40Trac 0.10.1 (Nov 8, 2006) 
     41http://svn.edgewall.org/repos/trac/tags/trac-0.10.1 
     42 
     43 Trac 0.10.1 contains a security fix and a number of bug fixes. 
     44 The following list contains only a few highlights: 
     45 
     46 * Fixed CSRF vulnerability (#4049), reported by Daniel Kahn Gillmor. 
     47 * Improved DB connection handling (#3503) 
     48 * Tracd no longer tries to resolve client's IP address (#3481). 
     49 
     50 The complete list of closed tickets can be found here: 
     51   http://trac.edgewall.org/query?status=closed&milestone=0.10.1 
     52 
    153Trac 0.10 'Zengia' (Sep 28, 2006) 
    254http://svn.edgewall.org/repos/trac/tags/trac-0.10 
  • tracfrenchtranslation/0.10/htdocs/css/browser.css

    r1428 r1888  
    119119 padding: 0; 
    120120} 
    121 #info .props li { padding: 0
     121#info .props li { padding: 0; overflow: auto;
    122122 
    123123/* Styles for the HTML preview */ 
  • tracfrenchtranslation/0.10/htdocs/css/diff.css

    r1428 r1888  
    5353/* Styles for the list of diffs */ 
    5454.diff ul.entries { clear: both; margin: 0; padding: 0 } 
     55.diff ul.entries ul.props li { overflow: auto; } 
    5556.diff li.entry { 
    5657 background: #f7f7f7; 
     
    108109 background: #fff; 
    109110 font: normal 11px monospace; 
    110  overflow: hidden
     111 overflow: visible
    111112 padding: 1px 2px; 
    112113 vertical-align: top; 
     
    116117 border: 1px solid #d7d7d7; 
    117118} 
    118 .diff table td del, .diff table td ins { text-decoration: none } 
    119 .diff table td del { color: #600 } 
    120 .diff table td ins { color: #060 } 
     119.diff td ins, .diff td del {text-decoration: none;} 
    121120 
    122121/* Styles for the inline diff */ 
     
    141140.diff table.inline tbody.mod tr.last td.r, 
    142141.diff table.inline tbody.add tr.last td.r { border-bottom-width: 1px } 
    143 .diff table.inline tbody.mod td del { background: #e99; color: #000 } 
    144 .diff table.inline tbody.mod td ins { background: #9e9; color: #000 } 
     142.diff table.inline tbody.mod td del {  
     143 background: #e99;  
     144 color: #000; 
     145 white-space: pre; 
     146
     147.diff table.inline tbody.mod td ins {  
     148 background: #9e9;  
     149 color: #000; 
     150 white-space: pre; 
     151
    145152 
    146153/* Styles for the side-by-side diff */ 
     
    153160.diff table.sidebyside tbody.rem td.r { background: #faa } 
    154161.diff table.sidebyside tbody.mod del, .diff table.sidebyside tbody.mod ins { 
    155  background: #fc0; 
     162 background: #fc0;  
    156163} 
  • tracfrenchtranslation/0.10/htdocs/js/trac.js

    r1428 r1888  
    4242      if (param.length < 2) continue; 
    4343      if (param[0] == 'q' || param[0] == 'p') { // q= for Google, p= for Yahoo 
    44         var query = unescape(param[1].replace(/\+/g, ' ')); 
     44        var query = decodeURIComponent(param[1].replace(/\+/g, ' ')); 
    4545        if (query[0] == '!') query = query.slice(1); 
    4646        words = query.split(/(".*?")|('.*?')|(\s+)/); 
  • tracfrenchtranslation/0.10/RELEASE

    r1435 r1888  
    1 Release Notes for Trac 0.10 'Zengia' 
    2 ==================================== 
    3 September 28, 2006 
     1Release Notes for Trac 0.10.3 
     2============================= 
     3December 12, 2006 
    44 
    5 We're happy to announce the Trac 0.10rc1 release, available from: 
     5We're happy to announce the Trac 0.10.3 release, available from: 
    66 
    77  http://trac.edgewall.org/wiki/TracDownload 
     
    1212  http://trac.edgewall.org/wiki/MailingList 
    1313 
    14 User visible changes 
    15 ==================== 
     14Trac 0.10.3 is a bug fix release and fixes a few bugs introduced in the  
     150.10.1 and 0.10.2 releases. A brief summary of major changes: 
    1616 
    17 Advanced diff support 
    18 --------------------- 
    19 The TracRevisionLog view can now be used to select two arbitrary 
    20 revisions of a given path in the repository and see the differences 
    21 between them, in the familiar TracChangeset view. 
     17 * Timeline fail to load with a "NoSuchChangeset" error message (#4132). 
     18 * Timed out MySQL connections not handled properly (#3645). 
     19 * Subversion repository resync broken. (#4204). 
    2220 
    23 A related change is the possibility to navigate through a sequence of 
    24 restricted changesets. A restricted changeset is the subset of changes 
    25 within a changeset inside a given directory. One can easily start 
    26 navigating such a sequence by following the new Last Change navigation 
    27 link present for the currently browsed path. 
     21The complete list of closed tickets can be found here: 
    2822 
    29 It's now also possible to compare two arbitrary paths at any revision. 
    30 This can be used to check the differences between a tagged version and 
    31 trunk, or to review the set of differences between two branches. 
     23   http://trac.edgewall.org/query?status=closed&milestone=0.10.3 
    3224 
    33 Other enhancements have been made to the version control subsystem, in 
    34 particular the support of scoped repositories has been improved. You 
    35 should therefore perform a trac-admin resync operation. 
    36  
    37 InterWiki and InterTrac support 
    38 ------------------------------- 
    39 An InterWiki link can be used to refer to a Wiki page located on another 
    40 Wiki system, and by extension, to any object located on any other Web 
    41 site, as long as simple URL mapping is possible. 
    42  
    43 An InterTrac link can be used for referring to a Trac resource (Wiki 
    44 page, changeset, ticket, ...) on an other Trac environment. This makes it 
    45 easier to work with multiple separate projects, and seamlessly refer to 
    46 resources from one Trac to another. 
    47  
    48 Improved modularity 
    49 ------------------- 
    50 Trac now supports database and version control backends as third-party 
    51 plugins. 
    52  
    53 It is now easier to add support for new database backends. In addition to 
    54 the already existing support for SQLite and PostgreSQL, Trac now features 
    55 experimental support for the MySQL database. 
    56  
    57 As for the version control systems, Trac still features best of breed 
    58 Subversion support, but the Subversion bindings and libraries are no 
    59 longer mandatory for using Trac itself. Other version control systems can 
    60 be supported by external plugins. 
    61  
    62 Improved notification system 
    63 ---------------------------- 
    64 The encoding for emails sent out by Trac can now be configured. This may 
    65 decrease email size and can avoid useless encoding for western languages 
    66 that make some touchy SMTP servers bounce the notifications. 
    67  
    68 Support for local network installations using local email addresses 
    69 (addresses without a domain name) and a configurable default domain name 
    70 has been added, as well as support for both visible and blind carbon 
    71 copies. 
    72  
    73 Support for spam protection 
    74 --------------------------- 
    75 Trac now provides extension point that allow plugins to intercept content 
    76 submissions, which can be used to filter out spam. One plugin that does 
    77 this is the SpamFilter plugin, which is available as a separate package: 
    78  
    79   http://trac.edgewall.org/wiki/SpamFilter 
    80  
    81 This plugin implements a number of different strategies for testing 
    82 content, such as regular expression matching, IP blacklisting, and 
    83 Akismet queries. 
    84  
    85 WSGI used as web server protocol 
    86 -------------------------------- 
    87 Trac now uses WSGI (the "Python Web Server Gateway Interface") 
    88 internally. While Trac continues to provide builtin support for CGI, 
    89 FastCGI and mod_python, as well as the standalone server "tracd", you can 
    90 now take advantage of the WSGI support to use Trac in other setups, such 
    91 as Twisted, Paste, SCGI, or ISAPI. 
    92  
    93 Lots of minor improvements 
    94 -------------------------- 
    95 To the Wiki syntax 
    96  
    97 Numerous improvements have been made in the WikiFormatting syntax: 
    98  
    99  * Headings can optionally be given explicit id. 
    100  * MoinMoin ["internal free link"] syntax is now supported. 
    101  * Introduced citation syntax for the Wiki (e-mail style). 
    102  * Added more robust parsing and formatting of Wiki lists and robust 
    103    coupling of lists and quotes. 
    104  * Improved the way external links are displayed. 
    105  * Lots of new ways to refer to specific repository views (diff:from// 
    106    to, log:, [x:y], rx:y) 
    107  * htdocs:, useful for referring to local resources in TracStandalone 
    108  * MoinMoin-style syntax for description lists 
    109  * Removed support for direct embedding of images using links: use the 
    110    [[Image]] macro instead. 
    111  
    112 To the Wiki subsystem 
    113  
    114  * Quicker access to last change on a page and better navigation in the 
    115    page history 
    116  * Preview the change comment before saving a change and display the 
    117    change comment when viewing a specific version of a page. This 
    118    hopefully will encourage authors to document their changes! 
    119  
    120 To the Ticket subsystem 
    121  
    122  * Possibility to Reply to ticket description and changes 
    123  * Export individual ticket data in CSV or RSS format 
    124  
    125 Developer-visible changes 
    126 ========================= 
    127  
    128 unicode everywhere 
    129 ------------------ 
    130 Trac used to handle text content by using str objects, in which Unicode 
    131 characters were represented using UTF-8 encoding. This lead to various 
    132 problems with most non-western languages. We now use the dedicated 
    133 unicode datatype to consistently handle text written in any language. See 
    134 also TracDev/UnicodeGuidelines. 
    135  
    136 Better way to programmatically generate HTML fragments 
    137 ------------------------------------------------------ 
    138 Trac now provides utility code to programmatically generate HTML 
    139 snippets. This can be used in the various places where Trac expects 
    140 plugins to return small fragments of HTML bypassing the template system. 
    141 These utilities can be found in the trac.util.html module. 
    142  
    143 Unit test framework for email notifications 
    144 ------------------------------------------- 
    145 Email notifications can now be validated; unit tests include a private 
    146 SMTP server and helper methods to extract and decode email data. 
    147  
    148 Internal API changes 
    149 -------------------- 
    150 A detailed view of the API changes since 0.9.x can be found in TracDev/ 
    151 ApiChanges/0.10. 
    15225 
    15326Acknowledgements 
  • tracfrenchtranslation/0.10/scripts/trac-admin

    r1428 r1888  
    11#!/usr/bin/env python 
    22# -*- coding: iso8859-1 -*- 
    3 __author__ = 'Daniel Lundin <daniel@edgewall.com>, Jonas Borgström <jonas@edgewall.com>' 
     3__author__ = 'Daniel Lundin <daniel@edgewall.com>, Jonas Borgström <jonas@edgewall.com>' 
    44__copyright__ = 'Copyright (c) 2005 Edgewall Software' 
    55__license__ = """ 
    66 Copyright (C) 2003, 2004, 2005 Edgewall Software 
    7  Copyright (C) 2003, 2004 Jonas Borgström <jonas@edgewall.com> 
     7 Copyright (C) 2003, 2004 Jonas Borgström <jonas@edgewall.com> 
    88 Copyright (C) 2003, 2004 Daniel Lundin <daniel@edgewall.com> 
    99 All rights reserved. 
  • tracfrenchtranslation/0.10/templates/about.cs

    r1429 r1888  
    2121  each:section = about.config ?><?cs 
    2222   if:len(section.options) ?> 
    23     <tr><th rowspan="<?cs var:len(section.options) ?>"><?cs var:section.name ?></th><?cs 
     23    <tr><th class="section" rowspan="<?cs var:len(section.options) ?>"><?cs var:section.name ?></th><?cs 
    2424    each:option = section.options ?><?cs if:name(option) != 0 ?><tr><?cs /if ?> 
    25      <td><?cs var:option.name ?></td> 
    26      <td><?cs var:option.value ?></td> 
     25     <td class="name"><?cs var:option.name ?></td> 
     26     <td class="<?cs var:option.valueclass ?>"><?cs var:option.value ?></td> 
    2727    </tr><?cs 
    2828    /each ?><?cs 
  • tracfrenchtranslation/0.10/templates/log_rss.cs

    r1429 r1888  
    1212  <language>fr-fr</language> 
    1313  <generator>Trac v<?cs var:trac.version ?></generator><?cs  
     14  if:chrome.logo.src ?> 
     15   <image> 
     16    <title><?cs var:project.name_encoded ?></title> 
     17    <url><?cs if:!chrome.logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs 
     18     var:chrome.logo.src ?></url> 
     19    <link><?cs var:base_host ?><?cs var:log.log_href ?></link> 
     20   </image><?cs 
     21  /if ?><?cs  
    1422  each:item = log.items ?><?cs  
    1523   with:change = log.changes[item.rev] ?> 
     
    2028     <title>Révision <?cs var:item.rev ?>: <?cs var:change.shortlog ?></title> 
    2129     <link><?cs var:base_host ?><?cs var:item.restricted_href ?></link> 
     30     <guid isPermaLink="false"><?cs var:base_host ?><?cs  
     31           var:item.restricted_href ?></guid> 
    2232     <description><?cs var:change.message ?></description> 
    2333     <category>Historique</category> 
  • tracfrenchtranslation/0.10/templates/query_rss.cs

    r1429 r1888  
    1212  /if ?> 
    1313  <language>en-us</language> 
     14  <generator>Trac v<?cs var:trac.version ?></generator><?cs 
     15  if:chrome.logo.src ?> 
    1416  <image> 
    1517   <title><?cs var:project.name_encoded ?></title> 
    16    <url><?cs 
    17     if:!header_logo.src_abs ?><?cs var:base_host ?><?cs 
    18     /if ?><?cs 
    19     var:header_logo.src ?></url> 
    20    <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link><?cs 
    21    if:header_logo.width ?> 
    22     <width><?cs var:header_logo.width ?></width><?cs 
    23    /if ?><?cs 
    24    if:header_logo.height ?> 
    25     <height><?cs var:header_logo.height ?></height><?cs 
    26    /if ?> 
    27   </image> 
    28   <generator>Trac v<?cs var:trac.version ?></generator><?cs 
     18    <url><?cs if:!chrome.logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs 
     19     var:chrome.logo.src ?></url> 
     20    <link><?cs var:query.href ?></link> 
     21   </image><?cs 
     22  /if ?><?cs 
    2923  each:result = query.results ?> 
    3024   <item> 
    3125    <link><?cs var:result.href ?></link> 
    32     <guid isPermaLink="true"><?cs var:result.href ?></guid> 
     26    <guid isPermaLink="false"><?cs var:result.href ?></guid> 
    3327    <title><?cs var:'#' + result.id + ': ' + result.summary ?></title><?cs 
    3428    if:result.created ?> 
  • tracfrenchtranslation/0.10/templates/report_rss.cs

    r1429 r1888  
    77  <title><?cs var:title ?></title><?cs 
    88 /if ?> 
    9  <link><?cs var:base_host ?><?cs var:trac.href.report ?>/<?cs var:report.id ?></link> 
     9 <link><?cs var:base_host ?><?cs  
     10  var:trac.href.report ?>/<?cs var:report.id ?></link> 
    1011 <description>Rapport Trac - <?cs var:report.title ?></description> 
    1112 <language>fr-fr</language> 
    1213 <generator>Trac v<?cs var:trac.version ?></generator><?cs 
     14  if:chrome.logo.src ?> 
     15   <image> 
     16    <title><?cs var:project.name_encoded ?></title> 
     17    <url><?cs if:!chrome.logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs 
     18     var:chrome.logo.src ?></url> 
     19    <link><?cs var:base_host ?><?cs  
     20     var:trac.href.report ?>/<?cs var:report.id ?></link> 
     21   </image><?cs 
     22  /if ?><?cs 
    1323 each:row = report.items ?><?cs 
    1424  set title = '' ?><?cs 
     
    3646   <title><?cs var:'#' + id + ': ' + title ?></title>    
    3747   <link><?cs var:link ?></link> 
     48   <guid isPermaLink="false"><?cs var:link ?></guid> 
    3849   <description><?cs var:descr ?></description> 
    39    <category>Report</category> 
     50   <category>Rapport</category> 
    4051  </item><?cs 
    4152 /each ?></channel> 
  • tracfrenchtranslation/0.10/templates/ticket_rss.cs

    r1429 r1888  
    1010  <link><?cs var:base_host ?><?cs var:ticket.href ?></link> 
    1111  <description><?cs var:ticket.description.formatted ?></description> 
    12   <language>en-us</language> 
     12  <language>fr-fr</language> 
    1313  <generator>Trac v<?cs var:trac.version ?></generator><?cs  
     14  if:chrome.logo.src ?> 
     15   <image> 
     16    <title><?cs var:project.name_encoded ?></title> 
     17    <url><?cs if:!chrome.logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs 
     18     var:chrome.logo.src ?></url> 
     19    <link><?cs var:base_host ?><?cs var:ticket.href ?></link> 
     20   </image><?cs 
     21  /if ?><?cs  
    1422  each:change = ticket.changes ?> 
    1523   <item><?cs 
     
    2129     if:change.cnum ?>#comment:<?cs var:change.cnum ?><?cs 
    2230     /if ?></link> 
     31    <guid isPermaLink="false"><?cs var:base_host ?><?cs var:ticket.href ?><?cs  
     32     if:change.cnum ?>#comment:<?cs var:change.cnum ?><?cs 
     33     /if ?></guid> 
    2334    <description> 
    2435    <?cs if:len(change.fields) ?> 
     
    2637    each:field = change.fields ?> 
    2738    &lt;li&gt;&lt;strong&gt;<?cs name:field ?>&lt;/strong&gt; <?cs 
    28      if:!field.old ?>set to &lt;em&gt;<?cs 
     39     if:!field.old ?>d�ni �lt;em&gt;<?cs 
    2940      var:field.new ?>&lt;/em&gt;<?cs 
    30      elif:field.new ?>changed from &lt;em&gt;<?cs var:field.old 
    31       ?>&lt;/em&gt; to &lt;em&gt;<?cs 
     41     elif:field.new ?>modifi�e &lt;em&gt;<?cs var:field.old 
     42      ?>&lt;/em&gt; lt;em&gt;<?cs 
    3243      var:field.new ?>&lt;/em&gt;.<?cs 
    33      else ?>deleted<?cs 
     44     else ?>supprim�cs 
    3445     /if ?>&lt;/li&gt;<?cs 
    3546    /each ?> 
  • tracfrenchtranslation/0.10/templates/timeline_rss.cs

    r1429 r1888  
    2727    <pubDate><?cs var:event.date ?></pubDate> 
    2828    <link><?cs var:event.href ?></link> 
     29    <guid isPermaLink="false"><?cs var:event.href ?>/<?cs  
     30     var:event.dateuid ?></guid> 
    2931    <description><?cs var:event.message ?></description> 
    3032   </item><?cs 
  • tracfrenchtranslation/0.10/templates/wiki.cs

    r1429 r1888  
    170170       <thead><tr> 
    171171        <th title="Version <?cs var:wiki.old_version ?>">v<?cs 
    172           var:wiki.old_version ?></th> 
     172          alt:wiki.old_version ?>0<?cs /alt ?></th> 
    173173        <th title="Version <?cs var:wiki.version ?>">v<?cs 
    174174          var:wiki.version ?></th> 
     
    309309     <?cs if trac.acl.WIKI_ADMIN ?> 
    310310      <div class="options"> 
    311        <label><input type="checkbox" name="readonly" id="readonly"<?cs 
     311       <label><input type="checkbox" name="readonly" id="readonly" <?cs 
    312312         if wiki.readonly == "1"?>checked="checked"<?cs /if ?> /> 
    313313       Page non modifiable</label> 
  • tracfrenchtranslation/0.10/trac/attachment.py

    r1429 r1888  
    422422                    ' attached to ' + display(id) 
    423423            if format == 'rss': 
     424                title = Markup(title).striptags() 
    424425                descr = wiki_to_html(descr or '--', self.env, req, db, 
    425426                                     absurls=True) 
     
    552553            mime_type = mimeview.get_mimetype(attachment.filename, str_data) 
    553554 
     555            # Eventually send the file directly 
    554556            format = req.args.get('format') 
    555557            if format in ('raw', 'txt'): 
  • tracfrenchtranslation/0.10/trac/config.py

    r1429 r1888  
    2424 
    2525from trac.core import ExtensionPoint, TracError 
    26 from trac.util import sorted, to_unicode 
     26from trac.util import sorted 
     27from trac.util.text import to_unicode, CRLF 
    2728 
    2829__all__ = ['Configuration', 'Option', 'BoolOption', 'IntOption', 'ListOption', 
     
    163164                print>>fileobj, '[%s]' % section 
    164165                for key, val in options: 
    165                     if key in self[section].overriden: 
     166                    if key in self[section].overridden: 
    166167                        print>>fileobj, '# %s = <set in global trac.ini>' % key 
    167168                    else: 
     169                        val = val.replace(CRLF, '\n').replace('\n', '\n ') 
    168170                        print>>fileobj, '%s = %s' % \ 
    169171                                        (key, to_unicode(val).encode('utf-8')) 
     
    196198    Objects of this class should not be instantiated directly. 
    197199    """ 
    198     __slots__ = ['config', 'name', 'overriden'] 
     200    __slots__ = ['config', 'name', 'overridden'] 
    199201 
    200202    def __init__(self, config, name): 
    201203        self.config = config 
    202204        self.name = name 
    203         self.overriden = {} 
     205        self.overridden = {} 
    204206 
    205207    def __contains__(self, name): 
     
    292294            self.config.parser.add_section(self.name) 
    293295        if value is None: 
    294             self.overriden[name] = True 
     296            self.overridden[name] = True 
    295297            value = '' 
    296298        else: 
  • tracfrenchtranslation/0.10/trac/db/api.py

    r1434 r1888  
    1818import urllib 
    1919 
    20 from trac.config import Option 
     20from trac.config import Option, IntOption 
    2121from trac.core import * 
    2222from trac.db.pool import ConnectionPool 
     
    5858        project""") 
    5959 
     60    timeout = IntOption('trac', 'timeout', '20', 
     61        """Timeout value for database connection, in seconds. 
     62        Use '0' to specify ''no timeout''. ''(Since 0.11)''""") 
     63 
    6064    def __init__(self): 
    6165        self._cnx_pool = None 
     
    6973            connector, args = self._get_connector() 
    7074            self._cnx_pool = ConnectionPool(5, connector, **args) 
    71         return self._cnx_pool.get_cnx(
     75        return self._cnx_pool.get_cnx(self.timeout or None
    7276 
    7377    def shutdown(self, tid=None): 
  • tracfrenchtranslation/0.10/trac/db_default.py

    r1429 r1888  
    164164## 
    165165 
    166 reports = ( 
     166def get_reports(db): 
     167    owner = db.concat('owner', "' *'") 
     168    return ( 
    167169('Active Tickets', 
    168170""" 
     
    174176SELECT p.value AS __color__, 
    175177   id AS ticket, summary, component, version, milestone, t.type AS type,  
    176    (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner, 
     178   (CASE status WHEN 'assigned' THEN %s ELSE owner END) AS owner, 
    177179   time AS created, 
    178180   changetime AS _changetime, description AS _description, 
    179181   reporter AS _reporter 
    180   FROM ticket t, enum p 
     182  FROM ticket t 
     183  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    181184  WHERE status IN ('new', 'assigned', 'reopened')  
    182 AND p.name = t.priority AND p.type = 'priority' 
    183185  ORDER BY p.value, milestone, t.type, time 
    184 """), 
     186""" % owner), 
    185187#---------------------------------------------------------------------------- 
    186188 ('Active Tickets by Version', 
     
    196198   version AS __group__, 
    197199   id AS ticket, summary, component, version, t.type AS type,  
    198    (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner, 
     200   (CASE status WHEN 'assigned' THEN %s ELSE owner END) AS owner, 
    199201   time AS created, 
    200202   changetime AS _changetime, description AS _description, 
    201203   reporter AS _reporter 
    202   FROM ticket t, enum p 
     204  FROM ticket t 
     205  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    203206  WHERE status IN ('new', 'assigned', 'reopened')  
    204 AND p.name = t.priority AND p.type = 'priority' 
    205207  ORDER BY (version IS NULL),version, p.value, t.type, time 
    206 """), 
    207 #---------------------------------------------------------------------------- 
    208 ('All Tickets by Milestone', 
     208""" % owner), 
     209#---------------------------------------------------------------------------- 
     210('Active Tickets by Milestone', 
    209211""" 
    210212This report shows how to color results by priority, 
     
    216218""" 
    217219SELECT p.value AS __color__, 
    218    milestone||' Release' AS __group__, 
     220   %s AS __group__, 
    219221   id AS ticket, summary, component, version, t.type AS type,  
    220    (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner, 
     222   (CASE status WHEN 'assigned' THEN %s ELSE owner END) AS owner, 
    221223   time AS created, 
    222224   changetime AS _changetime, description AS _description, 
    223225   reporter AS _reporter 
    224   FROM ticket t, enum p 
     226  FROM ticket t 
     227  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    225228  WHERE status IN ('new', 'assigned', 'reopened')  
    226 AND p.name = t.priority AND p.type = 'priority' 
    227229  ORDER BY (milestone IS NULL),milestone, p.value, t.type, time 
    228 """), 
     230""" % (db.concat('milestone', "' Release'"), owner)), 
    229231#---------------------------------------------------------------------------- 
    230232('Assigned, Active Tickets by Owner', 
     
    239241   changetime AS _changetime, description AS _description, 
    240242   reporter AS _reporter 
    241   FROM ticket t,enum p 
     243  FROM ticket t 
     244  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    242245  WHERE status = 'assigned' 
    243 AND p.name=t.priority AND p.type='priority' 
    244246  ORDER BY owner, p.value, t.type, time 
    245247"""), 
     
    256258   description AS _description_, 
    257259   changetime AS _changetime, reporter AS _reporter 
    258   FROM ticket t, enum p 
     260  FROM ticket t 
     261  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    259262  WHERE status = 'assigned' 
    260 AND p.name = t.priority AND p.type = 'priority' 
    261263  ORDER BY owner, p.value, t.type, time 
    262264"""), 
     
    278280   changetime AS modified, 
    279281   time AS _time,reporter AS _reporter 
    280   FROM ticket t,enum p 
    281   WHERE p.name=t.priority AND p.type='priority' 
     282  FROM ticket t 
     283  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    282284  ORDER BY (milestone IS NULL), milestone DESC, (status = 'closed'),  
    283285        (CASE status WHEN 'closed' THEN modified ELSE (-1)*p.value END) DESC 
     
    297299   changetime AS _changetime, description AS _description, 
    298300   reporter AS _reporter 
    299   FROM ticket t, enum p 
    300   WHERE t.status IN ('new', 'assigned', 'reopened')  
    301 AND p.name = t.priority AND p.type = 'priority' AND owner = '$USER' 
     301  FROM ticket t 
     302  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
     303  WHERE t.status IN ('new', 'assigned', 'reopened') AND owner = '$USER' 
    302304  ORDER BY (status = 'assigned') DESC, p.value, milestone, t.type, time 
    303305"""), 
     
    315317    END) AS __group__, 
    316318   id AS ticket, summary, component, version, milestone, t.type AS type,  
    317    (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner, 
     319   (CASE status WHEN 'assigned' THEN %s ELSE owner END) AS owner, 
    318320   time AS created, 
    319321   changetime AS _changetime, description AS _description, 
    320322   reporter AS _reporter 
    321   FROM ticket t, enum p 
     323  FROM ticket t 
     324  LEFT JOIN enum p ON p.name = t.priority AND p.type = 'priority' 
    322325  WHERE status IN ('new', 'assigned', 'reopened')  
    323 AND p.name = t.priority AND p.type = 'priority' 
    324326  ORDER BY (owner = '$USER') DESC, p.value, milestone, t.type, time 
    325 """)) 
     327""" % owner)) 
    326328 
    327329 
     
    331333 
    332334# (table, (column1, column2), ((row1col1, row1col2), (row2col1, row2col2))) 
    333 data = (('component', 
     335def get_data(db): 
     336   return (('component', 
    334337             ('name', 'owner'), 
    335338               (('component1', 'somebody'), 
     
    387390           ('report', 
    388391             ('author', 'title', 'query', 'description'), 
    389                __mkreports(reports))) 
     392               __mkreports(get_reports(db)))) 
     393 
    390394 
    391395default_components = ('trac.About', 'trac.attachment', 
  • tracfrenchtranslation/0.10/trac/db/mysql_backend.py

    r1429 r1888  
    1 # -*- coding: iso8859-1 -*- 
     1# -*- coding: utf-8 -*- 
    22# 
    33# Copyright (C) 2005-2006 Edgewall Software 
     
    151151        return 'CAST(%s AS %s)' % (column, type) 
    152152 
     153    def concat(self, *args): 
     154        return 'concat(%s)' % ', '.join(args) 
     155 
    153156    def like(self): 
    154157        return "LIKE %s ESCAPE '/'" 
     
    159162    def get_last_id(self, cursor, table, column='id'): 
    160163        return self.cnx.insert_id() 
     164 
     165    def rollback(self): 
     166        self.cnx.rollback() 
     167        self.cnx.ping() 
  • tracfrenchtranslation/0.10/trac/db/pool.py

    r1434 r1888