s3_object.rb in aws-sdk-1.1.4

- old
+ new

@@ -9,17 +9,10 @@
 # or in the "license" file accompanying this file. This file is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/s3/request'
-require 'aws/s3/object_metadata'
-require 'aws/s3/multipart_upload'
-require 'aws/s3/object_upload_collection'
-require 'aws/s3/presigned_post'
-require 'aws/s3/data_options'
 require 'uri'
 
 module AWS
   class S3
 
@@ -42,10 +35,10 @@
     #   obj.read
     #   # should equal File.read("README.txt")
     #
     class S3Object
 
-      include Model
+      include Core::Model
       include DataOptions
 
       # @param [Bucket] bucket The bucket this object belongs to.
       # @param [String] key The object's key.
       def initialize(bucket, key, opts = {})