Merge branch 'devel'

debian/changelog

@@ -1,3 +1,12 @@
+unicode (2.6) unstable; urgency=low
+
+  * fix crash when using Uxxxx (as opposed to U+xxxx) (closes: #836594)
+  * improve message when there are too many characters
+    to display (closes: #868490)
+  * python3 by default (closes: #874672)
+
+ -- Radovan Garabík <[email protected]>  Mon, 09 Apr 2018 16:41:29 +0200
+
 unicode (2.5) unstable; urgency=low
 
   * do not display control characters in tabular output

debian/compat

@@ -1 +1 @@
-5
+9

debian/control

@@ -2,12 +2,12 @@ Source: unicode
 Section: utils
 Priority: optional
 Maintainer: Radovan Garabík <[email protected]>
-Build-Depends: debhelper (>= 4), python (>= 2.6)
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 4), dh-python
+Standards-Version: 3.9.6
 
 Package: unicode
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Recommends: unicode-data
 Description: display unicode character properties
  unicode is a simple command line utility that displays

debian/rules

@@ -10,17 +10,6 @@
 
 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -55,7 +44,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/unicode.
@@ -92,7 +81,7 @@ binary-indep: build install
 	dh_installdeb
 #	dh_perl
 #	dh_shlibdeps
-	dh_python2
+	dh_python3
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

paracode

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys, unicodedata
 from optparse import OptionParser

setup.cfg

@@ -1,2 +1,3 @@
 [bdist_wheel]
 universal = 1
+

setup.py

@@ -6,7 +6,7 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 setup(name='unicode',
-      version='2.5',
+      version='2.6',
       scripts=['unicode', 'paracode'],
 #      entry_points={'console_scripts': [
 #          'unicode = unicode:main',
@@ -27,3 +27,4 @@
           'Programming Language :: Python :: 3',
           'Topic :: Text Editors :: Text Processing',
           'Topic :: Utilities'])
+

unicode

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from __future__ import unicode_literals
 
@@ -66,7 +66,7 @@ else: # python2
 
 from optparse import OptionParser
 
-VERSION='2.5'
+VERSION='2.6'
 
 
 # list of terminals that support bidi
@@ -363,7 +363,7 @@ def error(txt):
     sys.exit(1)
 
 def get_gzip_filename(fname):
-    "return fname, if it does not exist, return fname+.gz, if neither that, fname+bz2, if neither that, return None"
+    "return fname, if it does not exist, return fname+.gz, if neither that, fname+.bz2, if neither that, fname+.xz, if neither that, return None"
     if os.path.exists(fname):
         return fname
     if os.path.exists(fname+'.gz'):
@@ -492,7 +492,7 @@ def guesstype(arg):
             if val>sys.maxunicode:
                 return 'regexp', arg
             else:
-                return 'hexadecimal', arg
+                return 'hexadecimal', arg[1:]
         except ValueError:
             return 'regexp', arg
     elif len(arg)>=4:
@@ -611,7 +611,7 @@ def print_characters(clist, maxcount, format_string, query_wikipedia=0, query_wi
         if maxcount:
             counter += 1
         if counter > options.maxcount:
-            out("\nToo many characters to display, more than %s, use --max option to change it\n" % options.maxcount)
+            out("\nToo many characters to display, more than %s, use --max 0 (or other value) option to change it\n" % options.maxcount)
             return
         for colour_key in colours.keys():
             locals()[colour_key] = maybe_colours(colour_key)