Commit a6d43a6e authored by Andrey Golovizin's avatar Andrey Golovizin
Browse files

Merge branch 'six'

parents 15755fab c8db2919

custom_fixers/__init__.py

deleted100644 → 0
+0 −0

Empty file deleted.

custom_fixers/fix_alt_unicode.py

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
# Taken from jinja2. Thanks, Armin Ronacher.

# See also http://lucumr.pocoo.org/2010/2/11/porting-to-python-3-a-guide





from lib2to3 import fixer_base





class FixAltUnicode(fixer_base.BaseFix):

    PATTERN = "'__unicode__'"



    def transform(self, node, results):

        new = node.clone()

        new.value = '__str__'

        return new

docs/pybtex_doctools/man.py

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
"""Generate man pages for pybtex and pybtex-convert.

"""



from __future__ import with_statement, print_function

from __future__ import print_function, with_statement



import os

import sys

docs/pybtex_doctools/pygments.py

+11 −7
Original line number Diff line number Diff line
@@ -25,13 +25,17 @@ from __future__ import absolute_import 
import re

from string import ascii_letters, digits



from pygments.style import Style

from pygments.lexer import RegexLexer, ExtendedRegexLexer, include, default, words

from pygments.token import Keyword, Name, Comment, String, Error, \

     Number, Operator, Generic, Literal, Punctuation, Text



from pybtex.database.input.bibtex import NAME_CHARS



from pygments.lexer import (

    ExtendedRegexLexer, RegexLexer, default, include, words

)

from pygments.style import Style

from pygments.token import (

    Comment, Error, Generic, Keyword, Literal, Name, Number, Operator,

    Punctuation, String, Text

)



from . import add_entry_point
@@ -93,7 +97,7 @@ class BibTeXLexer(ExtendedRegexLexer): 
    filenames = ['*.bib']

    flags = re.IGNORECASE



    IDENTIFIER = ur'[{0}][{1}]*'.format(re.escape(NAME_CHARS), re.escape(NAME_CHARS + digits))

    IDENTIFIER = r'[{0}][{1}]*'.format(re.escape(NAME_CHARS), re.escape(NAME_CHARS + digits))



    def open_brace_callback(self, match, ctx):

        opening_brace = match.group()
@@ -200,7 +204,7 @@ class BSTLexer(RegexLexer): 
            (r'[^#\"\{\}\s]+\$', Name.Builtin),

            (r'[^#\"\{\}\s]+', Name.Variable),

            (r'"[^\"]*"', String),

            (ur'#-?\d+', Number),

            (r'#-?\d+', Number),

            ('{', Text.Punctuation, ('group-end', 'body')),

            default('#pop'),

        ],

docs/site/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
# All configuration values have a default; values that are commented out

# serve to show the default.



import sys

import os

import sys

from datetime import datetime



from pybtex import __version__