diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-12-07 16:48:51 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-12-08 16:10:11 +0000 |
| commit | 542c7a834728ad35d7f5f98cacdf78d86721656f (patch) | |
| tree | 6850cbc7ce3dec800c1b50f23da6b76077198159 /azurelinuxagent/future.py | |
| parent | f6e3f158c2fb9021b37654ea20839ec7a4308d52 (diff) | |
| parent | f4e6aca60e419eafbdf11bdd631d35cf785735ae (diff) | |
| download | vyos-walinuxagent-542c7a834728ad35d7f5f98cacdf78d86721656f.tar.gz vyos-walinuxagent-542c7a834728ad35d7f5f98cacdf78d86721656f.zip | |
Import patches-applied version 2.1.2-0ubuntu1 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: f6e3f158c2fb9021b37654ea20839ec7a4308d52
Unapplied parent: f4e6aca60e419eafbdf11bdd631d35cf785735ae
New changelog entries:
* New upstream release (LP: #1523715):
- Bug fixes for Ubuntu 15.10 on Azure
- Enablement for Azure Stack
- Dropped patch for systemd job as upstream now includes it.
Diffstat (limited to 'azurelinuxagent/future.py')
| -rw-r--r-- | azurelinuxagent/future.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/azurelinuxagent/future.py b/azurelinuxagent/future.py index 8186fcf..8451345 100644 --- a/azurelinuxagent/future.py +++ b/azurelinuxagent/future.py @@ -9,11 +9,13 @@ if sys.version_info[0]== 3: from urllib.parse import urlparse text = str bytebuffer = memoryview + read_input = input elif sys.version_info[0] == 2: import httplib as httpclient from urlparse import urlparse text = unicode bytebuffer = buffer + read_input = raw_input else: raise ImportError("Unknown python version:{0}".format(sys.version_info)) |