← Back to branch summary

~ubuntu-branches/ubuntu/vivid/heat/vivid

« back to all changes in this revision

Viewing changes to heat/engine/resources/s3.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Corey Bryant
  • Date: 2015-01-06 08:55:22 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150106085522-4o3hnaff5lacvtrf
Tags: 2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open up for vivid.
* debian/control: Update bzr branch. 
* debian/control: Add python-saharaclient,
  python-osprofiler, python-oslo.middleware, python-oslo.serialization.
* debian/patches/fix-reqirements.patch: Refreshed.
* debian/patches/skip-tests.patch: Updated to skip more tests.
* debian/rules: Skip integration tests.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
  - d/rules: Generate heat.conf.sample and apply patch before copy.
  - d/rules: Run base tests instead of integration tests.
  - d/p/fix-requirements.patch: Refreshed.
  - d/p/remove-gettextutils-import.patch: Cherry picked from master.
* d/control: Bumped Standards-Version to 3.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/resources/s3.py
10
10
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
11
11
#    License for the specific language governing permissions and limitations
12
12
#    under the License.
 
13
import six
13
14
 
14
15
from six.moves.urllib import parse as urlparse
15
16
 
 
17
from heat.common.i18n import _
16
18
from heat.engine import attributes
17
19
from heat.engine import constraints
18
20
from heat.engine import properties
154
156
            self.client_plugin().ignore_not_found(ex)
155
157
 
156
158
    def FnGetRefId(self):
157
 
        return unicode(self.resource_id)
 
159
        return six.text_type(self.resource_id)
158
160
 
159
161
    def _resolve_attribute(self, name):
160
162
        url = self.swift().get_auth()[0]