Merge lp:~bcsaller/amulet/fix-urlencode into lp:~marcoceppi/amulet/master

[Benjamin Saller]

Various Python2/3 compat issues

Also removes some dynamic module loading which didn't seem to
add any value.

https://codereview.appspot.com/55020045/

[Benjamin Saller (bcsaller)]

Reviewers: mp+203885_code.launchpad.net,

Message:
Please take a look.

Description:
Various Python2/3 compat issues

Also removes some dynamic module loading which didn't seem to
add any value.

https://code.launchpad.net/~bcsaller/amulet/fix-urlencode/+merge/203885

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/55020045/

Affected files (+27, -15 lines):
   A .bzrignore
   M Makefile
   A [revision details]
   M amulet/charms/sentry/src/api.py
   M amulet/charms/sentry/src/modules/__init__.py
   M amulet/deployer.py
   M amulet/sentry.py

Index: .bzrignore
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2014-01-30 07:41:13 +0000
@@ -0,0 +1,5 @@
+.coverage
+amulet.egg-info/
+venv/
+amulet/.ropeproject/
+

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2014-01-24 15:52:45 +0000
+++ Makefile 2014-01-30 07:40:10 +0000
@@ -55,7 +55,7 @@
   $(PIP) install -r test-requires.txt

  .PHONY: test
-test: $(NOSE)
+test: install $(NOSE)
   make py3test

  # This is a private target used to get around finding nose in different
paths.

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: git-v1:a1911cbb8d7bcae6e0feaa249a55a3f5cdf6126d
+New revision: <email address hidden>

Index: amulet/deployer.py
=== modified file 'amulet/deployer.py'
--- amulet/deployer.py 2014-01-24 16:05:57 +0000
+++ amulet/deployer.py 2014-01-30 07:40:10 +0000
@@ -16,6 +16,12 @@
  from . import wait
  from .charm import Builder

+try:
+ TimeoutError
+except NameError:
+ class TimeoutError(OSError):
+ pass
+

  _default_sentry_template = os.path.join(
      os.path.abspath(os.path.dirname(__file__)), 'charms/sentry')

Index: amulet/sentry.py
=== modified file 'amulet/sentry.py'
--- amulet/sentry.py 2014-01-24 17:41:01 +0000
+++ amulet/sentry.py 2014-01-30 07:40:10 +0000
@@ -1,11 +1,14 @@
-
-import urllib
  import requests

  from . import waiter
  from . import helpers
  from . import charmstore

+try:
+ from urllib.parse import urlencode
+except ImportError:
+ from urllib import urlencode
+

  class SentryError(Exception):
      pass
@@ -44,7 +47,7 @@
          return self._fetch(self.config['address'], endpoint, query, data)

      def _fetch(self, address, endpoint, query={}, data=None):
- url = "%s/%s?%s" % (address, endpoint,
urllib.parse.urlencode(query))
+ url = "%s/%s?%s" % (address, endpoint, urlencode(query))
          if data:
              return requests.post(url, data=data, verify=False)
          else:

Index: amulet/charms/sentry/src/api.py
=== modified file 'amulet/charms/sentry/src/api.py'
--- amulet/charms/sentry/src/api.py 2014-01-22 21:41:24 +0000
+++ amulet/charms/sentry/src/api.py 2014-01-30 07:40:10 +0000
@@ -1,12 +1,5 @@
-
-import pkgutil
-
-
-modules = []
-for i in [name for _, name, _ in pkgutil.iter_modules(['modules'])]:
- exec("from modules.%s import Module" % i)
- exec("modules.append(Module)")
-
-
-class API (*modules):
+from .mod...

Unmerged revisions

123. By Benjamin Saller on 2014-01-30

bzrignore

122. By Benjamin Saller on 2014-01-30

some 2/3 compat issues

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-01-30 07:42:22 +0000
@@ -0,0 +1,5 @@
+.coverage
+amulet.egg-info/
+venv/
+amulet/.ropeproject/
+

=== modified file 'Makefile'
--- Makefile	2014-01-24 15:52:45 +0000
+++ Makefile	2014-01-30 07:42:22 +0000
@@ -55,7 +55,7 @@
 	$(PIP) install -r test-requires.txt
 
 .PHONY: test
-test: $(NOSE)
+test: install $(NOSE)
 	make py3test
 
 # This is a private target used to get around finding nose in different paths.

=== modified file 'amulet/charms/sentry/src/api.py'
--- amulet/charms/sentry/src/api.py	2014-01-22 21:41:24 +0000
+++ amulet/charms/sentry/src/api.py	2014-01-30 07:42:22 +0000
@@ -1,12 +1,5 @@
-
-import pkgutil
-
-
-modules = []
-for i in [name for _, name, _ in pkgutil.iter_modules(['modules'])]:
-    exec("from modules.%s import Module" % i)
-    exec("modules.append(Module)")
-
-
-class API (*modules):
+from .modules import docs, filesystem, juju, relations, run
+
+
+class API (docs, filesystem, juju, relations, run):
     pass

=== modified file 'amulet/charms/sentry/src/modules/__init__.py'
--- amulet/charms/sentry/src/modules/__init__.py	2013-10-04 16:29:48 +0000
+++ amulet/charms/sentry/src/modules/__init__.py	2014-01-30 07:42:22 +0000
@@ -0,0 +1,3 @@
+import docs, filesystem, juju, relations, run
+
+__all__ = ['docs', 'filesystem', 'juju', 'relations', 'run']

=== modified file 'amulet/deployer.py'
--- amulet/deployer.py	2014-01-24 16:05:57 +0000
+++ amulet/deployer.py	2014-01-30 07:42:22 +0000
@@ -16,6 +16,12 @@
 from . import wait
 from .charm import Builder
 
+try:
+    TimeoutError
+except NameError:
+    class TimeoutError(OSError):
+        pass
+
 
 _default_sentry_template = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), 'charms/sentry')

=== modified file 'amulet/sentry.py'
--- amulet/sentry.py	2014-01-24 17:41:01 +0000
+++ amulet/sentry.py	2014-01-30 07:42:22 +0000
@@ -1,11 +1,14 @@
-
-import urllib
 import requests
 
 from . import waiter
 from . import helpers
 from . import charmstore
 
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
+
 
 class SentryError(Exception):
     pass
@@ -44,7 +47,7 @@
         return self._fetch(self.config['address'], endpoint, query, data)
 
     def _fetch(self, address, endpoint, query={}, data=None):
-        url = "%s/%s?%s" % (address, endpoint, urllib.parse.urlencode(query))
+        url = "%s/%s?%s" % (address, endpoint, urlencode(query))
         if data:
             return requests.post(url, data=data, verify=False)
         else: