[jhbuild] (16 commits) Non-fast-forward update to branch pre-3-cleanup

[Christoph Reiter <creiter src gnome org>]

The branch 'pre-3-cleanup' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  37079c4... Remove uprint/uencode/udecode from builtins
  a855342... Remove unused imports
  5cb57f6... Set the Python 2 default encoding to utf-8
  6073145... flake8: don't exclude the linux modtype
  998ff7d... Remove ElementTree import fallback
  ebc85f2... Remove hashlib import fallback
  ce78d27... Don't handle a missing gzip module
  906a526... httpcache: use parsedate_tz(), mktime_tz() from the email p
  e6a3b30... Assume minidom is always available
  2b7f835... i18n: fix the gettext localedir
  e42fc75... tests: set use_local_modulesets so we don't hit the network
  08dcf5a... Remove _() and N_() from builtins

Commits added to the branch:

  1fec35e... Remove uprint/uencode/udecode from builtins
  51081df... Remove unused imports
  b177f97... Set the Python 2 default encoding to utf-8
  4cf5e92... flake8: don't exclude the linux modtype
  e1ca82c... Remove ElementTree import fallback
  99ef71d... Remove hashlib import fallback
  630d927... Don't handle a missing gzip module
  bf5ab7d... httpcache: use parsedate_tz(), mktime_tz() from the email p
  872ae08... Assume minidom is always available
  e509140... i18n: fix the gettext localedir
  50d91fb... tests: set use_local_modulesets so we don't hit the network
  680bfab... Remove _() and N_() from builtins
  b07921b... Add a file parameter to uprint() to allow printing to stder
  54b9d2c... Port some implicit relative imports
  cdcf93e... Convert some missed print statements
  cda7785... Various Python 3 porting to get some of the tests to run.