Skip to content

Commit 557742d

Browse files
author
Hugo Osvaldo Barrera
committed
Remove some more python2-compat code
1 parent 5cb6df5 commit 557742d

4 files changed

Lines changed: 16 additions & 26 deletions

File tree

barcode/__init__.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,14 @@
99
rendered as images (all formats supported by Pillow).
1010
"""
1111

12+
from barcode.codex import Code128, Code39, Gs1_128, PZN
13+
from barcode.ean import EAN13, EAN14, EAN8, JAN
1214
from barcode.errors import BarcodeNotFoundError
13-
from barcode.codex import Code39, PZN, Code128, Gs1_128
14-
from barcode.ean import EAN8, EAN13, EAN14, JAN
1515
from barcode.isxn import ISBN10, ISBN13, ISSN
16-
from barcode.upc import UPCA
1716
from barcode.itf import ITF
17+
from barcode.upc import UPCA
1818
from barcode.version import version # noqa: F401
1919

20-
try:
21-
_strbase = basestring # lint:ok
22-
except NameError:
23-
_strbase = str
24-
2520

2621
__BARCODE_MAP = dict(
2722
ean8=EAN8,
@@ -71,7 +66,7 @@ def generate(name, code, writer=None, output=None, writer_options=None,
7166
barcode = get(name, code, writer, options)
7267
if pil:
7368
return barcode.render(writer_options, text)
74-
if isinstance(output, _strbase):
69+
if isinstance(output, str):
7570
fullname = barcode.save(output, options, text)
7671
return fullname
7772
else:

barcode/pybarcode.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import os
2-
3-
import barcode
4-
52
from argparse import ArgumentParser
63

7-
from barcode.writer import ImageWriter, SVGWriter
4+
import barcode
85
from barcode.version import version
6+
from barcode.writer import ImageWriter, SVGWriter
97

108
# Optional PyQt4 GUI
119
try:

barcode/upc.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1+
"""Module: barcode.upc
2+
3+
:Provided barcodes: UPC-A
4+
"""
5+
__docformat__ = 'restructuredtext en'
6+
7+
from functools import reduce
8+
19
from barcode.base import Barcode
210
from barcode.charsets import upc as _upc
311
from barcode.errors import (
412
IllegalCharacterError,
513
NumberOfDigitsError,
614
)
715

8-
try:
9-
reduce
10-
except NameError:
11-
from functools import reduce
12-
13-
"""Module: barcode.upc
14-
15-
:Provided barcodes: UPC-A
16-
"""
17-
__docformat__ = 'restructuredtext en'
18-
1916

2017
class UniversalProductCodeA(Barcode):
2118
"""Initializes new UPC-A barcode.
@@ -110,4 +107,5 @@ def render(self, writer_options=None, text=None):
110107
options.update(writer_options or {})
111108
return Barcode.render(self, options, text)
112109

110+
113111
UPCA = UniversalProductCodeA

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# -*- coding: utf-8 -*-
2-
31
from pathlib import Path
2+
43
from setuptools import find_packages, setup
54

65

0 commit comments

Comments
 (0)