Skip to content

Commit 0fa2e14

Browse files
author
Elliot Jordan
committed
Adjust imports and plistlib for Py3
1 parent ba7c4b8 commit 0fa2e14

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

print_generator.py

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
#!/usr/bin/python
2-
import os
3-
from plistlib import readPlist, writePlist
4-
import csv
2+
from __future__ import absolute_import, print_function
3+
54
import argparse
6-
import sys
5+
import csv
6+
import os
77
import re
8+
import sys
9+
10+
try:
11+
from plistlib import load as load_plist # Python 3
12+
from plistlib import dump as dump_plist
13+
except ImportError:
14+
from plistlib import readPlist as load_plist # Python 2
15+
from plistlib import writePlist as dump_plist
16+
817

918
def getOptionsString(optionList):
1019
# optionList should be a list item
@@ -33,7 +42,7 @@ def getOptionsString(optionList):
3342

3443
pwd = os.path.dirname(os.path.realpath(__file__))
3544
f = open(os.path.join(pwd, 'AddPrinter-Template.plist'), 'rb')
36-
templatePlist = readPlist(f)
45+
templatePlist = load_plist(f)
3746
f.close()
3847

3948
if args.csv:
@@ -101,7 +110,7 @@ def getOptionsString(optionList):
101110
# Write out the file
102111
newFileName = "AddPrinter-" + row[0] + "-" + version + ".pkginfo"
103112
f = open(newFileName, 'wb')
104-
writePlist(newPlist, f)
113+
dump_plist(newPlist, f)
105114
f.close()
106115
else:
107116
if not args.printername:
@@ -201,5 +210,5 @@ def getOptionsString(optionList):
201210

202211
newFileName = "AddPrinter-" + str(args.printername) + "-%s.pkginfo" % str(version)
203212
f = open(newFileName, 'wb')
204-
writePlist(newPlist, f)
213+
dump_plist(newPlist, f)
205214
f.close()

0 commit comments

Comments
 (0)