s/Output/Input

Alex Schworer · Alex Schworer · commit 0d868c3a2599 · 2013-05-21T17:46:34.000-07:00
diff --git a/test/test_inputs.py b/test/test_inputs.py
@@ -14,15 +14,15 @@ def setUp(self):
     def test_input_details(self, get):
         get.return_value = load_response(200, 'fixtures/input_details.json')
 
-        resp = self.zen.output.details(15432)
+        resp = self.zen.input.details(15432)
         self.assertEquals(resp.code, 200)
         self.assertTrue(resp.body['id'] > 0)
 
     @patch("requests.Session.get")
     def test_input_progress(self, get):
         get.return_value = load_response(200, 'fixtures/input_progress.json')
 
-        resp = self.zen.output.progress(14325)
+        resp = self.zen.input.progress(14325)
         self.assertEquals(resp.code, 200)
         self.assertEquals(resp.body['state'], 'processing')
 
diff --git a/zencoder/core.py b/zencoder/core.py
@@ -157,6 +157,7 @@ def __init__(self, api_key=None, api_version=None, timeout=None, test=False):
         self.job = Job(*args, **kwargs)
         self.account = Account(*args, **kwargs)
         self.output = Output(*args, **kwargs)
+        self.input = Input(*args, **kwargs)
         self.report = None
         if api_version == 'v2':
             self.report = Report(*args, **kwargs)
@@ -237,7 +238,7 @@ def __init__(self, *args, **kwargs):
         Contains all API methods relating to Inputs.
         """
         kwargs['resource_name'] = 'inputs'
-        super(Output, self).__init__(*args, **kwargs)
+        super(Input, self).__init__(*args, **kwargs)
 
     def progress(self, input_id):
         """
