testing my commit rights

debpython/option.py

@@ -18,6 +18,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
+
 import re
 import optparse
 from copy import copy

debpython/tools.py

@@ -118,13 +118,16 @@ def shebang2pyver(fname):
     :rtype: tuple
     :returns: pair of Python interpreter string and Python version
     """
-    with open(fname) as fp:
-        data = fp.read(32)
-        match = SHEBANG_RE.match(data)
-        if not match:
-            return None
-        res = match.groups()
-        if res != (None, None):
-            if res[1]:
-                res = res[0], getver(res[1])
-            return res
+    try:
+        with open(fname) as fp:
+            data = fp.read(32)
+            match = SHEBANG_RE.match(data)
+            if not match:
+                return None
+            res = match.groups()
+            if res != (None, None):
+                if res[1]:
+                    res = res[0], getver(res[1])
+                return res
+    except IOError:
+        log.error('cannot open %s', fname)

debpython/version.py

@@ -18,6 +18,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
+
 import re
 from os.path import exists
 from types import GeneratorType
@@ -229,7 +230,7 @@ def getver(value):
     """
     if not value:
         return ''
-    return tuple(int(i) for i in value.split('.'))[:2]
+    return tuple(int(i) for i in value.split('.', 2))[:2]
 
 
 def debsorted(versions, return_str=None):

dh_python

@@ -41,7 +41,7 @@ from debpython.tools import sitedir, relative_symlink, guess_dependency, \
 from debpython.option import Option
 
 # initialize script
-logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: ' +\
+logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
                            '%(message)s')
 log = logging.getLogger('dh_python')
 os.umask(022)
@@ -382,19 +382,21 @@ def dependencies(package, stats, options):
                 depends.append(interpreter)
             # TODO: if versions[0] not in requested_versions: FTBFS
         else:  # no hardcoded versions
-            dep = ''
+            dep = args = ''
             vr = options.vrange
             if vr:
-                args = "-V %s" % vrange_str(vr)
-                for pattern in options.regexpr or []:
-                    args += " -X '%s'" % pattern.replace("'", r"\'")
-                rtscripts.append((private_dir, args))
-
+                args += "-V %s" % vrange_str(vr)
                 if vr[0]:  # minumum version specified
                     dep = "python (>= %s)" % vrepr(vr[0])
                 if vr[1]:  # maximum version specified
                     dep += ", python (<< %s)" % vrepr(vr[1])
                     dep = dep.lstrip(', ')
+
+            if details.get('compile', False):
+                for pattern in options.regexpr or []:
+                    args += " -X '%s'" % pattern.replace("'", r"\'")
+                rtscripts.append((private_dir, args))
+
             dep = dep or 'python'
             if dep not in depends:
                 depends.append(dep)
@@ -432,6 +434,8 @@ def parse_pydep(fname):
 
 ################################################################
 def main():
+    if exists('debian/pycompat'):
+        sys.exist(0)  # be compatible with old dh_python
     usage = '%prog -p PACKAGE [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n'
     parser = OptionParser(usage, version='%prog 2.0~alpha1',
                                    option_class=Option)

pyclean

@@ -34,7 +34,8 @@ from debpython.version import SUPPORTED
 
 
 # initialize script
-logging.basicConfig()
+logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
+                           '%(message)s')
 log = logging.getLogger('pyclean')
 
 """TODO: move it to manpage

pycompile

@@ -35,9 +35,10 @@ from debpython.version import SUPPORTED, DEFAULT, debsorted, vrepr, \
 from debpython.option import Option, compile_regexpr
 
 # initialize script
-logging.basicConfig()
+logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
+                           '%(message)s')
 log = logging.getLogger('pycompile')
-# TODO: /usr/share/python2/foo/2.5-/bar/-2.7/baz.py
+# TODO: /usr/share/python3/foo/3.1-/bar/-3.5/baz.py
 STDINS = {}
 
 """TODO: move it to manpage