X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bin%2Frecode_filenames.py;h=7e25a1637f77e6ea266116aec67ede5ae62069f4;hb=7c8abf339f6f103cf25d5f6c0d80bc6ae8ed75b6;hp=b9b467266528b4e1922f927c3c248229d25ddfee;hpb=816aeef09e1ad1ee6db5b51bcb5f0642a8b53235;p=dotfiles.git diff --git a/bin/recode_filenames.py b/bin/recode_filenames.py index b9b4672..7e25a16 100755 --- a/bin/recode_filenames.py +++ b/bin/recode_filenames.py @@ -12,7 +12,7 @@ if src_encoding == "translit": elif dst_encoding == "cp1251": from m_lib.rus.lat2rus import lat2win as _recode else: - raise NotImplementedError, "destination encoding must be koi8-r or cp1251, not `%s'" % dst_encoding + raise NotImplementedError("destination encoding must be koi8-r or cp1251, not `%s'" % dst_encoding) elif dst_encoding == "translit": if src_encoding == "koi8-r": @@ -20,7 +20,7 @@ elif dst_encoding == "translit": elif src_encoding == "cp1251": from m_lib.rus.rus2lat import win2lat as _recode else: - raise NotImplementedError, "source encoding must be koi8-r or cp1251, not `%s'" % src_encoding + raise NotImplementedError("source encoding must be koi8-r or cp1251, not `%s'" % src_encoding) from m_lib.rus.rus2lat import koi2lat_d koi2lat_d["ΓΏ"] = '' # remove apostrophs - @@ -37,7 +37,7 @@ elif src_encoding == "url": import urllib def _recode(s): s = urllib.unquote(s) - if src_encoding <> dst_encoding: + if src_encoding != dst_encoding: s = recode(s, src_encoding, dst_encoding, "replace") return s @@ -49,7 +49,7 @@ elif dst_encoding == "url": from m_lib.opstring import recode import urllib def _recode(s): - if src_encoding <> dst_encoding: + if src_encoding != dst_encoding: s = recode(s, src_encoding, dst_encoding, "replace") return urllib.quote(s, safe=";/?:@&=+$,()'") # wget treats them as safe @@ -63,5 +63,5 @@ if __name__ == "__main__": import os for filename in sys.argv[3:]: new_name = _recode(filename) - if new_name <> filename: + if new_name != filename: os.rename(filename, new_name)