Ticket #2176: TracPaste-r2887.diff

File TracPaste-r2887.diff, 1.7 kB (added by mrb@hsdev.com, 1 year ago)

patch to make plugin work with newerr Trac (tested on r6326)

  • tracpaste/__init__.py

    old new  
    1313from trac.web.main import IRequestHandler 
    1414from trac.util.datefmt import http_date 
    1515from trac.util.html import html, Markup 
    16 from trac.mimeview.pygments_renderer import get_all_lexers 
     16from trac.mimeview.pygments import get_all_lexers 
    1717from trac.db import Table, Column, Index 
    1818from tracpaste.model import Paste, get_recent_pastes 
    1919 
  • tracpaste/model.py

    old new  
    44    ~~~~~~~~~~~~~~~ 
    55""" 
    66from trac.core import * 
    7 from trac.wiki.api import Context 
    8 from trac.mimeview.api import Mimeview 
     7from trac.mimeview.api import Mimeview, Context 
    98from trac.util.datefmt import utc, to_timestamp 
    109from datetime import datetime 
    1110 
    1211 
    1312def get_recent_pastes(env, n=10, db=None): 
    14     """Return the last `n` pastes as dicts without data.""" 
    15     cursor = (db or env.get_db_cnx()).cursor() 
     13    """Return the last `n` pastes as dicts without data."""    
     14    db = env.get_db_cnx() 
     15    cursor = db.cursor() 
    1616    cursor.execute('select id, title, author, time from pastes order by ' 
    1717                   'id desc limit 0, %s', (n,)) 
    1818    result = [] 
     
    111111 
    112112    def render(self, req): 
    113113        """Render the data.""" 
    114         context = Context(self.env, req) 
     114        context = Context.from_request(req) 
    115115        mimeview = Mimeview(self.env) 
    116116        return mimeview.render(context, self.mimetype, self.data, 
    117117                               annotations=['lineno'])