Feat(Python3): `<>` -> `!=`

diff --git a/bkmk-add.py b/bkmk-add.py
index f0db4eaf7e0b3d7f592c4db24a7aca16dceba828..860688e50acdfb520fed0c0ad848494f572f52ac 100755 (executable)
--- a/bkmk-add.py
+++ b/bkmk-add.py
@@ -31,7 +31,7 @@ def run():
    except NameError:
       pass
 
-   if len(args) <> 1:
+   if len(args) != 1:
       sys.stderr.write("bkmk-add: too many or too few arguments\n")
       sys.stderr.write("Usage: bkmk-add [-s] [-t title] url\n")
       sys.exit(1)

diff --git a/check_title.py b/check_title.py
index c93964f986cd473a9c4d23c8b42b1b49d15db846..e8215e8e7815c9a74111d3bbc459d1440b7b72ca 100755 (executable)
--- a/check_title.py
+++ b/check_title.py
@@ -62,7 +62,7 @@ def run():
          if hasattr(object, "real_title") and (object.real_title is not None):
             unquoted_title = unquote_title(quote_title(object.real_title))
             unquoted_name = unquote_title(object.name)
-            if unquoted_name <> unquoted_title:
+            if unquoted_name != unquoted_title:
                print(object.href)
                print(unquoted_name)
                print(unquoted_title)

diff --git a/convert_st.py b/convert_st.py
index 005710b8067d558fff6f20953640d21014404a4e..4c0cb15d206968c4045d78cd930ad9fc4a03c437 100755 (executable)
--- a/convert_st.py
+++ b/convert_st.py
@@ -25,7 +25,7 @@ def run():
    except NameError:
       pass
 
-   if len(args) <> 1:
+   if len(args) != 1:
       sys.stderr.write("convert_st: too many or too few arguments\n")
       sys.stderr.write("Usage: convert_st [-s] new_storage\n")
       sys.exit(1)

diff --git a/parse_html/bkmk_parse_html.py b/parse_html/bkmk_parse_html.py
index e951cdc19509bb7fbf6658961fa61e39dd682ead..2e412ad84dc69756662c215e287e120dad66f72a 100644 (file)
--- a/parse_html/bkmk_parse_html.py
+++ b/parse_html/bkmk_parse_html.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 1997-2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 1997-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['parse_html', 'parse_filename', 'universal_charset']
@@ -147,23 +147,23 @@ def parse_html(html_text, charset=None, log=None):
       parser.charset = parser.charset.lower().replace("windows-", "cp")
 
    if title and parser.charset and (
-         (parser.charset <> universal_charset) or
-         ((not charset) or (charset <> parser.charset))):
+         (parser.charset != universal_charset) or
+         ((not charset) or (charset != parser.charset))):
       try:
          if parser.meta_charset:
             if log: log("   META charset   : %s" % parser.charset)
-         elif (not charset) or (charset <> parser.charset):
+         elif (not charset) or (charset != parser.charset):
             if log: log("   guessed charset: %s" % parser.charset)
          #if log: log("   current charset: %s" % universal_charset)
          if log: log("   title          : %s" % title)
-         if parser.charset <> universal_charset:
+         if parser.charset != universal_charset:
             try:
                converted_title = unicode(title, parser.charset).encode(universal_charset)
             except UnicodeError:
                if log: log("   incorrect conversion from %s, converting from %s" % (parser.charset, DEFAULT_CHARSET))
                converted_title = unicode(title, DEFAULT_CHARSET, "replace").encode(universal_charset, "replace")
                parser.charset = DEFAULT_CHARSET
-         if log and (converted_title <> title): log("   converted title: %s" % converted_title)
+         if log and (converted_title != title): log("   converted title: %s" % converted_title)
       except LookupError:
          if log: log("   unknown charset: '%s'" % parser.charset)
    else:
@@ -173,7 +173,7 @@ def parse_html(html_text, charset=None, log=None):
       final_title = recode_entities(converted_title, universal_charset)
       parts = [s.strip() for s in final_title.replace('\r', '').split('\n')]
       final_title = ' '.join([s for s in parts if s])
-      if log and (final_title <> converted_title): log("   final title    : %s" % final_title)
+      if log and (final_title != converted_title): log("   final title    : %s" % final_title)
       parser.title = final_title
 
    icon = parser.icon

diff --git a/set-real_title.py b/set-real_title.py
index fab938f6ae6309a674cb10df7dfe2e7c11bb7368..00292217f52cb0de125aa2ec822992c2ea297cc9 100755 (executable)
--- a/set-real_title.py
+++ b/set-real_title.py
@@ -62,7 +62,7 @@ def run():
          real_title = object.real_title
          if not real_title:
             real_title = object.href
-         if object.name <> real_title:
+         if object.name != real_title:
             object.name = real_title
             changed += 1
 

diff --git a/set-title-list.py b/set-title-list.py
index bd0da40c897660bb918c7e27bc670a3eeb5d835f..74acae49f3af128eb2c8ed5b0852c284df468a57 100755 (executable)
--- a/set-title-list.py
+++ b/set-title-list.py
@@ -30,7 +30,7 @@ def run():
    if report_stats:
       print("Broytman set-title-list, Copyright (C) 2003-2017 PhiloSoft Design")
 
-   if len(args) <> 1:
+   if len(args) != 1:
       sys.stderr.write("Usage: set-title-list [-s] title_list_file\n")
       sys.exit(1)
 
@@ -54,8 +54,8 @@ def run():
 
       else: # We've got 3 lines - add new entry to the mapping
          if titles_dict.has_key(URL):
-            if title <> titles_dict[URL]:
-               raise ValueError("titles are not identical for URL `%s': `%s' <> `%s'" % (URL, title, titles_dict[URL]))
+            if title != titles_dict[URL]:
+               raise ValueError("titles are not identical for URL `%s': `%s' != `%s'" % (URL, title, titles_dict[URL]))
 
          else:
             titles_dict[URL] = title
@@ -92,7 +92,7 @@ def run():
          URL = object.href
          if titles_dict.has_key(URL):
             name = titles_dict[URL]
-            if object.name <> name:
+            if object.name != name:
                object.name = name
                changed += 1