Author: tomaz
Date: Sat Dec 3 16:55:57 2011
New Revision: 1209948
URL: http://svn.apache.org/viewvc?rev=1209948&view=rev
Log:
More progress.
Modified:
libcloud/branches/py3k/libcloud/compute/drivers/dummy.py
libcloud/branches/py3k/libcloud/dns/drivers/rackspace.py
libcloud/branches/py3k/libcloud/dns/drivers/zerigo.py
libcloud/branches/py3k/libcloud/loadbalancer/drivers/gogrid.py
libcloud/branches/py3k/libcloud/storage/base.py
libcloud/branches/py3k/libcloud/storage/drivers/atmos.py
libcloud/branches/py3k/libcloud/storage/drivers/cloudfiles.py
libcloud/branches/py3k/libcloud/storage/drivers/google_storage.py
libcloud/branches/py3k/libcloud/storage/drivers/s3.py
Modified: libcloud/branches/py3k/libcloud/compute/drivers/dummy.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/dummy.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/dummy.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/dummy.py Sat Dec 3
16:55:57 2011
@@ -73,7 +73,7 @@ class DummyNodeDriver(NodeDriver):
if num:
self.nl = []
startip = _ip_to_int('127.0.0.1')
- for i in xrange(num):
+ for i in range(num):
ip = _int_to_ip(startip + i)
self.nl.append(
Node(id=i,
Modified: libcloud/branches/py3k/libcloud/dns/drivers/rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/dns/drivers/rackspace.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/dns/drivers/rackspace.py (original)
+++ libcloud/branches/py3k/libcloud/dns/drivers/rackspace.py Sat Dec 3
16:55:57 2011
@@ -18,7 +18,7 @@ __all__ = [
'RackspaceUKDNSDriver'
]
-import httplib
+from libcloud.py3 import httplib
import copy
from libcloud.common.base import PollingConnection
Modified: libcloud/branches/py3k/libcloud/dns/drivers/zerigo.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/dns/drivers/zerigo.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/dns/drivers/zerigo.py (original)
+++ libcloud/branches/py3k/libcloud/dns/drivers/zerigo.py Sat Dec 3 16:55:57
2011
@@ -20,7 +20,7 @@ __all__ = [
import copy
import base64
-import httplib
+from libcloud.py3 import httplib
from xml.etree import ElementTree as ET
Modified: libcloud/branches/py3k/libcloud/loadbalancer/drivers/gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/loadbalancer/drivers/gogrid.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/loadbalancer/drivers/gogrid.py (original)
+++ libcloud/branches/py3k/libcloud/loadbalancer/drivers/gogrid.py Sat Dec 3
16:55:57 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import time
-import httplib
+from libcloud.py3 import httplib
try:
import simplejson as json
Modified: libcloud/branches/py3k/libcloud/storage/base.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/storage/base.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/storage/base.py (original)
+++ libcloud/branches/py3k/libcloud/storage/base.py Sat Dec 3 16:55:57 2011
@@ -20,7 +20,7 @@ Provides base classes for working with s
# Backward compatibility for Python 2.5
from __future__ import with_statement
-import httplib
+from libcloud.py3 import httplib
import os.path # pylint: disable-msg=W0404
import hashlib
from os.path import join as pjoin
Modified: libcloud/branches/py3k/libcloud/storage/drivers/atmos.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/storage/drivers/atmos.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/storage/drivers/atmos.py (original)
+++ libcloud/branches/py3k/libcloud/storage/drivers/atmos.py Sat Dec 3
16:55:57 2011
@@ -16,9 +16,9 @@
import base64
import hashlib
import hmac
-import httplib
+from libcloud.py3 import httplib
import time
-import urllib
+from libcloud.py3 import urllib
import urlparse
from xml.etree import ElementTree
Modified: libcloud/branches/py3k/libcloud/storage/drivers/cloudfiles.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/storage/drivers/cloudfiles.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/storage/drivers/cloudfiles.py (original)
+++ libcloud/branches/py3k/libcloud/storage/drivers/cloudfiles.py Sat Dec 3
16:55:57 2011
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import httplib
-import urllib
+from libcloud.py3 import httplib
+from libcloud.py3 import urllib
try:
import simplejson as json
Modified: libcloud/branches/py3k/libcloud/storage/drivers/google_storage.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/storage/drivers/google_storage.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/storage/drivers/google_storage.py (original)
+++ libcloud/branches/py3k/libcloud/storage/drivers/google_storage.py Sat Dec
3 16:55:57 2011
@@ -14,8 +14,8 @@
# limitations under the License.
import time
-import httplib
-import urllib
+from libcloud.py3 import httplib
+from libcloud.py3 import urllib
import copy
import base64
import hmac
Modified: libcloud/branches/py3k/libcloud/storage/drivers/s3.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/storage/drivers/s3.py?rev=1209948&r1=1209947&r2=1209948&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/storage/drivers/s3.py (original)
+++ libcloud/branches/py3k/libcloud/storage/drivers/s3.py Sat Dec 3 16:55:57
2011
@@ -14,8 +14,8 @@
# limitations under the License.
import time
-import httplib
-import urllib
+from libcloud.py3 import httplib
+from libcloud.py3 import urllib
import copy
import base64
import hmac
