Permalink
Browse files

Merge branch 'release/0.9.5b' into develop

  • Loading branch information...
2 parents 25b5b08 + a0a5afa commit 33b61405b1b673acdebf9f253632a18e019c922a @jpenney committed Nov 29, 2011
Showing with 14 additions and 15 deletions.
  1. +5 −5 pdar/__init__.py
  2. +9 −10 setup.py
View
10 pdar/__init__.py
@@ -34,7 +34,7 @@
__license__ = 'Apache License, Version 2.0'
__credits__ = ['Jason Penney']
__maintainer__ = 'Jason Penney'
-__version__ = '0.9.0b'
+__version__ = '0.9.5b'
__url__ = 'http://github.com/jpenney/pdar'
__description__ = 'Portable Delta ARchives'
__long_description__ = '''
@@ -43,7 +43,7 @@
the form of binary deltas wrapped in a single file.
'''
-__pdar__ = sys.modules[__name__]
-__pdar__.__doc__ = os.linesep.join(
- [__pdar__.__description__, '', __pdar__.__long_description__])
-del __pdar__
+_PDAR = sys.modules[__name__]
+_PDAR.__doc__ = os.linesep.join(
+ [_PDAR.__description__, '', _PDAR.__long_description__])
+del _PDAR
View
19 setup.py
@@ -25,7 +25,7 @@
import imp
import re
-if sys.version_info < (2,6):
+if sys.version_info < (2, 6):
print "Python 2.6 or greater required"
sys.exit(1)
@@ -70,15 +70,14 @@ def get_meta(pkgname, path='.'):
else:
match = False
- code_re = re.compile(r'^(__[^ ]+__)', flags=re.M|re.S)
+ code_re = re.compile(r'^(__[^ ]+__)', flags=re.M | re.S)
code = code_re.sub(r"meta['\1']",
os.linesep.join(matchlines))
try:
exec(code)
except Exception, err:
- sys.stderr.write("error parsing metadata from '%s'"
- % pkgname)
-
+ sys.stderr.write("error parsing metadata from '%s': %s"
+ % (pkgname, str(err)))
return meta
extra = {}
@@ -88,18 +87,18 @@ def get_meta(pkgname, path='.'):
if py2exe:
script_path = os.path.join('build', 'py2exe', 'scripts', 'winpdar.py')
distutils.dir_util.mkpath(os.path.dirname(script_path))
- with open(script_path,'w') as script_file:
+ with open(script_path, 'w') as script_file:
script_file.write('''\
import sys
import pdar.console
if __name__ == "__main__":
sys.exit(pdar.console.pdar_cmd())
''')
- extra.setdefault('options',{})
+ extra.setdefault('options', {})
extra['options'].update({
'py2exe': {
- 'optimize': 2,
+ 'optimize': 2,
'bundle_files': 1,
'dist_dir': os.path.join('dist', 'py2exe'),
}})
@@ -115,8 +114,8 @@ def get_meta(pkgname, path='.'):
name=_pkgname,
version=meta.get('__version__', 'unknown'),
author=meta.get('__author__', 'Jason Penney'),
- author_email=meta.get('__email__','jpenney@jczorkmid.net'),
- url=meta.get('__url__','http://jasonpenney.net/'),
+ author_email=meta.get('__email__', 'jpenney@jczorkmid.net'),
+ url=meta.get('__url__', 'http://jasonpenney.net/'),
maintainer=meta.get('__maintainer__', 'Jason Penney'),
maintainer_email=meta.get('__maintainer_email__',
meta.get('__email__',

0 comments on commit 33b6140

Please sign in to comment.