Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Flake8 fixes

  • Loading branch information...
commit 7903d20a9d3b52157c7c5c70d46f928764db6257 1 parent 1fdc1f1
Alex Clark ☺ aclark4life authored
0  README.txt → README.rst
File renamed without changes
9 docs/HISTORY.txt
@@ -2,6 +2,15 @@
2 2 Changelog
3 3 =========
4 4
  5 +1.7.5 (2011-09-07)
  6 +------------------
  7 +
  8 +- Fix for sys.platform = "linux3"
  9 + [blueyed]
  10 +
  11 +- Package cleanup
  12 + [aclark]
  13 +
5 14 1.7.4 (2011-07-21)
6 15 ------------------
7 16
40 setup.py
@@ -26,8 +26,7 @@
26 26 "QuantHeap", "PcdDecode", "PcxDecode", "PcxEncode", "Point",
27 27 "RankFilter", "RawDecode", "RawEncode", "Storage", "SunRleDecode",
28 28 "TgaRleDecode", "Unpack", "UnpackYCC", "UnsharpMask", "XbmDecode",
29   - "XbmEncode", "ZipDecode", "ZipEncode"
30   - )
  29 + "XbmEncode", "ZipDecode", "ZipEncode")
31 30
32 31
33 32 def _add_directory(path, dir, where=None):
@@ -72,7 +71,7 @@ def _read(file):
72 71
73 72
74 73 NAME = 'Pillow'
75   -VERSION = '1.7.4'
  74 +VERSION = '1.7.5'
76 75 PIL_VERSION = '1.1.7'
77 76 TCL_ROOT = None
78 77 JPEG_ROOT = None
@@ -99,8 +98,7 @@ def build_extensions(self):
99 98 if sys.platform == "cygwin":
100 99 # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory
101 100 _add_directory(library_dirs, os.path.join(
102   - "/usr/lib", "python%s" % sys.version[:3], "config"
103   - ))
  101 + "/usr/lib", "python%s" % sys.version[:3], "config"))
104 102
105 103 elif sys.platform == "darwin":
106 104 # attempt to make sure we pick freetype2 over other versions
@@ -124,7 +122,7 @@ def build_extensions(self):
124 122 else:
125 123 _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
126 124
127   - # XXX Kludge. Above /\ we brute force support multiarch. Here we
  125 + # XXX Kludge. Above /\ we brute force support multiarch. Here we
128 126 # try Barry's more general approach. Afterward, something should
129 127 # work ;-)
130 128 self.add_multiarch_paths()
@@ -286,8 +284,7 @@ class feature:
286 284 defs.append(("WORDS_BIGENDIAN", None))
287 285
288 286 exts = [(Extension(
289   - "_imaging", files, libraries=libs, define_macros=defs
290   - ))]
  287 + "_imaging", files, libraries=libs, define_macros=defs))]
291 288
292 289 #
293 290 # additional libraries
@@ -298,29 +295,25 @@ class feature:
298 295 defs.append(("USE_FREETYPE_2_0", None))
299 296 exts.append(Extension(
300 297 "_imagingft", ["_imagingft.c"], libraries=["freetype"],
301   - define_macros=defs
302   - ))
  298 + define_macros=defs))
303 299
304 300 if os.path.isfile("_imagingtiff.c") and feature.tiff:
305 301 exts.append(Extension(
306   - "_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]
307   - ))
  302 + "_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]))
308 303
309 304 if os.path.isfile("_imagingcms.c") and feature.lcms:
310 305 extra = []
311 306 if sys.platform == "win32":
312 307 extra.extend(["user32", "gdi32"])
313 308 exts.append(Extension(
314   - "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra
315   - ))
  309 + "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra))
316 310
317 311 if sys.platform == "darwin":
318 312 # locate Tcl/Tk frameworks
319 313 frameworks = []
320 314 framework_roots = [
321 315 "/Library/Frameworks",
322   - "/System/Library/Frameworks"
323   - ]
  316 + "/System/Library/Frameworks"]
324 317 for root in framework_roots:
325 318 if (os.path.exists(os.path.join(root, "Tcl.framework")) and
326 319 os.path.exists(os.path.join(root, "Tk.framework"))):
@@ -334,14 +327,12 @@ class feature:
334 327 if frameworks:
335 328 exts.append(Extension(
336 329 "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
337   - extra_compile_args=frameworks, extra_link_args=frameworks
338   - ))
  330 + extra_compile_args=frameworks, extra_link_args=frameworks))
339 331 feature.tcl = feature.tk = 1 # mark as present
340 332 elif feature.tcl and feature.tk:
341 333 exts.append(Extension(
342 334 "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
343   - libraries=[feature.tcl, feature.tk]
344   - ))
  335 + libraries=[feature.tcl, feature.tk]))
345 336
346 337 if os.path.isfile("_imagingmath.c"):
347 338 exts.append(Extension("_imagingmath", ["_imagingmath.c"]))
@@ -362,7 +353,8 @@ class feature:
362 353
363 354 def summary_report(self, feature, unsafe_zlib):
364 355 print "-" * 68
365   - print "Pillow", VERSION, "( PIL fork based on", "PIL", PIL_VERSION, ")", "SETUP SUMMARY"
  356 + print ("Pillow", VERSION, "( PIL fork based on", "PIL",
  357 + PIL_VERSION, ")", "SETUP SUMMARY")
366 358 print "-" * 68
367 359 v = string.split(sys.version, "[")
368 360 print "platform ", sys.platform, string.strip(v[0])
@@ -430,7 +422,7 @@ def check_zlib_version(self, include_dirs):
430 422 def add_multiarch_paths(self):
431 423 # Debian/Ubuntu multiarch support.
432 424 # https://wiki.ubuntu.com/MultiarchSpec
433   - # self.build_temp
  425 + # self.build_temp
434 426 tmpfile = os.path.join(self.build_temp, 'multiarch')
435 427 if not os.path.exists(self.build_temp):
436 428 os.makedirs(self.build_temp)
@@ -455,7 +447,7 @@ def add_multiarch_paths(self):
455 447 version=VERSION,
456 448 description='Python Imaging Library (fork)',
457 449 long_description=(
458   - _read('README.txt') +
  450 + _read('README.rst') +
459 451 _read('docs/INSTALL.txt') +
460 452 _read('docs/HISTORY.txt')),
461 453 author='Alex Clark (fork author)',
@@ -473,5 +465,5 @@ def add_multiarch_paths(self):
473 465 cmdclass={"build_ext": pil_build_ext},
474 466 ext_modules=[Extension("_imaging", ["_imaging.c"])],
475 467 packages=find_packages(),
476   - scripts = glob.glob("Scripts/pil*.py"),
  468 + scripts=glob.glob("Scripts/pil*.py"),
477 469 )

0 comments on commit 7903d20

Please sign in to comment.
Something went wrong with that request. Please try again.