summaryrefslogtreecommitdiff
path: root/distutils2/command/upload.py
diff options
context:
space:
mode:
Diffstat (limited to 'distutils2/command/upload.py')
-rw-r--r--distutils2/command/upload.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/distutils2/command/upload.py b/distutils2/command/upload.py
index b5e072c..3bba7ae 100644
--- a/distutils2/command/upload.py
+++ b/distutils2/command/upload.py
@@ -20,8 +20,8 @@ except ImportError:
from distutils2.errors import DistutilsOptionError
from distutils2.util import spawn
from distutils2.command.cmd import Command
-from distutils2.util import (metadata_to_dict, read_pypirc,
- DEFAULT_REPOSITORY, DEFAULT_REALM)
+from distutils2.metadata import metadata_to_dict
+from distutils2.util import read_pypirc, DEFAULT_REPOSITORY, DEFAULT_REALM
class upload(Command):
@@ -140,7 +140,7 @@ class upload(Command):
body = StringIO()
file_fields = ('content', 'gpg_signature')
- for key, values in data.items():
+ for key, values in data.iteritems():
# handle multiple entries for the same name
if not isinstance(values, (tuple, list)):
values = [values]