Skip to content

Commit 8bc6e4f

Browse files
committed
Merge pull request #1 from hjacobs/python3
fix to work with Python 3 on Linux
2 parents 853d6ea + e9d657c commit 8bc6e4f

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__pycache__

parallel/__init__.py

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
#!/usr/bin/env python
2-
#portable parallel port access with python
3-
#this is a wrapper module for different platform implementations
1+
# portable parallel port access with python
2+
# this is a wrapper module for different platform implementations
43
#
54
# (C)2001-2002 Chris Liechti <[email protected]>
65
# this is distributed under a free software license, see license.txt
76

8-
import sys, os, string
7+
import os
98
VERSION = "0.3"
109

11-
#chose an implementation, depending on os
10+
# choose an implementation, depending on os
1211
if os.name == 'nt':
13-
from parallelwin32 import *
12+
from parallel.parallelwin32 import Parallel # noqa
1413
elif os.name == 'posix':
15-
if sys.platform == 'linux2':
16-
from parallelppdev import * #linux, kernel 2.4
17-
else:
18-
from parallelioctl import * #IOCTLs
19-
elif os.name == 'java':
20-
from paralleljava import *
14+
from parallel.parallelppdev import Parallel # noqa
2115
else:
2216
raise "Sorry no implementation for your platform available."

setup.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
try:
44
from setuptools import setup
55
except ImportError:
6-
print "standart distutils"
76
from distutils.core import setup
8-
else:
9-
print "setuptools"
107
import sys
118

129
#windows installer:
@@ -21,10 +18,10 @@
2118

2219
import os
2320
if os.name == 'nt':
24-
print "# set dependedcies for windows version"
21+
# set dependencies for windows version
2522
data_files = {'parallel': ['simpleio.dll']}
2623
else:
27-
print "# no dependedcies"
24+
# no dependencies
2825
data_files = {}
2926

3027
setup(

0 commit comments

Comments
 (0)